[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9094] nomsg
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9094] nomsg |
|
Date: |
Tue, 03 Apr 2012 12:46:01 +0000 |
Revision: 9094
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9094
Author: sigurdne
Date: 2012-04-03 12:46:01 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
nomsg
Modified Paths:
--------------
trunk/property/inc/class.menu.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/setup/setup.inc.php
trunk/property/setup/tables_current.inc.php
trunk/property/setup/tables_update.inc.php
Modified: trunk/property/inc/class.menu.inc.php
===================================================================
--- trunk/property/inc/class.menu.inc.php 2012-04-03 11:27:05 UTC (rev
9093)
+++ trunk/property/inc/class.menu.inc.php 2012-04-03 12:46:01 UTC (rev
9094)
@@ -328,6 +328,11 @@
(
'url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilocation.update_location') ),
'text' => lang('update
location')
+ ),
+ 'location_contact' => array
+ (
+ 'text' =>
lang('location contact'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'location_contact') )
)
);
@@ -808,6 +813,14 @@
'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
(
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2012-04-03 11:27:05 UTC (rev
9093)
+++ trunk/property/inc/class.sogeneric.inc.php 2012-04-03 12:46:01 UTC (rev
9094)
@@ -1568,7 +1568,6 @@
break;
case 'event_action':
-
$info = array
(
'table'
=> 'fm_event_action',
@@ -2070,6 +2069,43 @@
);
break;
+ case 'location_contact':
+ $info = array
+ (
+ 'table'
=> 'fm_location_contact',
+ 'id'
=> array('name' => 'id', 'type' => 'auto'),
+ 'fields'
=> array
+ (
+ array
+ (
+ 'name' =>
'contact_id',
+ 'descr' =>
lang('contact'),
+ 'type' =>
'int',//contact
+ 'nullable'
=> false,
+ ),
+ array
+ (
+ 'name' =>
'location_code',
+ 'descr' =>
lang('location_code'),
+ 'type' =>
'varchar',//location
+ 'nullable'
=> false,
+ )
+ ),
+ 'edit_msg'
=> lang('edit'),
+ 'add_msg'
=> lang('add'),
+ 'name'
=> lang('location contact'),
+ 'acl_app'
=> 'property',
+ 'acl_location' =>
'.admin',
+ 'menu_selection' =>
'admin::property::location::location_contact',
+ 'default'
=> array
+ (
+ 'user_id'
=> array('add' => '$this->account'),
+ 'entry_date' =>
array('add' => 'time()'),
+ 'modified_date' =>
array('edit' => 'time()'),
+ )
+ );
+
+ break;
// START BOOKING TABLES
case 'bb_office':
$info = array
Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php 2012-04-03 11:27:05 UTC (rev 9093)
+++ trunk/property/setup/setup.inc.php 2012-04-03 12:46:01 UTC (rev 9094)
@@ -12,7 +12,7 @@
*/
$setup_info['property']['name'] = 'property';
- $setup_info['property']['version'] = '0.9.17.638';
+ $setup_info['property']['version'] = '0.9.17.639';
$setup_info['property']['app_order'] = 8;
$setup_info['property']['enable'] = 1;
$setup_info['property']['app_group'] = 'office';
@@ -94,6 +94,7 @@
'fm_location4_history',
'fm_location_type',
'fm_location_config',
+ 'fm_location_contact',
'fm_building_part',
'fm_b_account',
'fm_b_account_category',
Modified: trunk/property/setup/tables_current.inc.php
===================================================================
--- trunk/property/setup/tables_current.inc.php 2012-04-03 11:27:05 UTC (rev
9093)
+++ trunk/property/setup/tables_current.inc.php 2012-04-03 12:46:01 UTC (rev
9094)
@@ -2326,5 +2326,19 @@
'fk' => array(),
'ix' => array(),
'uc' => array()
+ ),
+ 'fm_location_contact' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto','precision' =>
4,'nullable' => False),
+ 'contact_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'location_code' => array('type' => 'varchar',
'precision' => 20,'nullable' => False),
+ 'user_id' => array('type' => 'int','precision'
=> 4,'nullable' => False),
+ 'entry_date' => array('type' =>
'int','precision' => 4,'nullable' => False),
+ 'modified_date' => array('type' =>
'int','precision' => 4,'nullable' => False)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_locations' => array('location_code'
=> 'location_code'),'phpgw_contact' => array('contact_id' => 'contact_id')),
+ 'ix' => array(),
+ 'uc' => array('contact_id', 'location_code')
)
);
Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php 2012-04-03 11:27:05 UTC (rev
9093)
+++ trunk/property/setup/tables_update.inc.php 2012-04-03 12:46:01 UTC (rev
9094)
@@ -6093,3 +6093,38 @@
return $GLOBALS['setup_info']['property']['currentver'];
}
}
+
+
+ /**
+ * Update property version from 0.9.17.638 to 0.9.17.639
+ * Add relation contact-location
+ *
+ */
+ $test[] = '0.9.17.638';
+ function property_upgrade0_9_17_638()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'fm_location_contact', array(
+ 'fd' => array(
+ 'id' => array('type' =>
'auto','precision' => 4,'nullable' => False),
+ 'contact_id' => array('type' => 'int',
'precision' => 4,'nullable' => False),
+ 'location_code' => array('type' =>
'varchar', 'precision' => 20,'nullable' => False),
+ 'user_id' => array('type' =>
'int','precision' => 4,'nullable' => False),
+ 'entry_date' => array('type' =>
'int','precision' => 4,'nullable' => False),
+ 'modified_date' => array('type' =>
'int','precision' => 4,'nullable' => False)
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('fm_locations' =>
array('location_code' => 'location_code'),'phpgw_contact' => array('contact_id'
=> 'contact_id')),
+ 'ix' => array(),
+ 'uc' => array('contact_id', 'location_code')
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['property']['currentver'] =
'0.9.17.639';
+ return $GLOBALS['setup_info']['property']['currentver'];
+ }
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9094] nomsg,
Sigurd Nes <=