[Fmsystem-commits] [11564] property: new column

[Sigurd Nes]

Revision: 11564
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11564
Author:   sigurdne
Date:     2013-12-23 12:47:59 +0000 (Mon, 23 Dec 2013)
Log Message:
-----------
property: new column

Modified Paths:
--------------
    trunk/property/inc/class.boworkorder.inc.php
    trunk/property/inc/class.soworkorder.inc.php

Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php        2013-12-23 08:16:44 UTC 
(rev 11563)
+++ trunk/property/inc/class.boworkorder.inc.php        2013-12-23 12:47:59 UTC 
(rev 11564)
@@ -198,6 +198,12 @@
                function get_column_list()
                {
                        $columns = array();
+                       $columns['continuous'] = array
+                               (
+                                       'id'            => 'continuous',
+                                       'name'          => lang('continuous'),
+                                       'sortable'      => true
+                               );
                        $columns['ecodimb'] = array
                                (
                                        'id'            => 'ecodimb',
@@ -546,7 +552,6 @@
                        $config->read();
                        $tax = 1+($config->config_data['fm_tax'])/100;
                        $workorder['calculation']       = 
$workorder['calculation'] * $tax;
-       //              $workorder['actual_cost']       = 
$workorder['act_mtrl_cost'] + $workorder['act_vendor_cost'];
 
                        $vfs = CreateObject('phpgwapi.vfs');
                        $vfs->override_acl = 1;

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2013-12-23 08:16:44 UTC 
(rev 11563)
+++ trunk/property/inc/class.soworkorder.inc.php        2013-12-23 12:47:59 UTC 
(rev 11564)
@@ -374,7 +374,11 @@
 
                                $cols_return[] = 'location_code';
                                $cols_return[] = 'billable_hours';
+                               $cols_return[] = 'continuous';
+
                                $cols .= ',fm_workorder.billable_hours';
+                               $cols .= ',fm_workorder.continuous';
+
                                $no_address = false;
                                
if(isset($GLOBALS['phpgw']->config->config_data['location_at_workorder']) && 
$GLOBALS['phpgw']->config->config_data['location_at_workorder'])
                                {