[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.menu.inc.php inc/class.socat...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.menu.inc.php inc/class.socat... |
|
Date: |
Sun, 12 Feb 2006 18:12:02 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/02/12 18:12:02
Modified files:
inc : class.menu.inc.php class.socategory.inc.php
hook_admin.inc.php
setup : default_records.inc.php setup.inc.php
tables_update.inc.php
Added files:
inc : class.bor_agreement.inc.php
class.sor_agreement.inc.php
class.uir_agreement.inc.php
templates/base : r_agreement.xsl
templates/default: r_agreement.xsl
Log message:
no message
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.bor_agreement.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.menu.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.socategory.inc.php.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.sor_agreement.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uir_agreement.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/hook_admin.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/default_records.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/setup.inc.php.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/setup/tables_update.inc.php.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/r_agreement.xsl?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/r_agreement.xsl?rev=1.1
Patches:
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.17
property/inc/class.menu.inc.php:1.18
--- property/inc/class.menu.inc.php:1.17 Fri Feb 3 12:05:49 2006
+++ property/inc/class.menu.inc.php Sun Feb 12 18:12:01 2006
@@ -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.17 2006/02/03 12:05:49 sigurdne
Exp $
+ * @version $Id: class.menu.inc.php,v 1.18 2006/02/12 18:12:01 sigurdne
Exp $
*/
/**
@@ -322,7 +322,7 @@
$menu['sub_menu'][$i]['statustext']
= lang('service agreement');
- if($this->acl2->check('.pricebook',16))
+ if($this->acl2->check('.pricebook',16)
&& $page=='agreement')
{
$j=0;
if($page_2=='agreement_group')
@@ -349,6 +349,16 @@
$menu['sub_menu_2'][$j]['name']
= lang('Agreement');
$menu['sub_menu_2'][$j]['statustext'] = lang('Agreement');
}
+
+ $i++;
+ if($page=='r_agreement')
+ {
+
$menu['sub_menu'][$i]['this']=True;
+
+ }
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uir_agreement.index');
+ $menu['sub_menu'][$i]['name']
= lang('Rental');
+ $menu['sub_menu'][$i]['statustext']
= lang('Rental agreement');
}
//---------------
Index: property/inc/class.socategory.inc.php
diff -u property/inc/class.socategory.inc.php:1.13
property/inc/class.socategory.inc.php:1.14
--- property/inc/class.socategory.inc.php:1.13 Mon Jan 30 22:14:19 2006
+++ property/inc/class.socategory.inc.php Sun Feb 12 18:12:01 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.socategory.inc.php,v 1.13 2006/01/30 22:14:19
sigurdne Exp $
+ * @version $Id: class.socategory.inc.php,v 1.14 2006/02/12 18:12:01
sigurdne Exp $
*/
/**
@@ -156,6 +156,9 @@
case 'r_condition_type':
$table='fm_request_condition_type';
break;
+ case 'r_agreement':
+ $table='fm_r_agreement_category';
+ break;
}
return $table;
Index: property/inc/hook_admin.inc.php
diff -u property/inc/hook_admin.inc.php:1.19
property/inc/hook_admin.inc.php:1.20
--- property/inc/hook_admin.inc.php:1.19 Fri Feb 3 12:05:49 2006
+++ property/inc/hook_admin.inc.php Sun Feb 12 18:12:02 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: hook_admin.inc.php,v 1.19 2006/02/03 12:05:49 sigurdne
Exp $
+ * @version $Id: hook_admin.inc.php,v 1.20 2006/02/12 18:12:02 sigurdne
Exp $
*/
{
@@ -50,6 +50,9 @@
'service agreement categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=s_agreement'),
'service agreement Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute'),
'service agreement item Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uis_agreement.list_attribute&role=detail'),
+ 'rental agreement categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=r_agreement'),
+ 'rental agreement Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uir_agreement.list_attribute'),
+ 'rental agreement item Attributes'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uir_agreement.list_attribute&role=detail'),
'Document Status'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=document_status'),
'Unit'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=unit'),
'Key location'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_3.index&type=key_location'),
Index: property/setup/default_records.inc.php
diff -u property/setup/default_records.inc.php:1.19
property/setup/default_records.inc.php:1.20
--- property/setup/default_records.inc.php:1.19 Thu Jan 19 14:31:09 2006
+++ property/setup/default_records.inc.php Sun Feb 12 18:12:02 2006
@@ -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.19 2006/01/19 14:31:09
sigurdne Exp $
+ * @version $Id: default_records.inc.php,v 1.20 2006/02/12 18:12:02
sigurdne Exp $
*/
@@ -196,6 +196,7 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.s_agreement', 'Service agreement')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.b_account', 'Budget account')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.tenant_claim', 'Tenant claim')");
+$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_acl_location (id, descr)
VALUES ('.r_agreement', 'Rental agreement')");
#
Index: property/setup/setup.inc.php
diff -u property/setup/setup.inc.php:1.27 property/setup/setup.inc.php:1.28
--- property/setup/setup.inc.php:1.27 Sun Feb 5 20:07:35 2006
+++ property/setup/setup.inc.php Sun Feb 12 18:12:02 2006
@@ -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.27 2006/02/05 20:07:35 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.28 2006/02/12 18:12:02 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
$setup_info['property']['title'] = 'Property';
- $setup_info['property']['version'] = '0.9.17.512';
+ $setup_info['property']['version'] = '0.9.17.513';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
@@ -187,7 +187,13 @@
'fm_cron_log',
'fm_origin',
'fm_tenant_claim',
- 'fm_tenant_claim_category'
+ 'fm_tenant_claim_category',
+ 'fm_r_agreement',
+ 'fm_r_agreement_attribute',
+ 'fm_r_agreement_category',
+ 'fm_r_agreement_choice',
+ 'fm_r_agreement_detail',
+ 'fm_r_agreement_pricing',
);
/* The hooks this app includes, needed for hooks registration */
Index: property/setup/tables_update.inc.php
diff -u property/setup/tables_update.inc.php:1.22
property/setup/tables_update.inc.php:1.23
--- property/setup/tables_update.inc.php:1.22 Fri Feb 10 09:10:42 2006
+++ property/setup/tables_update.inc.php Sun Feb 12 18:12:02 2006
@@ -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.22 2006/02/10 09:10:42
sigurdne Exp $
+ * @version $Id: tables_update.inc.php,v 1.23 2006/02/12 18:12:02
sigurdne Exp $
*/
/**
@@ -826,4 +826,144 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
-?>
+ /**
+ * Update property version from 0.9.17.512 to 0.9.17.513
+ */
+
+ $test[] = '0.9.17.512';
+ function property_upgrade0_9_17_512()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'vendor_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'name' => array('type' => 'varchar',
'precision' => 100,'nullable' => False),
+ 'descr' => array('type' =>
'text','nullable' => True),
+ 'status' => array('type' => 'varchar',
'precision' => 10,'nullable' => True),
+ 'category' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'member_of' => array('type' =>
'text','nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'start_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'end_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'termination_date' => array('type' =>
'int', 'precision' => 4,'nullable' => True),
+ 'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'actual_cost' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'account_id' => array('type' =>
'varchar', 'precision' => 20,'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement_attribute', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'attrib_detail' => array('type' =>
'int', 'precision' => 2,'nullable' => False,'default' => '0'),
+ 'list' => array('type' => 'int',
'precision' => 2,'nullable' => True),
+ 'location_form' => array('type' =>
'int', 'precision' => 2,'nullable' => True),
+ 'lookup_form' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'column_name' => array('type' =>
'varchar', 'precision' => 20,'nullable' => False),
+ 'input_text' => array('type' =>
'varchar', 'precision' => 50,'nullable' => False),
+ 'statustext' => array('type' =>
'varchar', 'precision' => 100,'nullable' => False),
+ 'size' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'datatype' => array('type' =>
'varchar', 'precision' => 10,'nullable' => False),
+ 'attrib_sort' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'precision_' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'scale' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'default_value' => array('type' =>
'varchar', 'precision' => 18,'nullable' => True),
+ 'nullable' => array('type' =>
'varchar', 'precision' => 5,'nullable' => False,'default' => 'True'),
+ 'search' => array('type' => 'int',
'precision' => 2,'nullable' => True)
+ ),
+ 'pk' => array('id','attrib_detail'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement_category', array(
+ 'fd' => array(
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'descr' => array('type' => 'varchar',
'precision' => 50,'nullable' => True)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement_choice', array(
+ 'fd' => array(
+ 'attrib_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'value' => array('type' => 'varchar',
'precision' => 255,'nullable' => True),
+ 'attrib_detail' => array('type' =>
'int', 'precision' => 2,'nullable' => False,'default' => '0')
+ ),
+ 'pk' => array('attrib_id','id','attrib_detail'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement_detail', array(
+ 'fd' => array(
+ 'agreement_id' => array('type' =>
'int', 'precision' => 4,'nullable' => False,'default' => '0'),
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'location_code' => array('type' =>
'varchar', 'precision' => 30,'nullable' => True),
+ 'address' => array('type' => 'varchar',
'precision' => 100,'nullable' => True),
+ 'p_num' => array('type' => 'varchar',
'precision' => 15,'nullable' => True),
+ 'p_entity_id' => array('type' => 'int',
'precision' => 4,'nullable' => True,'default' => '0'),
+ 'p_cat_id' => array('type' => 'int',
'precision' => 4,'nullable' => True,'default' => '0'),
+ 'descr' => array('type' =>
'text','nullable' => True),
+ 'unit' => array('type' => 'varchar',
'precision' => 10,'nullable' => True),
+ 'quantity' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'frequency' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'test' => array('type' =>
'text','nullable' => True),
+ 'cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True)
+ ),
+ 'pk' => array('agreement_id','id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_r_agreement_pricing', array(
+ 'fd' => array(
+ 'agreement_id' => array('type' =>
'int', 'precision' => 4,'nullable' => False,'default' => '0'),
+ 'item_id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'id' => array('type' => 'int',
'precision' => 4,'nullable' => False,'default' => '0'),
+ 'current_index' => array('type' =>
'int', 'precision' => 2,'nullable' => True),
+ 'this_index' => array('type' =>
'decimal', 'precision' => 20, 'scale' => 4,'nullable' => True),
+ 'cost' => array('type' => 'decimal',
'precision' => 20, 'scale' => 2,'nullable' => True),
+ 'index_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'user_id' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True)
+ ),
+ 'pk' => array('agreement_id','item_id','id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_acl_location (id, descr) VALUES ('.r_agreement', 'Rental agreement')");
+
+ $GLOBALS['setup_info']['property']['currentver'] = '0.9.17.513';
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.menu.inc.php inc/class.socat...,
Sigurd Nes <=