[Fmsystem-commits] [16499] hide voucher link for type 1

[sigurdne]

Revision: 16499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16499
Author:   sigurdne
Date:     2017-03-30 09:46:41 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
hide voucher link for type 1

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2017-03-30 12:35:36 UTC (rev 
16498)
+++ trunk/property/inc/class.uiproject.inc.php  2017-03-30 13:46:41 UTC (rev 
16499)
@@ -1805,7 +1805,7 @@
                                )
                        );
 
-                       $_formatter_voucher_link = 
isset($config->config_data['invoicehandler']) && 
$config->config_data['invoicehandler'] == 2 ? 'formatLink_invoicehandler_2' : 
'formatLink_voucher';
+                       $_formatter_voucher_link = 
isset($config->config_data['invoicehandler']) && 
$config->config_data['invoicehandler'] == 2 ? 'formatLink_invoicehandler_2' : 
'';//formatLink_voucher';
 
                        $invoice_def = array
                                (

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2017-03-30 12:35:36 UTC 
(rev 16498)
+++ trunk/property/inc/class.uiworkorder.inc.php        2017-03-30 13:46:41 UTC 
(rev 16499)
@@ -1784,6 +1784,7 @@
                                'menuaction' => 'property.uiinvoice2.index'
                        );
 
+                       $_disable_link = $_lean;
                        $content_invoice = array();
                        $amount = 0;
                        $approved_amount = 0;
@@ -1815,6 +1816,7 @@
                                }
                                else
                                {
+                                       $_disable_link = true;
                                        if ($entry['voucher_id'] > 0)
                                        {
                                                
$link_data_invoice1['voucher_id'] = $entry['voucher_id'];
@@ -1832,7 +1834,7 @@
 
                                $content_invoice[] = array
                                        (
-                                       'voucher_id' => ($_lean) ? 
$entry['voucher_id'] : $link_voucher_id,
+                                       'voucher_id' => ($_disable_link) ? 
$entry['voucher_id'] : $link_voucher_id,
                                        'voucher_out_id' => 
$entry['voucher_out_id'],
                                        'status' => $entry['status'],
                                        'period' => $entry['period'],
@@ -1857,6 +1859,7 @@
                                $amount += $entry['amount'];
                                $approved_amount += $entry['approved_amount'];
                        }
+                       unset($entry);
 
                        if($invoices)
                        {
@@ -1897,6 +1900,8 @@
 
                                }
                        }
+                       unset($entry);
+
                        $attachmen_def = array(
                                array(
                                        'key' => 'voucher_id',