[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15807] rental: are information
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15807] rental: are information |
Date: |
Mon, 10 Oct 2016 18:22:56 +0000 (UTC) |
Revision: 15807
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15807
Author: sigurdne
Date: 2016-10-10 18:22:55 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
rental: are information
Modified Paths:
--------------
trunk/rental/inc/class.socomposite.inc.php
trunk/rental/inc/class.sounit.inc.php
trunk/rental/inc/class.uicomposite.inc.php
trunk/rental/setup/phpgw_no.lang
Modified: trunk/rental/inc/class.socomposite.inc.php
===================================================================
--- trunk/rental/inc/class.socomposite.inc.php 2016-10-10 18:21:59 UTC (rev
15806)
+++ trunk/rental/inc/class.socomposite.inc.php 2016-10-10 18:22:55 UTC (rev
15807)
@@ -394,9 +394,11 @@
{
switch
($attributes['column_name'])
{
+ case
'bruttoareal':
case
'area_gross':
$location->set_area_gros($attributes['value']);
break;
+ case
'nettoareal':
case 'area_net':
$location->set_area_net($attributes['value']);
break;
@@ -584,6 +586,16 @@
$uicols['sortable'][] = true;
$uicols['input_type'][] = 'text';
+ $uicols['name'][] = 'custom_prize';
+ $uicols['descr'][] = lang('custom prize');
+ $uicols['sortable'][] = true;
+ $uicols['input_type'][] = 'text';
+
+ $uicols['name'][] = 'prize_type';
+ $uicols['descr'][] = lang('prize type');
+ $uicols['sortable'][] = true;
+ $uicols['input_type'][] = 'text';
+
return $uicols;
}
}
\ No newline at end of file
Modified: trunk/rental/inc/class.sounit.inc.php
===================================================================
--- trunk/rental/inc/class.sounit.inc.php 2016-10-10 18:21:59 UTC (rev
15806)
+++ trunk/rental/inc/class.sounit.inc.php 2016-10-10 18:22:55 UTC (rev
15807)
@@ -114,14 +114,10 @@
switch ($attributes['column_name'])
{
case 'area_gross':
-
$location->set_area_gros($attributes['value']);
- break;
- case 'area_net':
-
$location->set_area_net($attributes['value']);
- break;
case 'bruttoareal':
$location->set_area_gros($attributes['value']);
break;
+ case 'area_net':
case 'nettoareal':
$location->set_area_net($attributes['value']);
break;
Modified: trunk/rental/inc/class.uicomposite.inc.php
===================================================================
--- trunk/rental/inc/class.uicomposite.inc.php 2016-10-10 18:21:59 UTC (rev
15806)
+++ trunk/rental/inc/class.uicomposite.inc.php 2016-10-10 18:22:55 UTC (rev
15807)
@@ -221,6 +221,14 @@
break;
}
+ $price_item = new rental_price_item();
+ $price_types = $price_item->get_price_types();
+ foreach ($price_types as $price_type_id =>
&$price_type_title)
+ {
+ $price_type_title = lang($price_type_title);
+
+ }
+
//Create an empty row set
$rows = array();
foreach ($result_objects as $result)
@@ -231,7 +239,9 @@
{
$result->set_status('Ikke i
drift');
}
- $rows[] = $result->serialize();
+ $row = $result->serialize();
+ $row['prize_type'] =
$price_types[$row['prize_type_id']];
+ $rows[] = $row;
}
}
Modified: trunk/rental/setup/phpgw_no.lang
===================================================================
--- trunk/rental/setup/phpgw_no.lang 2016-10-10 18:21:59 UTC (rev 15806)
+++ trunk/rental/setup/phpgw_no.lang 2016-10-10 18:22:55 UTC (rev 15807)
@@ -637,4 +637,6 @@
custom prize factor rental no Prisfaktor
standard rental no Standard
composite type rental no Leieobjekt type
-type rental no Type
\ No newline at end of file
+type rental no Type
+custom prize rental no Taksering
+prize type rental no Pristype
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15807] rental: are information,
sigurdne <=