[Fmsystem-commits] [9285] property: invoice

[Sigurd Nes]

Revision: 9285
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9285
Author:   sigurdne
Date:     2012-05-05 11:11:12 +0000 (Sat, 05 May 2012)
Log Message:
-----------
property: invoice

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

Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php       2012-05-04 16:20:28 UTC (rev 
9284)
+++ trunk/property/inc/class.menu.inc.php       2012-05-05 11:11:12 UTC (rev 
9285)
@@ -617,6 +617,8 @@
                                $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'])
                                {
                                        $children['tenant'] = array
@@ -826,18 +828,10 @@
                                                        'text'  =>      
lang('Add')
                                                );
                                }
-//                             if ( $acl->check('.invoice', PHPGW_ACL_ADD, 
'property') )
-                               {
-                                       $children['invoice2'] = array
-                                               (
-                                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiinvoice2.index')),
-                                                       'text'  =>      
'Faktura2'
-                                               );
-                               }
 
                                $menus['navigation']['invoice'] = array
                                        (
-                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiinvoice.index')),
+                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
"property.{$invoicehandler}.index")),
                                                'text'  => lang('Invoice'),
                                                'image' => array('property', 
'invoice'),
                                                'children'      => 
array_merge(array