[Fmsystem-commits] [14742] Merge 14740:14741 from trunk

[Sigurd Nes]

Revision: 14742
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14742
Author:   sigurdne
Date:     2016-02-16 09:19:50 +0000 (Tue, 16 Feb 2016)
Log Message:
-----------
Merge 14740:14741 from trunk

Modified Paths:
--------------
    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/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741

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-02-16 09:15:15 UTC (rev 14741)
+++ branches/Version-2_0-branch/property/inc/class.uiwo_hour.inc.php    
2016-02-16 09:19:50 UTC (rev 14742)
@@ -1415,8 +1415,7 @@
                                                $attachments = 
array_merge($attachments, 
$bofiles->get_attachments("/workorder/{$workorder_id}/", 
$values['file_action']['workorder']));
                                                $attachment_log = 
lang('attachments') . ': ' . implode(', ', $values['file_action']['project']) . 
', ' . implode(', ', $values['file_action']['workorder']);
                                        }
-                                       _debug_array($attachment_log);
-                                       die();
+
                                        if ($send_as_pdf)
                                        {
                                                $pdfcode = 
$this->pdf_order($workorder_id, $show_cost);