[Fmsystem-commits] [15583] Property: adjust email subject on orders

[sigurdne]

Revision: 15583
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15583
Author:   sigurdne
Date:     2016-09-05 09:23:15 +0000 (Mon, 05 Sep 2016)
Log Message:
-----------
Property: adjust email subject on orders

Modified Paths:
--------------
    trunk/property/inc/class.sos_agreement.inc.php
    trunk/property/inc/class.uiwo_hour.inc.php

Modified: trunk/property/inc/class.sos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.sos_agreement.inc.php      2016-09-05 08:24:31 UTC 
(rev 15582)
+++ trunk/property/inc/class.sos_agreement.inc.php      2016-09-05 09:23:15 UTC 
(rev 15583)
@@ -387,6 +387,8 @@
                        if ($query)
                        {
                                $query = $this->db->db_addslashes($query);
+                               $_querymethod[] = "fm_vendor.org_name 
{$this->like} '%{$query}%'";
+                               $__querymethod = array(); // remove block
 
                                if ($p_num)
                                {

Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php  2016-09-05 08:24:31 UTC (rev 
15582)
+++ trunk/property/inc/class.uiwo_hour.inc.php  2016-09-05 09:23:15 UTC (rev 
15583)
@@ -1438,7 +1438,7 @@
 
                                if ($_address)
                                {
-                                       $subject .= ', ' . implode(', ', 
$_address);
+                                       $_address_txt = $_address ? implode(', 
', $_address) : '';
                                }
                                unset($_address);
                                unset($address_element);
@@ -1485,7 +1485,7 @@
                                                                'type' => 
'application/pdf'
                                                        );
                                                }
-                                               $body = lang('order') . 
'.</br></br>' . lang('see attachment');
+                                               $body = lang('order') . " 
{$workorder_id}.</br></br>{$_address_txt}</br></br>" . lang('see attachment');
                                        }
                                        else
                                        {
@@ -3307,7 +3307,6 @@
                                'type' => 'application/pdf'
                        );
 
-                       $body = lang('order') . '.</br></br>' . lang('see 
attachment');
                        $_to = isset($workorder['mail_recipients'][0]) && 
$workorder['mail_recipients'][0] ? implode(';', $workorder['mail_recipients']) 
: '';
 //                     _debug_array($_to);die();
                        
$GLOBALS['phpgw']->preferences->set_account_id($workorder['user_id'], true);
@@ -3330,9 +3329,11 @@
 
                        if ($_address)
                        {
-                               $subject .= ', ' . implode(', ', $_address);
+                               $_address_txt = $_address ? implode(', ', 
$_address) : '';
                        }
 
+                       $body = lang('order') . " 
{$workorder_id}.</br></br>{$_address_txt}</br></br>" . lang('see attachment');
+
                        if (!is_object($GLOBALS['phpgw']->send))
                        {
                                $GLOBALS['phpgw']->send = 
CreateObject('phpgwapi.send');