[Fmsystem-commits] [16932] property: fix related to orders on behalf of assigned

[sigurdne]

Revision: 16932
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16932
Author:   sigurdne
Date:     2017-07-31 06:32:54 -0400 (Mon, 31 Jul 2017)
Log Message:
-----------
property: fix related to orders on behalf of assigned

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2017-07-31 07:53:04 UTC (rev 
16931)
+++ trunk/property/inc/class.uitts.inc.php      2017-07-31 10:32:54 UTC (rev 
16932)
@@ -3419,7 +3419,7 @@
                        $pdf->ezText($ticket['order_descr'], 14);
                        $pdf->ezSetDy(-20);
                        $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica-Bold.afm');
-                       $pdf->ezText('Kontakt på bygget:', 14);
+                       $pdf->ezText('Kontakt på bygget:', 14);
                        $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica.afm');
                        $pdf->ezText($contact_name, 14);
                        $pdf->ezText($contact_email, 14);
@@ -3427,7 +3427,7 @@
                        $pdf->ezSetDy(-20);
 
                        $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica-Bold.afm');
-                       $pdf->ezText("Faktura må merkes med ordrenummer: 
{$ticket['order_id']} og ressursnr.:{$ressursnr}", 14);
+                       $pdf->ezText("Faktura må merkes med ordrenummer: 
{$ticket['order_id']} og ressursnr.:{$ressursnr}", 14);
                        $pdf->selectFont(PHPGW_API_INC . 
'/pdf/fonts/Helvetica.afm');
                        if ($content)
                        {
@@ -3819,7 +3819,16 @@
                                $GLOBALS['phpgw']->send = 
CreateObject('phpgwapi.send');
                        }
 
-                       $coordinator_name = 
$GLOBALS['phpgw_info']['user']['fullname'];
+                       $on_behalf_of_assigned = 
phpgw::get_var('on_behalf_of_assigned', 'bool');
+                       if ($on_behalf_of_assigned && 
isset($ticket['assignedto_name']))
+                       {
+                               $coordinator_name = $ticket['assignedto_name'];
+                       }
+                       else
+                       {
+                               $coordinator_name = 
$GLOBALS['phpgw_info']['user']['fullname'];
+                       }
+
                        $coordinator_email = 
"{$coordinator_name}<{$GLOBALS['phpgw_info']['user']['preferences']['property']['email']}>";
                        $cc = '';
                        $bcc = $coordinator_email;