[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16462] property: list custom column at workorder
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16462] property: list custom column at workorder |
Date: |
Tue, 21 Mar 2017 09:26:37 -0400 (EDT) |
Revision: 16462
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16462
Author: sigurdne
Date: 2017-03-21 09:26:37 -0400 (Tue, 21 Mar 2017)
Log Message:
-----------
property: list custom column at workorder
Modified Paths:
--------------
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2017-03-21 12:00:52 UTC
(rev 16461)
+++ trunk/property/inc/class.boworkorder.inc.php 2017-03-21 13:26:37 UTC
(rev 16462)
@@ -135,6 +135,12 @@
'name' => lang('accounting dim b'),
'sortable' => true
);
+ $columns['service_id'] = array
+ (
+ 'id' => 'service_id',
+ 'name' => lang('service'),
+ 'sortable' => true
+ );
$columns['entry_date'] = array
(
'id' => 'entry_date',
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2017-03-21 12:00:52 UTC
(rev 16461)
+++ trunk/property/inc/class.soworkorder.inc.php 2017-03-21 13:26:37 UTC
(rev 16462)
@@ -238,6 +238,8 @@
$cols.= ",fm_project.ecodimb";
$cols_return[] = 'ecodimb';
+ $cols.= ",fm_workorder.service_id";
+ $cols_return[] = 'service_id';
$cols.= ",fm_workorder.contract_sum";
$cols_return[] = 'contract_sum';
$cols.= ",fm_workorder.approved";
@@ -514,9 +516,13 @@
$ordermethod = " ORDER BY
fm_workorder.inspection_on_completion {$sort}, fm_workorder.id";
break;
case 'ecodimb':
- $order_field = ",
fm_project.ecodimb";
+ $order_field = ",
fm_workorder.ecodimb";
$ordermethod = " ORDER BY
fm_workorder.ecodimb {$sort}, fm_workorder.id";
break;
+ case 'service_id':
+ $order_field = ",
fm_workorder.service_id";
+ $ordermethod = " ORDER BY
fm_workorder.service_id {$sort}, fm_workorder.id";
+ break;
case 'budget':
$order_field = ",
fm_workorder.budget";
$ordermethod = " ORDER BY
fm_workorder.budget {$sort}, fm_workorder.id";
@@ -1396,6 +1402,8 @@
function edit( $workorder )
{
+ $config = CreateObject('phpgwapi.config','property');
+ $config->read_repository();
$historylog = CreateObject('property.historylog',
'workorder');
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
@@ -1425,8 +1433,6 @@
/* else if
($this->db->f('calculation') > 0)
{
$calculation = $this->db->f('calculation');
- $config =
CreateObject('phpgwapi.config','property');
- $config->read_repository();
$tax = 1+(($config->config_data['fm_tax'])/100);
$combined_cost = $calculation * $tax;
} */
@@ -1478,12 +1484,15 @@
'contract_id' =>
$workorder['contract_id'],
'tax_code' => $workorder['tax_code'],
'unspsc_code' => $workorder['unspsc_code'],
- 'service_id' => $workorder['service_id'],
'building_part' => $workorder['building_part'],
'order_dim1' => $workorder['order_dim1'],
'mail_recipients' =>
isset($workorder['vendor_email']) && is_array($workorder['vendor_email']) ?
implode(',', $workorder['vendor_email']) : '',
);
+
if(isset($config->config_data['enable_order_service_id']) &&
$config->config_data['enable_order_service_id'])
+ {
+ $value_set['service_id'] =
$workorder['service_id'];
+ }
$this->db->query("SELECT closed AS is_closed FROM
fm_workorder_status WHERE id = '{$workorder['status']}'");
$this->db->next_record();
Modified:
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
===================================================================
---
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
2017-03-21 12:00:52 UTC (rev 16461)
+++
trunk/property/inc/custom/default/BkBygg_lag_Agresso_ordre_fra_workorder.php
2017-03-21 13:26:37 UTC (rev 16462)
@@ -227,6 +227,8 @@
$tjeneste = $workorder['service_id'] ?
$workorder['service_id'] : $tjeneste;
+ $GLOBALS['phpgw']->db->query("UPDATE
fm_workorder SET service_id = {$tjeneste} WHERE id = {$workorder['id']}");
+
// _debug_array($location_info);die();
$collect_building_part = false;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16462] property: list custom column at workorder,
sigurdne <=