[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16119] more on rental
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16119] more on rental |
|
Date: |
Thu, 29 Dec 2016 11:22:46 +0000 (UTC) |
Revision: 16119
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16119
Author: sigurdne
Date: 2016-12-29 11:22:45 +0000 (Thu, 29 Dec 2016)
Log Message:
-----------
more on rental
Modified Paths:
--------------
trunk/rental/inc/class.bomovein.inc.php
trunk/rental/inc/class.bomoveout.inc.php
trunk/rental/inc/class.menu.inc.php
trunk/rental/inc/class.sogeneric.inc.php
trunk/rental/inc/class.uimovein.inc.php
trunk/rental/inc/class.uimoveout.inc.php
trunk/rental/setup/setup.inc.php
trunk/rental/setup/tables_current.inc.php
trunk/rental/setup/tables_update.inc.php
Modified: trunk/rental/inc/class.bomovein.inc.php
===================================================================
--- trunk/rental/inc/class.bomovein.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/inc/class.bomovein.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -21,19 +21,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
*
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this customer was funded by
http://www.bergen.kommune.no/ and Nordlandssykehuset
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/ and Nordlandssykehuset
* @package rental
* @subpackage movein
* @version $Id: $
*/
- phpgw::import_class('eventplanner.bocommon');
+ phpgw::import_class('phpgwapi.bocommon');
phpgw::import_class('rental.somovein');
include_class('rental', 'movein', 'inc/model/');
- class rental_bomovein extends eventplanner_bocommon
+ class rental_bomovein extends phpgwapi_bocommon
{
protected static
$bo,
Modified: trunk/rental/inc/class.bomoveout.inc.php
===================================================================
--- trunk/rental/inc/class.bomoveout.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/inc/class.bomoveout.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -21,19 +21,19 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
*
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this customer was funded by
http://www.bergen.kommune.no/ and Nordlandssykehuset
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/ and Nordlandssykehuset
* @package rental
* @subpackage moveout
* @version $Id: $
*/
- phpgw::import_class('eventplanner.bocommon');
+ phpgw::import_class('phpgwapi.bocommon');
phpgw::import_class('rental.somoveout');
include_class('rental', 'moveout', 'inc/model/');
- class rental_bomoveout extends eventplanner_bocommon
+ class rental_bomoveout extends phpgwapi_bocommon
{
protected static
$bo,
Modified: trunk/rental/inc/class.menu.inc.php
===================================================================
--- trunk/rental/inc/class.menu.inc.php 2016-12-29 11:00:30 UTC (rev 16118)
+++ trunk/rental/inc/class.menu.inc.php 2016-12-29 11:22:45 UTC (rev 16119)
@@ -143,6 +143,19 @@
if(!$use_fellesdata)
{
$menus['navigation'] =
array_reverse($menus['navigation'], true);
+ $menus['navigation']['email_out'] = array(
+ 'text' => lang('email out'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uiemail_out.index')),
+ 'image' => array('rental',
'text-x-generic'),
+ 'children' => array(
+ 'email_template' => array(
+ 'text' => lang('email
template'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uigeneric.index',
+ 'type' =>
'email_template', 'admin' => true))
+ )
+ )
+ );
+
$menus['navigation']['moveout'] = array(
'text' => lang('moveout'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'rental.uimoveout.index')),
Modified: trunk/rental/inc/class.sogeneric.inc.php
===================================================================
--- trunk/rental/inc/class.sogeneric.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/inc/class.sogeneric.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -170,6 +170,49 @@
'menu_selection' =>
'admin::rental::composite_type'
);
break;
+ case 'email_template':
+ $info = array
+ (
+ 'table' =>
'rental_email_template',
+ 'id' => array('name' => 'id',
'type' => 'auto'),
+ 'fields' => array
+ (
+ array
+ (
+ 'name' =>
'name',
+ 'descr' =>
lang('name'),
+ 'type' =>
'varchar'
+ ),
+ array
+ (
+ 'name' =>
'content',
+ 'descr' =>
lang('content'),
+ 'type' => 'text'
+ ),
+ array
+ (
+ 'name' =>
'public',
+ 'descr' =>
lang('public'),
+ 'type' =>
'checkbox'
+ )
+ ),
+ 'edit_msg' => lang('edit'),
+ 'add_msg' => lang('add'),
+ 'name' => lang('email
template'),
+ 'acl_app' => 'rental',
+ 'acl_location' => '.email_out',
+ 'menu_selection' =>
'rental::email_out::email_template',
+ 'default' => array
+ (
+ 'user_id' =>
array('add' => '$this->account'),
+ 'entry_date' =>
array('add' => 'time()'),
+ 'modified_date' =>
array('edit' => 'time()'),
+ ),
+ 'check_grant' => true
+ );
+
+ break;
+
// END RENTAL TABLES
default:
Modified: trunk/rental/inc/class.uimovein.inc.php
===================================================================
--- trunk/rental/inc/class.uimovein.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/inc/class.uimovein.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -26,12 +26,12 @@
* @subpackage movein
* @version $Id: $
*/
- phpgw::import_class('eventplanner.uicommon');
+ phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('phpgwapi.datetime');
include_class('rental', 'movein', 'inc/model/');
- class rental_uimovein extends eventplanner_uicommon
+ class rental_uimovein extends phpgwapi_uicommon
{
public $public_functions = array(
@@ -283,7 +283,7 @@
/**
* (non-PHPdoc)
- * @see eventplanner/inc/eventplanner_uicommon#query()
+ * @see phpgwapi/inc/phpgwapi_uicommon#query()
*/
public function query()
{
Modified: trunk/rental/inc/class.uimoveout.inc.php
===================================================================
--- trunk/rental/inc/class.uimoveout.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/inc/class.uimoveout.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -26,12 +26,12 @@
* @subpackage moveout
* @version $Id: $
*/
- phpgw::import_class('eventplanner.uicommon');
+ phpgw::import_class('phpgwapi.uicommon');
phpgw::import_class('phpgwapi.datetime');
include_class('rental', 'moveout', 'inc/model/');
- class rental_uimoveout extends eventplanner_uicommon
+ class rental_uimoveout extends phpgwapi_uicommon
{
public $public_functions = array(
@@ -282,7 +282,7 @@
/**
* (non-PHPdoc)
- * @see eventplanner/inc/eventplanner_uicommon#query()
+ * @see phpgwapi/inc/phpgwapi_uicommon#query()
*/
public function query()
{
Modified: trunk/rental/setup/setup.inc.php
===================================================================
--- trunk/rental/setup/setup.inc.php 2016-12-29 11:00:30 UTC (rev 16118)
+++ trunk/rental/setup/setup.inc.php 2016-12-29 11:22:45 UTC (rev 16119)
@@ -34,7 +34,10 @@
'rental_moveout',
'rental_moveout_comment',
'rental_movein',
- 'rental_movein_comment'
+ 'rental_movein_comment',
+ 'rental_email_out',
+ 'rental_email_out_party',
+ 'rental_email_template'
);
$setup_info['rental']['enable'] = 1;
$setup_info['rental']['app_group'] = 'office';
Modified: trunk/rental/setup/tables_current.inc.php
===================================================================
--- trunk/rental/setup/tables_current.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/setup/tables_current.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -585,7 +585,7 @@
'phpgw_accounts' => array('account_id' =>
'account_id')
),
'ix' => array(),
- 'uc' => array()
+ 'uc' => array('contract_id')
),
'rental_moveout_comment' => array(
'fd' => array(
@@ -616,7 +616,7 @@
'phpgw_accounts' => array('account_id' =>
'account_id')
),
'ix' => array(),
- 'uc' => array()
+ 'uc' => array('contract_id')
),
'rental_movein_comment' => array(
'fd' => array(
@@ -634,4 +634,51 @@
'uc' => array()
),
+ 'rental_email_out' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 255, 'nullable' => False),
+ 'remark' => array('type' => 'text', 'nullable'
=> True),
+ 'subject' => array('type' => 'text', 'nullable'
=> false),
+ 'content' => array('type' => 'text', 'nullable'
=> True),
+ 'user_id' => array('type' => 'int', 'precision'
=> 4, 'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ 'modified_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'rental_email_out_party' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
+ 'email_out_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'party_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'status' => array('type' => 'int', 'precision'
=> 2, 'nullable' => True, 'default' => '0'),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(
+ 'rental_email_out' => array('email_out_id' =>
'id'),
+ 'rental_party' => array('party_id' => 'id')
+ ),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'rental_email_template' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4, 'nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 255, 'nullable' => False),
+ 'content' => array('type' => 'text', 'nullable'
=> True),
+ 'public' => array('type' => 'int', 'precision'
=> 2, 'nullable' => True),
+ 'user_id' => array('type' => 'int', 'precision'
=> 4, 'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ 'modified_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+
);
Modified: trunk/rental/setup/tables_update.inc.php
===================================================================
--- trunk/rental/setup/tables_update.inc.php 2016-12-29 11:00:30 UTC (rev
16118)
+++ trunk/rental/setup/tables_update.inc.php 2016-12-29 11:22:45 UTC (rev
16119)
@@ -763,7 +763,7 @@
'phpgw_accounts' =>
array('account_id' => 'account_id')
),
'ix' => array(),
- 'uc' => array()
+ 'uc' => array('contract_id')
)
);
@@ -814,7 +814,7 @@
'phpgw_accounts' =>
array('account_id' => 'account_id')
),
'ix' => array(),
- 'uc' => array()
+ 'uc' => array('contract_id')
)
);
@@ -860,3 +860,39 @@
return $GLOBALS['setup_info']['rental']['currentver'];
}
}
+
+ $test[] = '0.1.0.34';
+ function rental_upgrade0_1_0_34()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
+ $GLOBALS['phpgw']->locations->add('.email_out', 'email out',
'rental');
+
+ $GLOBALS['phpgw_setup']->oProc->CreateTable(
+ 'rental_email_template', array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto',
'precision' => 4, 'nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 255, 'nullable' => False),
+ 'content' => array('type' => 'text',
'nullable' => True),
+ 'public' => array('type' => 'int',
'precision' => 2, 'nullable' => True),
+ 'user_id' => array('type' => 'int',
'precision' => 4, 'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ 'modified_date' => array('type' =>
'int', 'precision' => 8, 'nullable' => True, 'default' => 'current_timestamp'),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ )
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['rental']['currentver'] =
'0.1.0.35';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
+ }
+
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16119] more on rental,
sigurdne <=