details: /erp/stable/2.50/rev/6fe764e7b343
changeset: 9345:6fe764e7b343
user: Ioritz Cia <ioritz.cia <at> openbravo.com>
date: Mon Apr 04 18:20:23 2011 +0200
summary: Fixes issue 16636: Text in spanish, when in sales order you change
from quotation to standard order.
diffstat:
src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++++++++
src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java | 9 ++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diffs (46 lines):
diff -r ea6ef546188e -r 6fe764e7b343 src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml Tue Apr 05 10:18:16 2011 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml Mon Apr 04 18:20:23 2011 +0200
@@ -33070,6 +33070,17 @@
<!--B879A897808F4D9F947BF1D2EB4F1487-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
<!--B879A897808F4D9F947BF1D2EB4F1487--></AD_MESSAGE>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--><AD_MESSAGE>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564-->
<AD_MESSAGE_ID><![CDATA[B8AB7082A7DD4CF6B836E2A8DBC39564]]></AD_MESSAGE_ID>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--> <VALUE><![CDATA[Quotation]]></VALUE>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564-->
<MSGTEXT><![CDATA[Quotation:]]></MSGTEXT>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564-->
<AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B8AB7082A7DD4CF6B836E2A8DBC39564--></AD_MESSAGE>
+
<!--B90DAD98BE6B409FA4D10CD01397A735--><AD_MESSAGE>
<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_MESSAGE_ID><![CDATA[B90DAD98BE6B409FA4D10CD01397A735]]></AD_MESSAGE_ID>
<!--B90DAD98BE6B409FA4D10CD01397A735-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r ea6ef546188e -r 6fe764e7b343
src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java Tue Apr
05 10:18:16 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_DocType.java Mon Apr
04 18:20:23 2011 +0200
@@ -109,15 +109,18 @@
if (!DocSubTypeSO.equals("OB") && strOldDocTypeTarget.equals("OB")) {
String strOldDocNo = SLOrderDocTypeData.selectOldDocNo(this,
strOrder);
resultado.append("new Array(\"inpdescription\", \""
- + FormatUtilities.replaceJS("Presupuesto Nº: " + strOldDocNo +
". " + strDescription)
- + "\"),\n");
+ + FormatUtilities.replaceJS(Utility.messageBD(this, "Quotation",
vars.getLanguage())
+ + " " + strOldDocNo + ". " + strDescription) + "\"),\n");
}
resultado.append("new Array(\"inpordertype\", \"" + DocSubTypeSO +
"\")\n");
PaymentRule = "P";
InvoiceRule = (DocSubTypeSO.equals("PR") ? "I" : "D");
DeliveryRule = "A";
if (dataNew[0].isdocnocontrolled.equals("Y")) {
- if (!newDocNo &&
!AD_Sequence_ID.equals(dataNew[0].adSequenceId)&&!SLOrderDocTypeData.selectOldDocTypeTargetId(this,strOrder).equalsIgnoreCase(strDocTypeTarget))
+ if (!newDocNo
+ && !AD_Sequence_ID.equals(dataNew[0].adSequenceId)
+ && !SLOrderDocTypeData.selectOldDocTypeTargetId(this,
strOrder).equalsIgnoreCase(
+ strDocTypeTarget))
newDocNo = true;
if (newDocNo) {
if (vars.getRole().equalsIgnoreCase("System")
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
