[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6667] merge 6664:6666 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6667] merge 6664:6666 from trunk |
|
Date: |
Thu, 09 Dec 2010 19:32:10 +0000 |
Revision: 6667
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6667
Author: sigurdne
Date: 2010-12-09 19:32:09 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
merge 6664:6666 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/setup/tables_update.inc.php
branches/Version-1_0-branch/rental/templates/base/common.php
branches/Version-1_0-branch/rental/templates/base/contract.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,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663
+
/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,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666
Modified: branches/Version-1_0-branch/booking/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2010-12-09 14:18:56 UTC (rev 6666)
+++ branches/Version-1_0-branch/booking/setup/tables_update.inc.php
2010-12-09 19:32:09 UTC (rev 6667)
@@ -2406,8 +2406,6 @@
$GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_calendar = 0");
$GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_application int NOT NULL DEFAULT 0");
$GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_application = 0");
- $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
$table ADD COLUMN deactivate_sendmessage int NOT NULL DEFAULT 0");
- $GLOBALS['phpgw_setup']->oProc->m_odb->query("UPDATE $table SET
deactivate_sendmessage = 0");
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
Modified: branches/Version-1_0-branch/rental/templates/base/common.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/common.php
2010-12-09 14:18:56 UTC (rev 6666)
+++ branches/Version-1_0-branch/rental/templates/base/common.php
2010-12-09 19:32:09 UTC (rev 6667)
@@ -31,7 +31,6 @@
} else {
this.disable_left_click = false;
}
-
}
);
}
@@ -120,26 +119,45 @@
};
//... set up a new data table
- this.table = new YAHOO.widget.DataTable(
- this.properties.container,
- this.properties.columns,
- this.source,
- {
- paginator: this.paginator,
- dynamicData: true,
- <?php
- $populate =
phpgw::get_var('populate_form');
- echo isset($populate)? 'initialLoad:
false,':''
- ?>
- <?php
- $initLoad =
phpgw::get_var('initial_load');
- echo ($initLoad == 'no')? 'initialLoad:
false,':''
- ?>
- MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
- MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
- MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
- }
- );
+ if(this.properties.tid == 'total_price')
+ {
+ //if the datatable is display of total price on
contract, always initialize
+ this.table = new YAHOO.widget.DataTable(
+ this.properties.container,
+ this.properties.columns,
+ this.source,
+ {
+ paginator: this.paginator,
+ dynamicData: true,
+ MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
+ MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
+ MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
+ }
+ );
+ }
+ else
+ {
+ this.table = new YAHOO.widget.DataTable(
+ this.properties.container,
+ this.properties.columns,
+ this.source,
+ {
+ paginator: this.paginator,
+ dynamicData: true,
+ <?php
+ $populate =
phpgw::get_var('populate_form');
+ echo isset($populate)?
'initialLoad: false,':''
+ ?>
+ <?php
+ $initLoad =
phpgw::get_var('initial_load');
+ echo ($initLoad == 'no')?
'initialLoad: false,':''
+ ?>
+ MSG_EMPTY: '<?php echo
lang("DATATABLE_MSG_EMPTY")?>',
+ MSG_ERROR: '<?php echo
lang("DATATABLE_MSG_ERROR")?>',
+ MSG_LOADING: '<?php echo
lang("DATATABLE_MSG_LOADING")?>'
+ }
+ );
+ }
//... set table properties
this.table.related = this.properties.related_datatable;
Modified: branches/Version-1_0-branch/rental/templates/base/contract.php
===================================================================
--- branches/Version-1_0-branch/rental/templates/base/contract.php
2010-12-09 14:18:56 UTC (rev 6666)
+++ branches/Version-1_0-branch/rental/templates/base/contract.php
2010-12-09 19:32:09 UTC (rev 6667)
@@ -134,6 +134,13 @@
}
}
}
+ else if(currTab == 'details'){
+ for(i=0;i<YAHOO.rental.datatables.length;i++){
+ if(YAHOO.rental.datatables[i].tid == 'total_price'){
+ reloadDataSources(YAHOO.rental.datatables[i]);
+ }
+ }
+ }
}
</script>
<div id="contract_tabview" class="yui-navset">
@@ -144,9 +151,11 @@
<li><a href="#parties" onclick="javascript:
loadDatatables('parties');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-address-book.png" alt="icon" /> <?php echo
lang('parties') ?></em></a></li>
<li><a href="#price" onclick="javascript:
loadDatatables('price');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/x-office-spreadsheet.png" alt="icon" /> <?php echo
lang('price') ?></em></a></li>
<?php }?>
-
+ <?php if($contract->get_id()>0){?>
+ <li <?php echo (!isset($_POST['add_notification'])) ?
'class="selected"' : "" ?>><a href="#details" onclick="javascript:
loadDatatables('details');" ><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/text-x-generic.png" alt="icon" /> <?php echo
lang('details') ?></em></a></li>
+ <?php }else{?>
<li <?php echo (!isset($_POST['add_notification'])) ?
'class="selected"' : "" ?>><a href="#details"><em><img src="<?php echo
RENTAL_TEMPLATE_PATH ?>images/16x16/mimetypes/text-x-generic.png" alt="icon" />
<?php echo lang('details') ?></em></a></li>
-
+ <?php }?>
<?php if($contract->get_id() > 0) {?>
<li><a href="#invoice" onclick="javascript:
loadDatatables('invoice');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/mimetypes/text-x-generic.png" alt="icon" /> <?php echo
lang('invoice') ?></em></a></li>
<li <?php echo (phpgw::get_var('tab') == 'documents') ?
'class="selected"' : ""?>><a href="#documents" onclick="javascript:
loadDatatables('documents');"><em><img src="<?php echo RENTAL_TEMPLATE_PATH
?>images/16x16/apps/system-file-manager.png" alt="icon" /> <?php echo
lang('documents') ?></em></a></li>
@@ -254,7 +263,7 @@
if($editable &&
(!isset($contract_id) || $contract_id <= 0)) {
?>
- <input
type="hidden" name="location_id" id="location_id" value="<?php echo
$contract->get_location_id() ?>"/>
+ <input
type="hidden" name="location_id" id="location_id" value="<?php echo
$contract->get_location_id() ?>" />
<?php
}
echo
lang($contract->get_contract_type_title());
@@ -392,7 +401,7 @@
<?php
if ($editable) {
?>
- <input type="text"
name="invoice_header" id="invoice_header" value="<?php echo
$contract->get_invoice_header(); ?>"/>
+ <input type="text"
name="invoice_header" id="invoice_header" value="<?php echo
$contract->get_invoice_header(); ?>" />
<?php
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6667] merge 6664:6666 from trunk,
Sigurd Nes <=