fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [15417] Property: menu item


From: sigurdne
Subject: [Fmsystem-commits] [15417] Property: menu item
Date: Thu, 4 Aug 2016 08:11:06 +0000 (UTC)

Revision: 15417
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15417
Author:   sigurdne
Date:     2016-08-04 08:11:06 +0000 (Thu, 04 Aug 2016)
Log Message:
-----------
Property: menu item

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

Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php       2016-08-04 07:23:10 UTC (rev 
15416)
+++ trunk/property/inc/class.menu.inc.php       2016-08-04 08:11:06 UTC (rev 
15417)
@@ -817,7 +817,6 @@
                                $config = CreateObject('phpgwapi.config', 
'property');
                                $config->read();
 
-                               $invoicehandler = 
isset($config->config_data['invoicehandler']) && 
$config->config_data['invoicehandler'] == 2 ? 'uiinvoice2' : 'uiinvoice';
 
                                if 
(!isset($config->config_data['suppress_tenant']) || 
!$config->config_data['suppress_tenant'])
                                {
@@ -1015,6 +1014,7 @@
 
                        if ($acl->check('.invoice', PHPGW_ACL_READ, 'property'))
                        {
+                               $invoicehandler = 
isset($config->config_data['invoicehandler']) && 
$config->config_data['invoicehandler'] == 2 ? 'uiinvoice2' : 'uiinvoice';
                                $children = array();
                                $children_invoice = array();
                                if ($acl->check('.invoice', PHPGW_ACL_PRIVATE, 
'property'))
@@ -1152,13 +1152,16 @@
                                }
                        }
 
-                       $menus['navigation']['economy'] = array
-                               (
-                               'url' => $GLOBALS['phpgw']->link('/index.php', 
array('menuaction' => "property.{$invoicehandler}.index")),
-                               'text' => lang('economy'),
-                               'image' => array('property', 'invoice'),
-                               'children' => array_merge($invoice, $budget)
-                       );
+                       if($invoice || $budget)
+                       {
+                               $menus['navigation']['economy'] = array
+                                       (
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
"property.{$invoicehandler}.index")),
+                                       'text' => lang('economy'),
+                                       'image' => array('property', 'invoice'),
+                                       'children' => array_merge($invoice, 
$budget)
+                               );
+                       }
 
                        if ($acl->check('.agreement', PHPGW_ACL_READ, 
'property'))
                        {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]