[Fmsystem-commits] [15584] Stable: Merge 15582:15583 from trunk

[sigurdne]

Revision: 15584
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15584
Author:   sigurdne
Date:     2016-09-05 09:24:42 +0000 (Mon, 05 Sep 2016)
Log Message:
-----------
Stable: Merge 15582:15583 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.sos_agreement.inc.php
    branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583

Modified: branches/Version-2_0-branch/property/inc/class.sos_agreement.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sos_agreement.inc.php        
2016-09-05 09:23:15 UTC (rev 15583)
+++ branches/Version-2_0-branch/property/inc/class.sos_agreement.inc.php        
2016-09-05 09:24:42 UTC (rev 15584)
@@ -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: branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php    
2016-09-05 09:23:15 UTC (rev 15583)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php    
2016-09-05 09:24:42 UTC (rev 15584)
@@ -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');