[Fmsystem-commits] [16054] Stable: Merge 16052:16053 from trunk

[sigurdne]

Revision: 16054
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16054
Author:   sigurdne
Date:     2016-12-07 15:49:16 +0000 (Wed, 07 Dec 2016)
Log Message:
-----------
Stable: Merge 16052:16053 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.uitts.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:14933-15891
/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,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-15891
/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,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053

Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2016-12-07 15:47:15 UTC (rev 16053)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2016-12-07 15:49:16 UTC (rev 16054)
@@ -3374,6 +3374,7 @@
                        {
                                $show_cost = phpgw::get_var('show_cost', 
'bool');
                        }
+                       $historylog = CreateObject('property.historylog', 
'tts');
 
                        $ticket = $this->bo->read_single($id);
                        $subject = lang('workorder') . ": 
{$ticket['order_id']}";
@@ -3419,6 +3420,11 @@
 
                        $order_description = $ticket['order_descr'];
 
+                       $contact_data = 
$this->bocommon->initiate_ui_contact_lookup(array(
+                               'contact_id' => $ticket['contact_id'],
+                               'field' => 'contact',
+                               'type' => 'form'));
+
                        if (isset($contact_data['value_contact_name']) && 
$contact_data['value_contact_name'])
                        {
                                $contact_name = 
$contact_data['value_contact_name'];
@@ -3613,7 +3619,9 @@
                                phpgwapi_cache::message_set(lang('missing 
recipient for order %1', $ticket['order_id']),'error' );
                                return false;
                        }
+                       $historylog = CreateObject('property.historylog', 
'tts');
 
+                       $id = $ticket['id'];
                        if (isset($ticket['file_attachments']) && 
is_array($ticket['file_attachments']))
                        {
                                $attachments = 
CreateObject('property.bofiles')->get_attachments($ticket['file_attachments']);
@@ -3669,6 +3677,10 @@
                        $coordinator_email = 
"{$coordinator_name}<{$GLOBALS['phpgw_info']['user']['preferences']['property']['email']}>";
                        $cc = '';
                        $bcc = $coordinator_email;
+                       $contact_data = 
$this->bocommon->initiate_ui_contact_lookup(array(
+                               'contact_id' => $ticket['contact_id'],
+                               'field' => 'contact',
+                               'type' => 'form'));
                        if (isset($contact_data['value_contact_email']) && 
$contact_data['value_contact_email'])
                        {
                                $cc = $contact_data['value_contact_email'];
@@ -3746,12 +3758,9 @@
                                try
                                {
                                        $rcpt = 
$GLOBALS['phpgw']->send->msg('email', $_to, $subject, stripslashes($body), '', 
$cc, $bcc, $coordinator_email, $coordinator_name, 'html', '', $attachments, 
true);
-                                       if ($rcpt)
-                                       {
-                                               
phpgwapi_cache::message_set(lang('%1 is notified', $_address),'message' );
-                                               $historylog->add('M', $id, 
"{$_to}{$attachment_log}");
-                                               
phpgwapi_cache::message_set(lang('Workorder is sent by email!'),'message' );
-                                       }
+                                       phpgwapi_cache::message_set(lang('%1 is 
notified', $_to),'message' );
+                                       $historylog->add('M', $id, 
"{$_to}{$attachment_log}");
+                                       
phpgwapi_cache::message_set(lang('Workorder is sent by email!'),'message' );
                                }
                                catch (Exception $exc)
                                {