[Fmsystem-commits] [16968] property: more on delivery address

[sigurdne]

Revision: 16968
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16968
Author:   sigurdne
Date:     2017-08-11 03:56:11 -0400 (Fri, 11 Aug 2017)
Log Message:
-----------
property: more on delivery address

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2017-08-10 18:33:49 UTC (rev 
16967)
+++ trunk/property/inc/class.uiproject.inc.php  2017-08-11 07:56:11 UTC (rev 
16968)
@@ -2047,6 +2047,13 @@
                        $project_type_id = isset($values['project_type_id']) && 
$values['project_type_id'] ? $values['project_type_id'] : 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_type'];
                        $active_tab = phpgw::get_var('active_tab', 'string', 
'REQUEST', 'general');
 
+                       $delivery_address = $values['delivery_address'];
+
+                       if(!$delivery_address && 
!empty($values['location_data']['loc1']))
+                       {
+                               $delivery_address = 
CreateObject('property.solocation')->get_delivery_address($values['location_data']['loc1']);
+                       }
+
                        $data = array
                                (
                                'datatable_def' => $datatable_def,
@@ -2139,7 +2146,7 @@
                                'lang_remark_statustext' => lang('Enter a 
remark to add to the history of the project'),
                                'lang_remark' => lang('remark'),
                                'value_remark' => isset($values['remark']) ? 
$values['remark'] : '',
-                               'value_delivery_address' => 
!empty($values['delivery_address']) ? $values['delivery_address'] : '',
+                               'value_delivery_address' => $delivery_address,
                                'lang_done_statustext' => lang('Back to the 
list'),
                                'lang_save_statustext' => lang('Save the 
project'),
                                'lang_no_cat' => lang('Select category'),

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2017-08-10 18:33:49 UTC 
(rev 16967)
+++ trunk/property/inc/class.uiworkorder.inc.php        2017-08-11 07:56:11 UTC 
(rev 16968)
@@ -1621,8 +1621,9 @@
                        else
                        {
                                $location_template_type = 'view';
+                               $_location_data = 
!empty($project['location_data']) ? $project['location_data'] : '';
                                $location_data = 
$bolocation->initiate_ui_location(array(
-                                       'values' => 
(isset($project['location_data']) ? $project['location_data'] : ''),
+                                       'values' => $_location_data,
                                        'type_id' => 
(isset($project['location_data']['location_code']) ? count(explode('-', 
$project['location_data']['location_code'])) : ''),
                                        'no_link' => false, // disable lookup 
links for location type less than type_id
                                        'tenant' => 
(isset($project['location_data']['tenant_id']) ? 
$project['location_data']['tenant_id'] : ''),
@@ -2483,7 +2484,13 @@
                                )
                        );
 
+                       $delivery_address       = $values['delivery_address'] ? 
$values['delivery_address'] : $project['delivery_address'];
 
+                       if(!$delivery_address && 
!empty($_location_data['loc1']))
+                       {
+                               $delivery_address = 
CreateObject('property.solocation')->get_delivery_address($_location_data['loc1']);
+                       }
+
                        $data = array(
                                'datatable_def' => $datatable_def,
                                'periodization_data' => $periodization_data,
@@ -2658,7 +2665,7 @@
                                'value_order_sent'      => 
!!$values['order_sent'],
                                'value_order_received'  => 
$values['order_received'] ? 
$GLOBALS['phpgw']->common->show_date($values['order_received']) : '[ DD/MM/YYYY 
- H:i ]',
                                'value_order_received_amount' => (int) 
$values['order_received_amount'],
-                               'value_delivery_address'        => 
$values['delivery_address'] ? $values['delivery_address'] : 
$project['delivery_address']
+                               'value_delivery_address'        => 
$delivery_address
                        );
 
                        $appname = lang('Workorder');