[Phpgroupware-cvs] property inc/class.menu.inc.php inc/class.uiagr...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/10/27 08:31:35

Modified files:
        inc            : class.menu.inc.php class.uiagreement.inc.php 
                         class.uipricebook.inc.php 
        setup          : default_records.inc.php setup.inc.php 
                         tables_update.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uipricebook.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/setup/default_records.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/property/setup/tables_update.inc.php?cvsroot=phpgroupware&r1=1.55&r2=1.56

Patches:
Index: inc/class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- inc/class.menu.inc.php      27 Oct 2006 08:04:07 -0000      1.30
+++ inc/class.menu.inc.php      27 Oct 2006 08:31:35 -0000      1.31
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.menu.inc.php,v 1.30 2006/10/27 08:04:07 sigurdne 
Exp $
+       * @version $Id: class.menu.inc.php,v 1.31 2006/10/27 08:31:35 sigurdne 
Exp $
        */
 
        /**
@@ -315,7 +315,7 @@
                                        }
                                }
 
-                               if ($sub == 'pricebook' && 
$this->acl->check('.pricebook',16))
+                               if ($sub == 'pricebook' && 
$this->acl->check('.agreement',16))
                                {
                                        $menu['menu_title_2']=lang('pricebook');
 
@@ -386,7 +386,7 @@
                                        $menu['sub_menu'][$i]['statustext']     
        =       lang('alarm');
                                        $i++;
 
-                                       if($this->acl->check('.pricebook',16) 
&& $page=='agreement')
+                                       if($this->acl->check('.agreement',16) 
&& $page=='agreement')
                                        {
                                                
$menu['menu_title_3']=lang('pricebook');
 

Index: inc/class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.uiagreement.inc.php       8 Oct 2006 12:04:55 -0000       1.26
+++ inc/class.uiagreement.inc.php       27 Oct 2006 08:31:35 -0000      1.27
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uiagreement.inc.php,v 1.26 2006/10/08 12:04:55 
sigurdne Exp $
+       * @version $Id: class.uiagreement.inc.php,v 1.27 2006/10/27 08:31:35 
sigurdne Exp $
        */
 
        /**
@@ -59,7 +59,7 @@
                        $this->cats->app_name = 'fm_vendor';
 
                        $this->acl              = CreateObject('phpgwapi.acl');
-                       $this->acl_location     = '.pricebook';
+                       $this->acl_location     = '.agreement';
 
                        $this->acl_read         = 
$this->acl->check($this->acl_location,1);
                        $this->acl_add          = 
$this->acl->check($this->acl_location,2);

Index: inc/class.uipricebook.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- inc/class.uipricebook.inc.php       5 Oct 2006 11:33:53 -0000       1.19
+++ inc/class.uipricebook.inc.php       27 Oct 2006 08:31:35 -0000      1.20
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage agreement
-       * @version $Id: class.uipricebook.inc.php,v 1.19 2006/10/05 11:33:53 
sigurdne Exp $
+       * @version $Id: class.uipricebook.inc.php,v 1.20 2006/10/27 08:31:35 
sigurdne Exp $
        */
 
        /**
@@ -56,12 +56,12 @@
                        $this->contacts->role                   = 'vendor';
 
                        $this->acl                              = 
CreateObject('phpgwapi.acl');
-                       $this->acl_location                     = '.pricebook';
-                       $this->acl_read                         = 
$this->acl->check('.pricebook',1);
-                       $this->acl_add                          = 
$this->acl->check('.pricebook',2);
-                       $this->acl_edit                         = 
$this->acl->check('.pricebook',4);
-                       $this->acl_delete                       = 
$this->acl->check('.pricebook',8);
-                       $this->acl_manage                       = 
$this->acl->check('.pricebook',16);
+                       $this->acl_location                     = '.agreement';
+                       $this->acl_read                         = 
$this->acl->check('.agreement',1);
+                       $this->acl_add                          = 
$this->acl->check('.agreement',2);
+                       $this->acl_edit                         = 
$this->acl->check('.agreement',4);
+                       $this->acl_delete                       = 
$this->acl->check('.agreement',8);
+                       $this->acl_manage                       = 
$this->acl->check('.agreement',16);
 
                        $this->start                            = 
$this->bo->start;
                        $this->query                            = 
$this->bo->query;

Index: setup/default_records.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/default_records.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- setup/default_records.inc.php       9 Oct 2006 15:54:01 -0000       1.31
+++ setup/default_records.inc.php       27 Oct 2006 08:31:35 -0000      1.32
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage setup
-       * @version $Id: default_records.inc.php,v 1.31 2006/10/09 15:54:01 
sigurdne Exp $
+       * @version $Id: default_records.inc.php,v 1.32 2006/10/27 08:31:35 
sigurdne Exp $
        */
 
 
@@ -200,7 +200,7 @@
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.custom', 'custom queries')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr, allow_grant) VALUES ('property', '.project', 'Demand -> 
Workorder', 1)");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr, allow_grant) VALUES ('property', '.ticket', 'Helpdesk', 
1)");
-$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.pricebook', 'Pricebook')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.agreement', 'Agreement')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.invoice', 'Invoice')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.document', 'Documents')");
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_acl_location 
(appname, id, descr) VALUES ('property', '.drawing', 'Drawing')");
@@ -325,7 +325,7 @@
 
 $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr, 
location_form, documentation) VALUES (1, 'Equipment', 'equipment', 1, 1)");
 //$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, 
descr, location_form, documentation, lookup_entity) VALUES (2, 'Report', 
'report', 1, NULL, 'a:1:{i:0;s:1:"1";}')");
-
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_entity (id, name, descr, 
location_form, documentation, lookup_entity) VALUES (2, 'Report', 'report', 1, 
NULL, '')");
 
 #
 # Dumping data for table fm_entity_category

Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- setup/setup.inc.php 26 Oct 2006 14:19:35 -0000      1.49
+++ setup/setup.inc.php 27 Oct 2006 08:31:35 -0000      1.50
@@ -8,12 +8,12 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage setup
-       * @version $Id: setup.inc.php,v 1.49 2006/10/26 14:19:35 sigurdne Exp $
+       * @version $Id: setup.inc.php,v 1.50 2006/10/27 08:31:35 sigurdne Exp $
        */
 
        $setup_info['property']['name']         = 'property';
        $setup_info['property']['title']        = 'Property';
-       $setup_info['property']['version']      = '0.9.17.528';
+       $setup_info['property']['version']      = '0.9.17.529';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']       = 1;
        $setup_info['property']['app_group']    = 'office';

Index: setup/tables_update.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/tables_update.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- setup/tables_update.inc.php 26 Oct 2006 14:19:35 -0000      1.55
+++ setup/tables_update.inc.php 27 Oct 2006 08:31:35 -0000      1.56
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage setup
-       * @version $Id: tables_update.inc.php,v 1.55 2006/10/26 14:19:35 
sigurdne Exp $
+       * @version $Id: tables_update.inc.php,v 1.56 2006/10/27 08:31:35 
sigurdne Exp $
        */
 
        /**
@@ -1502,3 +1502,21 @@
                $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.528';
                return $GLOBALS['setup_info']['property']['currentver'];
        }
+
+
+       /**
+       * Update property version from 0.9.17.528 to 0.9.17.529
+       */
+
+       $test[] = '0.9.17.528';
+       function property_upgrade0_9_17_528()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE 
phpgw_acl_location set id = '.agreement', descr = 'Agreement' where id = 
'.pricebook' AND appname = 'property'");
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_acl set 
acl_location = '.agreement' where acl_location = '.pricebook' AND acl_appname = 
'property'");
+
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+               $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.529';
+               return $GLOBALS['setup_info']['property']['currentver'];
+       }