[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6577] merge 6570:6576 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6577] merge 6570:6576 from trunk |
|
Date: |
Wed, 10 Nov 2010 15:23:37 +0000 |
Revision: 6577
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6577
Author: sigurdne
Date: 2010-11-10 15:23:37 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
merge 6570:6576 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
branches/Version-1_0-branch/rental/setup/phpgw_no.lang
branches/Version-1_0-branch/rental/setup/setup.inc.php
branches/Version-1_0-branch/rental/setup/tables_update.inc.php
branches/Version-1_0-branch/rental/templates/base/adjustment.php
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
branches/Version-1_0-branch/rental/templates/base/contract.php
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576
Modified: branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -185,8 +185,16 @@
$options['location'] =
isset($config->config_data['soap_location']) &&
$config->config_data['soap_location'] ? $config->config_data['soap_location'] :
'';// 'http://soat1a.srv.bergenkom.no:8888/gateway/services/BrukerService-v1';
$options['uri'] =
isset($config->config_data['soap_uri']) && $config->config_data['soap_uri'] ?
$config->config_data['soap_uri'] : '';// 'http://soat1a.srv.bergenkom.no';
$options['trace'] = 1;
- $options['proxy_host'] =
isset($config->config_data['soap_proxy_host']) &&
$config->config_data['soap_proxy_host'] ?
$config->config_data['soap_proxy_host'] : '';// '';
- $options['proxy_port'] =
isset($config->config_data['soap_proxy_port']) &&
$config->config_data['soap_proxy_port'] ?
$config->config_data['soap_proxy_port'] : '';// '';
+
+ if(isset($config->config_data['soap_proxy_host']) &&
$config->config_data['soap_proxy_host'])
+ {
+ $options['proxy_host'] =
$config->config_data['soap_proxy_host'];
+ }
+
+ if(isset($config->config_data['soap_proxy_port']) &&
$config->config_data['soap_proxy_port'])
+ {
+ $options['proxy_port'] =
$config->config_data['soap_proxy_port'];
+ }
$options['encoding'] =
isset($config->config_data['soap_encoding']) &&
$config->config_data['soap_encoding'] ? $config->config_data['soap_encoding'] :
'UTF-8';
$options['login'] =
isset($config->config_data['soap_login']) && $config->config_data['soap_login']
? $config->config_data['soap_login'] : '';
$options['password'] =
isset($config->config_data['soap_password']) &&
$config->config_data['soap_password'] ? $config->config_data['soap_password'] :
'';
Modified: branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/inc/class.soadjustment.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -65,7 +65,7 @@
}
else
{
- $cols = 'id, price_item_id, responsibility_id,
new_price, percent, adjustment_interval, adjustment_date, adjustment_type,
is_executed';
+ $cols = 'id, price_item_id, responsibility_id,
new_price, percent, adjustment_interval, adjustment_date, adjustment_type,
is_executed, year';
$order = $sort_field ? "ORDER BY
{$this->marshal($sort_field, 'field')} $dir ": ' ORDER BY adjustment_date DESC';
}
@@ -86,6 +86,7 @@
$adjustment->set_adjustment_type($this->unmarshal($this->db->f('adjustment_type'),
'string'));
$adjustment->set_is_manual($this->unmarshal($this->db->f('is_manual'),'bool'));
$adjustment->set_is_executed($this->unmarshal($this->db->f('is_executed'),'bool'));
+
$adjustment->set_year($this->unmarshal($this->db->f('year'), 'int'));
}
return $adjustment;
@@ -114,7 +115,8 @@
'adjustment_date = ' . $adjustment->get_adjustment_date(),
'adjustment_type = \'' .
$adjustment->get_adjustment_type() . '\'',
'is_manual = ' . ($adjustment->is_manual() ? "true" :
"false"),
- 'is_executed = ' . ($adjustment->is_executed() ? "true"
: "false")
+ 'is_executed = ' . ($adjustment->is_executed() ? "true"
: "false"),
+ 'year = ' . $adjustment->get_year()
);
$result = $this->db->query('UPDATE rental_adjustment SET ' .
join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
@@ -131,7 +133,7 @@
public function add(&$adjustment)
{
// Build a db-friendly array of the adjustment object
- $cols = array('price_item_id', 'responsibility_id',
'new_price', 'percent', 'adjustment_interval', 'adjustment_date',
'adjustment_type', 'is_manual', 'is_executed');
+ $cols = array('price_item_id', 'responsibility_id',
'new_price', 'percent', 'adjustment_interval', 'adjustment_date',
'adjustment_type', 'is_manual', 'is_executed', 'year');
$values = array(
$adjustment->get_price_item_id(),
$adjustment->get_responsibility_id(),
@@ -141,7 +143,8 @@
$adjustment->get_adjustment_date(),
'\''.$adjustment->get_adjustment_type().'\'',
($adjustment->is_manual() ? "true" : "false"),
- ($adjustment->is_executed() ? "true" : "false")
+ ($adjustment->is_executed() ? "true" : "false"),
+ $adjustment->get_year()
);
$query ="INSERT INTO rental_adjustment (" . join(',', $cols) .
") VALUES (" . join(',', $values) . ")";
@@ -156,7 +159,8 @@
{
$query = "SELECT * FROM rental_adjustment WHERE " .
"responsibility_id =
{$adjustment->get_responsibility_id()} " .
- "AND adjustment_date =
{$adjustment->get_adjustment_date()} " .
+ "AND adjustment_date =
{$adjustment->get_adjustment_date()} " .
+ "AND year = {$adjustment->year()} " .
"AND adjustment_interval =
{$adjustment->get_interval()} " .
"AND percent = {$adjustment->get_percent()}";
$result = $this->db->query($query);
@@ -219,6 +223,7 @@
$adjustment->set_adjustment_type($this->unmarshal($this->db->f('adjustment_type'),
'string'));
$adjustment->set_is_manual($this->unmarshal($this->db->f('is_manual'),'bool'));
$adjustment->set_is_executed($this->unmarshal($this->db->f('is_executed'),'bool'));
+
$adjustment->set_year($this->unmarshal($this->db->f('year'), 'int'));
$adjustments[] = $adjustment;
}
@@ -252,6 +257,7 @@
* update price book elements according to type if interval=1
*/
$current_year = (int)date('Y');
+
//var_dump("innicontr");
foreach ($adjustments as $adjustment)
{
@@ -259,7 +265,7 @@
$adjustable_contracts = "SELECT id, adjustment_share,
date_start, adjustment_year FROM rental_contract ";
$adjustable_contracts .= "WHERE location_id =
'{$adjustment->get_responsibility_id()}' AND adjustable ";
$adjustable_contracts .= "AND (";
- $adjustable_contracts .= "(adjustment_interval =
{$adjustment->get_interval()} AND (adjustment_year +
{$adjustment->get_interval()}) = {$current_year})";
+ $adjustable_contracts .= "(adjustment_interval =
{$adjustment->get_interval()} AND (adjustment_year +
{$adjustment->get_interval()}) = {$adjustment->get_year()})";
$adjustable_contracts .= " OR ";
$adjustable_contracts .= "(adjustment_year IS NULL OR
adjustment_year = 0)";
$adjustable_contracts .= ")";
@@ -273,10 +279,10 @@
$adj_year =
$this->unmarshal($this->db->f('adjustment_year', true), 'int');
$start_year = date('Y', $date_start);
- if(($adj_year != null && $adj_year > 0) ||
(($adj_year == null || $adj_year == 0) && ($start_year +
$adjustment->get_interval() == $current_year)))
+ if(($adj_year != null && $adj_year > 0) ||
(($adj_year == null || $adj_year == 0) && ($start_year +
$adjustment->get_interval() == $adjustment->get_year())))
{
//update adjustment_year on contract
-
rental_socontract::get_instance()->update_adjustment_year($contract_id,
$current_year);
+
rental_socontract::get_instance()->update_adjustment_year($contract_id,
$adjustment->get_year());
//gather price items to be adjusted
$contract_price_items =
rental_socontract_price_item::get_instance()->get(null, null, null, null, null,
null, array('contract_id' => $contract_id));
foreach($contract_price_items as $cpi)
Modified: branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/inc/class.socontract.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -179,9 +179,15 @@
$adjustment_interval =
$this->marshal($filters['adjustment_interval'],'int');
$adjustment_year =
$this->marshal($filters['adjustment_year'],'int');
+ if($this->marshal($filters['adjustment_is_executed'])){
+ $filter_clauses[] = "contract.adjustment_year =
{$adjustment_year}";
+ }
+ else{
+ $filter_clauses[] = "contract.adjustment_year +
{$adjustment_interval} = {$adjustment_year}";
+ }
$filter_clauses[] = "contract.adjustable IS true";
- //$filter_clauses[] = "contract.adjustment_interval =
{$adjustment_interval}";
- //$filter_clauses[] = "contract.adjustment_year +
{$adjustment_interval} = {$adjustment_year}";
+ $filter_clauses[] = "contract.adjustment_interval =
{$adjustment_interval}";
+
}
/*
Modified: branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/inc/class.uiadjustment.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -156,6 +156,7 @@
$adjustment_date =
strtotime(phpgw::get_var('adjustment_date_hidden'));
if(isset($adjustment)){
+
$adjustment->set_year(phpgw::get_var('adjustment_year'));
$adjustment->set_adjustment_date($adjustment_date);
$adjustment->set_price_item_id(0);
if(isset($responsibility_id) &&
$responsibility_id > 0)
@@ -269,7 +270,10 @@
public function show_affected_contracts()
{
$adjustment_id = (int)phpgw::get_var('id');
- $this->render('contracts_for_regulation_list.php',
array('adjustment_id' => $adjustment_id));
+ $adjustment =
rental_soadjustment::get_instance()->get_single($adjustment_id);
+ $this->render('contracts_for_regulation_list.php',
array('adjustment_id' => $adjustment_id,
+
'adjustment' =>
$adjustment,
+
'cancel_link' =>
self::link(array('menuaction' => 'rental.uiadjustment.index'))));
}
public function run_adjustments()
Modified: branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/inc/class.uicontract.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -80,9 +80,7 @@
case 'contracts_for_adjustment':
$adjustment_id =
(int)phpgw::get_var('id');
$adjustment =
rental_soadjustment::get_instance()->get_single($adjustment_id);
- $adjustment_date =
$adjustment->get_adjustment_date();
- $adjustment_year =
date('Y',$adjustment_date);
- $filters = array('contract_type' =>
$adjustment->get_responsibility_id(), 'adjustment_interval' =>
$adjustment->get_interval(), 'adjustment_year' => $adjustment_year);
+ $filters = array('contract_type' =>
$adjustment->get_responsibility_id(), 'adjustment_interval' =>
$adjustment->get_interval(), 'adjustment_year' => $adjustment->get_year(),
'adjustment_is_executed' => $adjustment->is_executed());
break;
case 'contracts_part':
// Contracts for this party
$filters = array('party_id' =>
phpgw::get_var('party_id'),'contract_status' =>
phpgw::get_var('contract_status'), 'contract_type' =>
phpgw::get_var('contract_type'), 'status_date_hidden' =>
phpgw::get_var('status_date_hidden'));
@@ -184,7 +182,7 @@
if(!$export){
//Add context menu columns (actions and labels)
- array_walk($rows, array($this, 'add_actions'),
array($type,$ids));
+ array_walk($rows, array($this, 'add_actions'),
array($type,$ids,$adjustment_id));
}
//var_dump("Usage " .memory_get_usage() . " bytes after
menu");
@@ -209,6 +207,7 @@
$type = $params[0];
$ids = $params[1];
+ $adjustment_id = $params[2];
switch($type)
{
@@ -231,6 +230,28 @@
$value['labels'][] =
lang('show');
}
break;
+ case 'contracts_for_adjustment':
+ if(!isset($ids) || count($ids) > 0)
+ {
+ $value['ajax'][] = false;
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.edit',
+
'id' => $value['id'],
+
'initial_load' => 'no',
+
'adjustment_id' => $adjustment_id)));
+ $value['labels'][] =
lang('edit');
+ $value['ajax'][] = false;
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' =>
'rental.uicontract.copy_contract',
+
'id' => $value['id'],
+
'adjustment_id' => $adjustment_id)));
+ $value['labels'][] =
lang('copy');
+ }
+ $value['ajax'][] = false;
+ $value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
+
'id' => $value['id'],
+
'initial_load' => 'no',
+
'adjustment_id' => $adjustment_id)));
+ $value['labels'][] = lang('show');
+ break;
default:
if(!isset($ids) || count($ids) > 0)
{
@@ -244,7 +265,6 @@
$value['ajax'][] = false;
$value['actions'][] =
html_entity_decode(self::link(array('menuaction' => 'rental.uicontract.view',
'id' => $value['id'], 'initial_load' => 'no')));
$value['labels'][] = lang('show');
-
}
}
@@ -274,6 +294,14 @@
public function viewedit($editable, $contract_id, $contract =
null, $location_id = null, $notification = null, string $message = null, string
$error = null)
{
+ $cancel_link = self::link(array('menuaction' =>
'rental.uicontract.index', 'populate_form' => 'yes'));
+ $adjustment_id = (int)phpgw::get_var('adjustment_id');
+ if($adjustment_id){
+ $cancel_link = self::link(array('menuaction' =>
'rental.uiadjustment.show_affected_contracts','id' => $adjustment_id));
+ $cancel_text = 'contract_regulation_back';
+ }
+
+
if (isset($contract_id) && $contract_id > 0) {
if($contract == null){
$contract =
rental_socontract::get_instance()->get_single($contract_id);
@@ -299,7 +327,8 @@
'editable' => $editable,
'message' => isset($message) ?
$message : phpgw::get_var('message'),
'error' => isset($error) ?
$error : phpgw::get_var('error'),
- 'cancel_link' =>
self::link(array('menuaction' => 'rental.uicontract.index', 'populate_form' =>
'yes')),
+ 'cancel_link' => $cancel_link,
+ 'cancel_text' => $cancel_text
);
$contract->check_consistency();
$this->render('contract.php', $data);
@@ -322,7 +351,8 @@
'editable' => true,
'message' =>
isset($message) ? $message : phpgw::get_var('message'),
'error' =>
isset($error) ? $error : phpgw::get_var('error'),
- 'cancel_link' =>
self::link(array('menuaction' => 'rental.uicontract.index')),
+ 'cancel_link' =>
$cancel_link,
+ 'cancel_text' =>
$cancel_text
);
$this->render('contract.php',
$data);
}
@@ -582,6 +612,8 @@
*/
public function copy_contract()
{
+ $adjustment_id = (int)phpgw::get_var('adjustment_id');
+
$so_contract = rental_socontract::get_instance();
$contract =
$so_contract->get_single(phpgw::get_var('id'));
$old_contract_old_id = $contract->get_old_contract_id();
@@ -602,17 +634,17 @@
if($success){
$db_contract->transaction_commit();
$message =
lang(messages_new_contract_copied).' '.$old_contract_old_id;
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' => $message));
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' => $message,
'adjustment_id' => $adjustment_id));
}
else{
$db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error')));
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error'),'adjustment_id' => $adjustment_id));
}
}
else
{
$db_contract->transaction_abort();
-
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error')));
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' =>
'rental.uicontract.edit', 'id' => $contract->get_id(), 'message' =>
lang('messages_form_error'),'adjustment_id' => $adjustment_id));
}
}
Modified: branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/inc/model/class.adjustment.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -9,6 +9,7 @@
protected $new_price;
protected $percent;
protected $adjustment_date;
+ protected $year;
protected $is_manual;
protected $interval;
protected $adjustment_type;
@@ -75,6 +76,16 @@
return $this->adjustment_date;
}
+ public function set_year($year)
+ {
+ $this->year = $year;
+ }
+
+ public function get_year()
+ {
+ return $this->year;
+ }
+
public function set_adjustment_date($adjustment_date)
{
$this->adjustment_date = $adjustment_date;
@@ -142,7 +153,8 @@
'interval' => $this->get_interval(),
'adjustment_type' =>
lang(($this->get_adjustment_type())?$this->get_adjustment_type():'none'),
'adjustment_date' => date($date_format,
$this->get_adjustment_date()),
- 'is_executed' => lang(($this->is_executed())?'yes':'no')
+ 'is_executed' =>
lang(($this->is_executed())?'yes':'no'),
+ 'year' => $this->get_year()
);
}
}
Modified: branches/Version-1_0-branch/rental/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2010-11-10
15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/setup/phpgw_no.lang 2010-11-10
15:23:37 UTC (rev 6577)
@@ -109,6 +109,8 @@
contract_under_dismissal rental no Under avslutning
contract_notifications rental no Kontraktens varsler
contract_notification_status rental no Status
+contracts_for_regulation rental no Regulering med tilhørende
kontrakter
+contract_regulation_back rental no Regulering
contracts_removed rental no Kontrakter som er fjernet fra
fakturakjøringen
contracts_with_one_time rental no Kontrakter med engangsbeløp
contracts_in_cycle rental no Kontrakter som følger vanlig
fakturasyklus
@@ -423,6 +425,7 @@
recurrence rental no Gjentakelse
reference rental no Deres ref
regulation rental no Regulering
+regulation_back rental no Reguleringsliste
related_delegates rental no Delegater
remove rental no Fjern
remove_from_workbench rental no Fjern fra mitt skrivebord
@@ -475,6 +478,7 @@
service_exist rental no Eksisterer
set_payer rental no Sett som fakturamottaker
shortcuts rental no Snarveier
+show_affected_contracts rental no Vis kontrakter relatert til
reguleringen
showing_composite rental no Leieobjekt
showing_contract rental no Kontrakt
showing rental no Viser priselement
Modified: branches/Version-1_0-branch/rental/setup/setup.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/setup.inc.php 2010-11-10
15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/setup/setup.inc.php 2010-11-10
15:23:37 UTC (rev 6577)
@@ -1,6 +1,6 @@
<?php
$setup_info['rental']['name'] = 'rental'; // Module
identifier
- $setup_info['rental']['version'] = '0.1.0.11'; // Current module
version
+ $setup_info['rental']['version'] = '0.1.0.12'; // Current module
version
$setup_info['rental']['app_order'] = 51; // (?)
$setup_info['rental']['tables'] = array(
'rental_party', // All
contract participants, tenants etc.
Modified: branches/Version-1_0-branch/rental/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/setup/tables_update.inc.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -204,4 +204,26 @@
return $GLOBALS['setup_info']['rental']['currentver'];
}
+ $test[] = '0.1.0.11';
+ function rental_upgrade0_1_0_11()
+ {
+ // Add adjustment year column
+ $GLOBALS['phpgw_setup']->oProc->AddColumn('rental_adjustment',
'year', array(
+ 'type' => 'int',
+ 'nullable' => true,
+ 'precision' => '4'
+ ));
+
+ // Update year column to match the adjustment_date of all
existing adjustments
+ $so = CreateObject('rental.soadjustment');
+ foreach ($so->get(0, NULL, NULL, true, NULL, NULL, NULL) as
$adjustment) {
+ $year = strftime('%Y',
$adjustment->get_adjustment_date());
+ $adjustment->set_year($year);
+ $so->store($adjustment);
+ }
+
+ $GLOBALS['setup_info']['rental']['currentver'] = '0.1.0.12';
+ return $GLOBALS['setup_info']['rental']['currentver'];
+ }
+
?>
\ No newline at end of file
Modified: branches/Version-1_0-branch/rental/templates/base/adjustment.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/adjustment.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/templates/base/adjustment.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -58,6 +58,33 @@
?>
</dd>
<dt>
+ <label for="adjustment_year"><?php echo lang('year')
?></label>
+ </dt>
+ <dd>
+ <?php
+
+ if ($editable) {
+ ?>
+ <select name="adjustment_year"
id="adjustment_year">
+ <?php
+ $this_year = date('Y');
+ $years =
rental_contract::get_year_range();
+ foreach($years as $year)
+ {
+ ?>
+ <option value="<?php echo $year
?>"<?php echo $this_year == $year ? ' selected="selected"' : '' ?>><?php echo
$year ?></option>
+ <?php
+ }
+ ?>
+ </select>
+ <?php
+ }
+ else{
+ echo $adjustment->get_year();
+ }
+ ?>
+ </dd>
+ <dt>
<label for="adjustment_date"><?php echo
lang('adjustment_date') ?></label>
</dt>
<dd>
Modified:
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
2010-11-10 15:21:22 UTC (rev 6576)
+++
branches/Version-1_0-branch/rental/templates/base/adjustment_list_partial.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -36,6 +36,11 @@
// Defining columns for datatable
var columnDefs = [
{
+ key: "year",
+ label: "<?php echo lang('year') ?>",
+ sortable: true
+ },
+ {
key: "adjustment_date",
label: "<?php echo lang('adjustment_date') ?>",
sortable: true
Modified: branches/Version-1_0-branch/rental/templates/base/contract.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract.php
2010-11-10 15:21:22 UTC (rev 6576)
+++ branches/Version-1_0-branch/rental/templates/base/contract.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -31,7 +31,11 @@
<div class="identifier-header">
<h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/mimetypes/text-x-generic.png" /> <?php echo
lang('showing_contract') ?></h1>
<div style="float: left; width: 50%;">
- <button onclick="javascript:window.location.href ='<?php echo
$cancel_link;?>;'">« <?php echo
lang('contract_back');?></button><br/>
+ <?php
+ $back_button = lang('contract_back');
+ if($cancel_text) $back_button = lang($cancel_text);
+ ?>
+ <button onclick="javascript:window.location.href ='<?php echo
$cancel_link;?>;'">« <?php echo $back_button;?></button><br/>
<label><?php echo lang('contract_number') ?> </label>
<?php if($contract->get_old_contract_id()){
echo $contract->get_old_contract_id();
Modified:
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
===================================================================
---
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
2010-11-10 15:21:22 UTC (rev 6576)
+++
branches/Version-1_0-branch/rental/templates/base/contracts_for_regulation_list.php
2010-11-10 15:23:37 UTC (rev 6577)
@@ -2,22 +2,59 @@
include("common.php");
?>
-
-<h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/text-x-generic.png" /> <?php echo
lang('contracts_for_regulation') ?></h1>
-
-<?php
-
-$list_form = false;
-$list_id = 'contracts_for_adjustment';
-$url_add_on = '&type='.$list_id.'&id='.$adjustment_id;
-$editable = false;
-$extra_cols = array(
- array("key" => "type", "label" => lang('responsibility'), "index" => 3),
- array("key" => "composite", "label" => lang('composite'),
"sortable"=>'true', "index" => 4),
- array("key" => "party", "label" => lang('party'), "sortable"=>'true',
"index" => 5),
- array("key" => "adjustment_interval", "label" =>
lang('adjustment_interval'), "sortable"=>false),
- array("key" => "adjustment_share", "label" => lang('adjustment_share'),
"sortable"=>false),
- array("key" => "adjustment_year", "label" => lang('adjustment_year'),
"sortable"=>false)
-);
-include('contract_list_partial.php');
-?>
\ No newline at end of file
+<div class="identifier-header">
+ <h1><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/32x32/text-x-generic.png" /> <?php echo
lang('contracts_for_regulation') ?></h1>
+ <div style="float: left; width: 50%;">
+ <button onclick="javascript:window.location.href ='<?php echo
$cancel_link;?>;'">« <?php echo
lang('regulation_back');?></button><br/>
+ <label for="name"><?php echo lang('field_of_responsibility')
?></label>
+ <?php echo
lang(rental_socontract::get_instance()->get_responsibility_title($adjustment->get_responsibility_id()));
?>
+ <br/>
+ <label for="adjustment_type"><?php echo
lang('adjustment_type')?></label>
+ <?php
+ if($adjustment->get_adjustment_type()){
+ echo lang($adjustment->get_adjustment_type());
+ }
+ else{
+ echo lang('none');
+ }
+ ?>
+ <br/>
+ <label for="percent"><?php echo lang('percent') ?></label>
+ <?php echo $adjustment->get_percent(). "%"; ?>
+ <br/>
+ <label for="interval"><?php echo lang('interval') ?></label>
+ <?php echo $adjustment->get_interval().' '.lang('year'); ?>
+ <br/>
+ <label for="adjustment_year"><?php echo lang('year') ?></label>
+ <?php echo $adjustment->get_year(); ?>
+ <br/>
+ <label for="adjustment_date"><?php echo lang('adjustment_date')
?></label>
+ <?php
+ $adjustment_date = $adjustment->get_adjustment_date() ?
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$adjustment->get_adjustment_date()) : '-';
+ echo $adjustment_date;
+ ?>
+ <br/>
+ <?php if($adjustment->is_executed()){?>
+ <label for="is_executed"><?php echo
lang("adjustment_is_executed")?></label>
+ <?php }else{?>
+ <label for="is_executed"><?php echo
lang("adjustment_is_not_executed")?></label>
+ <?php }?>
+ </div>
+ <div style="float: left; width: 100%;">
+ <?php
+ $list_form = false;
+ $list_id = 'contracts_for_adjustment';
+ $url_add_on = '&type='.$list_id.'&id='.$adjustment_id;
+ $editable = false;
+ $extra_cols = array(
+ array("key" => "type", "label" =>
lang('responsibility'), "index" => 3),
+ array("key" => "composite", "label" =>
lang('composite'), "sortable"=>'true', "index" => 4),
+ array("key" => "party", "label" => lang('party'),
"sortable"=>'true', "index" => 5),
+ array("key" => "adjustment_interval", "label" =>
lang('adjustment_interval'), "sortable"=>false),
+ array("key" => "adjustment_share", "label" =>
lang('adjustment_share'), "sortable"=>false),
+ array("key" => "adjustment_year", "label" =>
lang('adjustment_year'), "sortable"=>false)
+ );
+ include('contract_list_partial.php');
+ ?>
+ </div>
+</div>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6577] merge 6570:6576 from trunk,
Sigurd Nes <=