details: /erp/devel/pi/rev/ee9c0af5acac
changeset: 10110:ee9c0af5acac
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Jan 24 19:24:22 2011 +0100
summary: Fixes bug 0015751: 3.0RC3: Account schema information for the US in
the demo data do not appear in the G/L Item setup screen
details: /erp/devel/pi/rev/cb0dfdfa6fea
changeset: 10111:cb0dfdfa6fea
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Mon Jan 24 19:25:43 2011 +0100
summary: Fixes bug 15350: Wrong labels displayed in payment out flow
diffstat:
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
| 22 +++++-----
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
| 2 +-
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
| 2 +-
modules/org.openbravo.v3/src-db/database/configScript.xml
| 4 -
4 files changed, 13 insertions(+), 17 deletions(-)
diffs (77 lines):
diff -r 9252c832c17e -r cb0dfdfa6fea
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
Mon Jan 24 19:13:19 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
Mon Jan 24 19:25:43 2011 +0100
@@ -869,17 +869,6 @@
<!--7FCABF4ECC235B45E040007F010006FB-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--7FCABF4ECC235B45E040007F010006FB--></AD_TEXTINTERFACES>
-<!--7FCABF4ECC255B45E040007F010006FB--><AD_TEXTINTERFACES>
-<!--7FCABF4ECC255B45E040007F010006FB-->
<AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC255B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
-<!--7FCABF4ECC255B45E040007F010006FB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7FCABF4ECC255B45E040007F010006FB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7FCABF4ECC255B45E040007F010006FB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7FCABF4ECC255B45E040007F010006FB--> <TEXT><![CDATA[Leave the credit to be
used later]]></TEXT>
-<!--7FCABF4ECC255B45E040007F010006FB-->
<FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
-<!--7FCABF4ECC255B45E040007F010006FB--> <ISUSED><![CDATA[Y]]></ISUSED>
-<!--7FCABF4ECC255B45E040007F010006FB-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--7FCABF4ECC255B45E040007F010006FB--></AD_TEXTINTERFACES>
-
<!--7FCABF4ECC275B45E040007F010006FB--><AD_TEXTINTERFACES>
<!--7FCABF4ECC275B45E040007F010006FB-->
<AD_TEXTINTERFACES_ID><![CDATA[7FCABF4ECC275B45E040007F010006FB]]></AD_TEXTINTERFACES_ID>
<!--7FCABF4ECC275B45E040007F010006FB-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1133,6 +1122,17 @@
<!--830FA1141953448A9C61821616C9421E-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--830FA1141953448A9C61821616C9421E--></AD_TEXTINTERFACES>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--><AD_TEXTINTERFACES>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C-->
<AD_TEXTINTERFACES_ID><![CDATA[833BFA5F74CC4EFC8642DFEA58B3A22C]]></AD_TEXTINTERFACES_ID>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--> <TEXT><![CDATA[Leave this amount to
be used later]]></TEXT>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C-->
<FILENAME><![CDATA[/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html]]></FILENAME>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--833BFA5F74CC4EFC8642DFEA58B3A22C--></AD_TEXTINTERFACES>
+
<!--8410F4A3878C872EE040007F010014BF--><AD_TEXTINTERFACES>
<!--8410F4A3878C872EE040007F010014BF-->
<AD_TEXTINTERFACES_ID><![CDATA[8410F4A3878C872EE040007F010014BF]]></AD_TEXTINTERFACES_ID>
<!--8410F4A3878C872EE040007F010014BF-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 9252c832c17e -r cb0dfdfa6fea
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Mon Jan 24 19:13:19 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html
Mon Jan 24 19:25:43 2011 +0100
@@ -995,7 +995,7 @@
<td class="Radio_Check_ContentCell" width="20">
<input type="radio" name="inpDifferenceAction"
value="credit"/>
</td>
- <td><span class="LabelText">Leave the credit to be
used later</span></td>
+ <td><span class="LabelText">Leave this amount to
be used later</span></td>
</tr>
<tr id="refund">
<td class="Radio_Check_ContentCell" width="20">
diff -r 9252c832c17e -r cb0dfdfa6fea
modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
---
a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Mon Jan 24 19:13:19 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js
Mon Jan 24 19:25:43 2011 +0100
@@ -225,7 +225,7 @@
displayLogicElement('writeoff', compare(expected, '!=', total) );
displayLogicElement('underpayment', compare(abs(expected), '>', abs(total))
);
displayLogicElement('credit', compare(abs(amount), '>', abs(total)) );
- displayLogicElement('refund', compare(abs(amount), '>', abs(total)) );
+ displayLogicElement('refund', isReceipt && compare(abs(amount), '>',
abs(total)) );
if ( compare(abs(amount), '>', abs(total)) ) {
selectDifferenceAction('credit');
}
diff -r 9252c832c17e -r cb0dfdfa6fea
modules/org.openbravo.v3/src-db/database/configScript.xml
--- a/modules/org.openbravo.v3/src-db/database/configScript.xml Mon Jan 24
19:13:19 2011 +0100
+++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Mon Jan 24
19:25:43 2011 +0100
@@ -1624,10 +1624,6 @@
<oldValue><![CDATA[Y]]></oldValue>
<newValue><![CDATA[N]]></newValue>
</columnDataChange>
- <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED"
pkRow="800626">
- <oldValue><![CDATA[Y]]></oldValue>
- <newValue><![CDATA[N]]></newValue>
- </columnDataChange>
<columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED"
pkRow="800629">
<oldValue><![CDATA[Y]]></oldValue>
<newValue><![CDATA[N]]></newValue>
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
