details: /erp/devel/int/rev/638a01be93f2
changeset: 6816:638a01be93f2
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Tue Mar 30 10:53:57 2010 +0530
summary: Fixes issue 10473: Matched Purchase Order Filter
details: /erp/devel/int/rev/ac0d4f5ea830
changeset: 6817:ac0d4f5ea830
user: Adrián Romero <adrianromero <at> openbravo.com>
date: Tue Mar 30 11:01:49 2010 +0200
summary: Reverting changes in issue 0012788: Precision error in simple sales
order sales invoice
diffstat:
src-db/database/sourcedata/AD_COLUMN.xml | 8 ++--
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 18 +++++-----
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 16 ++++----
3 files changed, 21 insertions(+), 21 deletions(-)
diffs (127 lines):
diff -r 36d350878d3a -r ac0d4f5ea830 src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 29 21:21:54 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Mar 30 11:01:49 2010 +0200
@@ -99055,10 +99055,10 @@
<!--6523--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--6523--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
<!--6523--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--6523--> <SEQNO><![CDATA[0]]></SEQNO>
+<!--6523--> <SEQNO><![CDATA[2]]></SEQNO>
<!--6523--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--6523--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6523--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6523--> <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--6523--> <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
<!--6523--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--6523--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
@@ -99086,10 +99086,10 @@
<!--6524--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
<!--6524--> <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
<!--6524--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--6524--> <SEQNO><![CDATA[0]]></SEQNO>
+<!--6524--> <SEQNO><![CDATA[3]]></SEQNO>
<!--6524--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
<!--6524--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6524--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6524--> <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
<!--6524--> <AD_ELEMENT_ID><![CDATA[1297]]></AD_ELEMENT_ID>
<!--6524--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
<!--6524--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
diff -r 36d350878d3a -r ac0d4f5ea830
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Mon Mar 29
21:21:54 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java Tue Mar 30
11:01:49 2010 +0200
@@ -147,27 +147,27 @@
log4j.debug("priceActual:" +
Double.toString(priceActual.doubleValue()));
if ("Y".equals(cancelPriceAd)) {
priceStd = priceActual;
- resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
+ resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
} else {
priceStd = new BigDecimal(SLOrderProductData.getOffersStdPrice(this,
dataOrder[0].cBpartnerId, priceActual.toString().replace("\"",
""), strProduct,
dataOrder[0].dateordered, strQty, dataOrder[0].mPricelistId,
dataOrder[0].id));
// priceList
- resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
+ resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
}
}
if (strChanged.equals("inpcancelpricead")) {
if ("Y".equals(cancelPriceAd)) {
- resultado.append("new Array(\"inppriceactual\", \"" + strPriceStd +
"\"),");
+ resultado.append("new Array(\"inppriceactual\", " + strPriceStd +
"),");
} else {
strPriceActual = SLOrderProductData.getOffersPrice(this,
dataOrder[0].dateordered,
dataOrder[0].cBpartnerId, strProduct,
(strPriceStd.equals("undefined") ? "0"
: strPriceStd.replace("\"", "")), strQty,
dataOrder[0].mPricelistId,
dataOrder[0].id);
priceActual = new BigDecimal(strPriceActual);
- resultado.append("new Array(\"inppriceactual\", \"" + strPriceActual +
"\"),");
+ resultado.append("new Array(\"inppriceactual\", " + strPriceActual +
"),");
}
}
@@ -204,14 +204,14 @@
} else if (strChanged.equals("inpqtyordered")) { // calculate Actual
if ("Y".equals(cancelPriceAd)) {
priceActual = priceStd;
- resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
+ resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
} else {
priceActual = new BigDecimal(SLOrderProductData.getOffersPrice(this,
dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct,
priceStd.toString(),
strQty, dataOrder[0].mPricelistId, dataOrder[0].id));
if (priceActual.scale() > PricePrecision)
priceActual = priceActual.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
- resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
+ resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
}
} else if (strChanged.equals("inpdiscount")) { // calculate std and actual
@@ -235,8 +235,8 @@
priceStd = priceStd.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
if (priceActual.scale() > PricePrecision)
priceActual = priceActual.setScale(PricePrecision,
BigDecimal.ROUND_HALF_UP);
- resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
- resultado.append("new Array(\"inppricestd\", \"" + priceStd.toString()
+ "\"),");
+ resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
+ resultado.append("new Array(\"inppricestd\", " + priceStd.toString() +
"),");
}
}
@@ -291,7 +291,7 @@
}
}
if (strChanged.equals("inplinenetamt"))
- resultado.append("new Array(\"inppriceactual\", \"" +
priceActual.toString() + "\"),");
+ resultado.append("new Array(\"inppriceactual\", " +
priceActual.toString() + "),");
if (!strChanged.equals("inplinenetamt") ||
priceActual.compareTo(BigDecimal.ZERO) == 0)
resultado.append("new Array(\"inplinenetamt\", " + LineNetAmt.toString()
+ "),");
resultado.append("new Array(\"inptaxbaseamt\", " + LineNetAmt.toString() +
")");
diff -r 36d350878d3a -r ac0d4f5ea830
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java Mon Mar
29 21:21:54 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java Tue Mar
30 11:01:49 2010 +0200
@@ -137,14 +137,14 @@
resultado.append("var calloutName='SL_Order_Product';\n\n");
resultado.append("var respuesta = new Array(");
resultado.append("new Array(\"inpcUomId\", \"" + strUOM + "\"),");
- resultado.append("new Array(\"inppricelist\", \""
- + (strPriceList.equals("") ? "0" : strPriceList) + "\"),");
- resultado.append("new Array(\"inppricelimit\", \""
- + (strPriceLimit.equals("") ? "0" : strPriceLimit) + "\"),");
- resultado.append("new Array(\"inppricestd\", \""
- + (strPriceStd.equals("") ? "0" : strPriceStd) + "\"),");
- resultado.append("new Array(\"inppriceactual\", \""
- + (strPriceActual.equals("") ? "0" : strPriceActual) + "\"),");
+ resultado.append("new Array(\"inppricelist\", "
+ + (strPriceList.equals("") ? "0" : strPriceList) + "),");
+ resultado.append("new Array(\"inppricelimit\", "
+ + (strPriceLimit.equals("") ? "0" : strPriceLimit) + "),");
+ resultado.append("new Array(\"inppricestd\", "
+ + (strPriceStd.equals("") ? "0" : strPriceStd) + "),");
+ resultado.append("new Array(\"inppriceactual\", "
+ + (strPriceActual.equals("") ? "0" : strPriceActual) + "),");
resultado.append("new Array(\"inpcCurrencyId\", "
+ (strCurrency.equals("") ? "\"\"" : strCurrency) + "),");
resultado.append("new Array(\"inpdiscount\", " + discount.toString() +
"),");
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
