details: /erp/devel/main/rev/85e9fd0fb8e5
changeset: 9057:85e9fd0fb8e5
user: Sivaraman Rajagopal <sivaraman.rajagopal <at> openbravo.com>
date: Wed Dec 01 14:01:13 2010 +0530
summary: Fixes issue 15135: When you select a Project the fields Form of
Payment and Payment Terms change
Solution:
The callout has been modified in order to do not change the Form of Payment and
Payment Terms fields if they are not defined for the chosen project.
Impacts:
None
details: /erp/devel/main/rev/cb6a144e18fd
changeset: 9058:cb6a144e18fd
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Wed Dec 01 14:55:25 2010 +0530
summary: Fixes Issue 14816: Error when processing Return Material order which
has Discount applied
details: /erp/devel/main/rev/73d8e3106d34
changeset: 9059:73d8e3106d34
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Dec 01 16:29:47 2010 +0000
summary: CI: promote changesets from pi to main
diffstat:
src-db/database/model/functions/C_ORDER_POST1.xml | 10 ++-
src-db/database/sourcedata/AD_MODULE.xml | 4 +-
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java | 38 +++++----
3 files changed, 31 insertions(+), 21 deletions(-)
diffs (115 lines):
diff -r 93384d9aa3c9 -r 73d8e3106d34
src-db/database/model/functions/C_ORDER_POST1.xml
--- a/src-db/database/model/functions/C_ORDER_POST1.xml Tue Nov 30 17:56:20
2010 +0100
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml Wed Dec 01 16:29:47
2010 +0000
@@ -51,6 +51,8 @@
v_DocTypeTarget_ID VARCHAR2(32);
v_DocSubTypeSO VARCHAR(60) ;
v_DocSubTypeSOTarget VARCHAR(60) ;
+ v_DocBaseType VARCHAR(60) ;
+ v_qty NUMBER;
v_IsBinding CHAR(1):='Y';
--
ToDeliver NUMBER;
@@ -633,7 +635,7 @@
INTO v_OrderLineSeqNo
FROM C_ORDERLINE
WHERE C_ORDER_ID=v_Record_ID;
- SELECT PricePrecision INTO v_precision FROM C_ORDER o,C_CURRENCY c
WHERE o.C_ORDER_ID = v_Record_ID AND o.C_CURRENCY_ID = c.C_CURRENCY_ID;
+ SELECT PricePrecision,d.DocBaseType INTO v_precision,v_DocBaseType
FROM C_ORDER o,C_CURRENCY c,C_DOCTYPE d WHERE o.C_ORDER_ID = v_Record_ID AND
o.C_CURRENCY_ID = c.C_CURRENCY_ID AND o.C_DOCTYPETARGET_ID = d.C_DOCTYPE_ID;
FOR Cur_COrderDiscount IN
(SELECT C_ORDER_DISCOUNT.C_ORDER_DISCOUNT_ID,
C_DISCOUNT.DISCOUNT,
@@ -672,6 +674,10 @@
END IF;
v_OrderLineSeqNo:=10 + v_OrderLineSeqNo;
v_OrderLine:=get_uuid() ;
+ v_qty := 1;
+ IF(v_DocBaseType='SOO') THEN
+ v_qty := -1;
+ END IF;
INSERT INTO c_orderline
(
@@ -690,7 +696,7 @@
v_OrderLine, v_Client_ID, v_Org_ID, 'Y', now(), v_UpdatedBy,
now(), v_UpdatedBy, v_Record_ID, v_OrderLineSeqNo, NULL, NULL,
now(), now(), now(), now(), Cur_COrderDiscount.NAME,
- Cur_COrderDiscount.M_PRODUCT_ID, v_M_Warehouse_ID, 'N',
Cur_COrderDiscount.C_UOM_ID, 1,
+ Cur_COrderDiscount.M_PRODUCT_ID, v_M_Warehouse_ID, 'N',
Cur_COrderDiscount.C_UOM_ID, v_qty,
0, 0, 0, NULL, v_c_currency_id,
ROUND(v_Discount,v_precision), ROUND(v_Discount,v_precision),
ROUND(v_Discount,v_precision), ROUND(v_Discount,v_precision), 0, 0,
NULL, NULL, Cur_TaxDiscount.C_TAX_ID, NULL, NULL,
diff -r 93384d9aa3c9 -r 73d8e3106d34 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Tue Nov 30 17:56:20 2010 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml Wed Dec 01 16:29:47 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[Core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.19053]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.19058]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
<!--0--> <REFERENCEDATAINFO><![CDATA[Standard document types for orders,
invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 93384d9aa3c9 -r 73d8e3106d34
src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java Tue Nov
30 17:56:20 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_Project.java Wed Dec
01 16:29:47 2010 +0000
@@ -72,28 +72,32 @@
StringBuffer resultado = new StringBuffer();
-// To be consistent with Purchase/Sales Orders and Sales invoices,
-// This behaviour is implemented for Purchase invoices too
-// as requiested in issue 0013323
+ // To be consistent with Purchase/Sales Orders and Sales invoices,
+ // This behaviour is implemented for Purchase invoices too
+ // as requiested in issue 0013323
-// if (strIsSOTrx.equals("Y")) {
- if (data == null || data.length == 0) {
- resultado.append("var calloutName='SE_Invoice_Project';\n\n");
- resultado.append("var respuesta = null;");
- } else {
- resultado.append("var calloutName='SE_Invoice_Project';\n\n");
- resultado.append("var respuesta = new Array(");
+ // if (strIsSOTrx.equals("Y")) {
+ if (data == null || data.length == 0) {
+ resultado.append("var calloutName='SE_Invoice_Project';\n\n");
+ resultado.append("var respuesta = null;");
+ } else {
+ resultado.append("var calloutName='SE_Invoice_Project';\n\n");
+ resultado.append("var respuesta = new Array(");
- String strPaymentRule = data[0].paymentrule;
+ String strPaymentRule = data[0].paymentrule;
+ if (strPaymentRule != null && !"".equals(strPaymentRule)) {
resultado.append("new Array(\"inppaymentrule\", \"" + strPaymentRule +
"\"),");
- String PaymentTerm = data[0].paymentterm;
+ }
+ String PaymentTerm = data[0].paymentterm;
+ if (PaymentTerm != null && !"".equals(PaymentTerm)) {
resultado.append("new Array(\"inpcPaymenttermId\", \"" + PaymentTerm +
"\")");
- resultado.append(");");
}
-// } else {
-// resultado.append("var calloutName='SE_Invoice_Project';\n\n");
-// resultado.append("var respuesta = null;");
-// }
+ resultado.append(");");
+ }
+ // } else {
+ // resultado.append("var calloutName='SE_Invoice_Project';\n\n");
+ // resultado.append("var respuesta = null;");
+ // }
xmlDocument.setParameter("array", resultado.toString());
xmlDocument.setParameter("frameName", "appFrame");
response.setContentType("text/html; charset=UTF-8");
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
