details: /erp/devel/pi/rev/321844abf129
changeset: 7425:321844abf129
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 25 17:41:43 2010 +0200
summary: Fixed bug 13051: Uncorrect date format in Copy from Settlement
diffstat:
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html | 2
+-
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml | 12
+++++----
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement_data.xsql | 7
+++--
3 files changed, 12 insertions(+), 9 deletions(-)
diffs (79 lines):
diff -r 88101b1f1a5f -r 321844abf129
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
Tue May 25 17:07:25 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.html
Tue May 25 17:41:43 2010 +0200
@@ -450,7 +450,7 @@
<table border="0" cellspacing="0" cellpadding="0"
summary="" style="padding-top: 0px;">
<tr>
<td class="TextBox_ContentCell">
- <input dojotype="openbravo:DateTextbox"
displayformat="xx" saveformat="yy" class="dojoValidateValid
TextBox_btn_OneCell_width" type="text" name="inpDatexx" id="paramfieldDate"
size="10" maxlength="10" value="" onkeyup="autoCompleteDate(this.textbox,
this.displayFormat);return
true;"></input><script>djConfig.searchIds.push("paramfieldDate");</script>
+ <input dojotype="openbravo:DateTextbox"
displayformat="xx" saveformat="yy" class="dojoValidateValid
TextBox_btn_OneCell_width" type="text" name="inpDatexx" id="paramfieldDatexx"
size="10" maxlength="10" value="" onkeyup="autoCompleteDate(this.textbox,
this.displayFormat);return true;"></input><script
id="dateScript">djConfig.searchIds.push("paramfieldDatexx");</script>
</td>
<td class="FieldButton_bg">
<a id="dynamicDate" class="FieldButtonLink"
href="#" onfocus="setWindowElementFocus(this); window.status='Calendar';return
true;" onblur="window.status=''; return true;"
onkeypress="this.className='FieldButtonLink_active'; return true;"
onkeyup="this.className='FieldButtonLink_focus'; return true;"
onclick="showCalendar('frmMain.inpDatexx', document.frmMain.inpDateyy.value,
false);return false;">
diff -r 88101b1f1a5f -r 321844abf129
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
Tue May 25 17:07:25 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement.xml
Tue May 25 17:41:43 2010 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -32,8 +32,8 @@
<PARAMETER id="paramDateTo" name="dateTo" attribute="value" default=""/>
<PARAMETER id="paramDateTo" name="dateTodisplayFormat"
attribute="displayformat" replace="xx"/>
<PARAMETER id="paramDateTo" name="dateTosaveFormat" attribute="saveformat"
replace="yy"/>
- <PARAMETER id="paramfieldDate" name="dateTodisplayFormat"
attribute="displayformat" replace="xx"/>
- <PARAMETER id="paramfieldDate" name="dateTosaveFormat"
attribute="saveformat" replace="yy"/>
+ <PARAMETER id="paramfieldDatexx" name="dateTodisplayFormat"
attribute="displayformat" replace="xx"/>
+ <PARAMETER id="paramfieldDatexx" name="dateTosaveFormat"
attribute="saveformat" replace="yy"/>
<PARAMETER id="messageBoxID" name="messageType" attribute="class"
replace="yy" default="HIDDEN"/>
<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
@@ -68,8 +68,10 @@
<FIELD id="fieldRefButtonBPartner" attribute="onclick"
replace="zz">cDebtPaymentId</FIELD>
<FIELD id="fieldBpartnerdescription" attribute="name"
replace="xx">cDebtPaymentId</FIELD>
<FIELD id="fieldBpartnerdescription" attribute="value">tercero</FIELD>
- <FIELD id="paramfieldDate" attribute="name"
replace="xx">cDebtPaymentId</FIELD>
- <FIELD id="paramfieldDate" attribute="value">dateplanned</FIELD>
+ <FIELD id="paramfieldDatexx" attribute="name"
replace="xx">cDebtPaymentId</FIELD>
+ <FIELD id="paramfieldDatexx" attribute="value">dateplanned</FIELD>
+ <FIELD id="paramfieldDatexx" attribute="id"
replace="xx">cDebtPaymentId</FIELD>
+ <FIELD id="dateScript">scriptDate</FIELD>
<FIELD id="dynamicDate" attribute="onclick"
replace="xx">cDebtPaymentId</FIELD>
<FIELD id="dynamicDate" attribute="onclick"
replace="yy">cDebtPaymentId</FIELD>
<FIELD id="fieldRefButtonDate" attribute="onclick"
replace="xx">cDebtPaymentId</FIELD>
diff -r 88101b1f1a5f -r 321844abf129
src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement_data.xsql
Tue May 25 17:07:25 2010 +0530
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CopyFromSettlement_data.xsql
Tue May 25 17:41:43 2010 +0200
@@ -12,7 +12,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2001-2008 Openbravo SLU
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -31,7 +31,7 @@
amount, writeoffamt, glitemamt, c_glitem_id, isdirectposting, 0 as
amountdebit, status_initial as status,
0 as amountcredit, c_currency_id, c_bankaccount_id, ismanual, '' as
client, '' as org, '' as datetrx,
'' as c_settlement_id, '' as documentno, '' AS
C_DEBT_PAYMENT_BALANCING_ID, '' AS TERCERO, '' AS EFECTO,
- '' AS CONCEPTO, '' AS DATEPLANNED, '' AS DATEFORMAT
+ '' AS CONCEPTO, '' AS DATEPLANNED, '' AS DATEFORMAT, '' AS SCRIPTDATE
FROM C_DEBT_PAYMENT
WHERE c_settlement_generate_id = ?
AND isactive='Y'
@@ -163,7 +163,8 @@
C_BPARTNER.NAME AS TERCERO, C_BPARTNER.NAME || ' - '
||AD_REF_LIST_V.NAME ||' - ' || TO_CHAR(C_DEBT_PAYMENT.DATEPLANNED, ?) AS
EFECTO,
C_GLITEM.NAME AS CONCEPTO, C_DEBT_PAYMENT.DATEPLANNED AS DATEPLANNED,
C_DEBT_PAYMENT_BALANCING.AMOUNTCREDIT,
C_DEBT_PAYMENT_BALANCING.AMOUNTDEBIT,
- C_BPARTNER.C_BPARTNER_ID, C_DEBT_PAYMENT.AMOUNT, to_char(?) AS
dateformat
+ C_BPARTNER.C_BPARTNER_ID, C_DEBT_PAYMENT.AMOUNT, to_char(?) AS
dateformat,
+ 'djConfig.searchIds.push(\"paramfieldDate' ||
C_DEBT_PAYMENT.C_DEBT_PAYMENT_ID || '\");' AS SCRIPTDATE
FROM (C_SETTLEMENT LEFT JOIN C_DEBT_PAYMENT ON
C_DEBT_PAYMENT.C_SETTLEMENT_GENERATE_ID = C_SETTLEMENT.C_SETTLEMENT_ID)
LEFT JOIN C_DEBT_PAYMENT_BALANCING ON
C_DEBT_PAYMENT_BALANCING.C_DEBT_PAYMENT_ID = C_DEBT_PAYMENT.C_DEBT_PAYMENT_ID
LEFT JOIN C_GLITEM ON C_DEBT_PAYMENT_BALANCING.C_GLITEM_ID =
C_GLITEM.C_GLITEM_ID
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
