details: /erp/devel/main/rev/0569c1e9f6ee
changeset: 7575:0569c1e9f6ee
user: Harikrishnan Raja <harikrishnan.raja <at> openbravo.com>
date: Tue Jun 08 09:58:48 2010 +0530
summary: Fixes Issue 13402:The Cancel Price Adjustment is not checked while
copying the Sales Order.
details: /erp/devel/main/rev/c02683eb3bee
changeset: 7576:c02683eb3bee
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Jun 08 10:09:58 2010 +0000
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/a88fec5dfac2
changeset: 7577:a88fec5dfac2
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Jun 08 10:09:59 2010 +0000
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/model/triggers/C_INVOICELINE_TRG2.xml | 11
++++++++-
src-db/database/sourcedata/AD_MODULE.xml | 4
+-
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java | 3
++
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql | 6
++--
4 files changed, 17 insertions(+), 7 deletions(-)
diffs (104 lines):
diff -r d425ef421479 -r a88fec5dfac2
src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Mon Jun 07
20:50:55 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml Tue Jun 08
10:09:59 2010 +0000
@@ -39,12 +39,14 @@
v_PriceList_ID VARCHAR2(32);
v_Processed C_ORDER.PROCESSED%TYPE;
v_ID VARCHAR2(32);
+ v_Issotrx CHAR(1);
+ v_pricecancelAD CHAR(1);
v_oldLine NUMBER;
v_newLineNetAmt NUMBER;
v_newLineAlternate NUMBER;
v_taxAmt NUMBER;
v_Prec C_CURRENCY.STDPRECISION%TYPE;
- v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
+ v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
BEGIN
@@ -170,7 +172,11 @@
v_lineno := v_lineno + 10;
v_PriceNew := M_Get_Offer_Price(Cur_Offer.M_Offer_ID, v_Price);
v_Amt := v_Price - v_PriceNew;
-
+ v_pricecancelAD := 'N';
+ IF(:NEW.C_ORDERLINE_ID IS NOT NULL) THEN
+ SELECT o.issotrx,ol.CancelPriceAD into v_Issotrx,v_pricecancelAD FROM
C_ORDER o,C_ORDERLINE ol WHERE ol.C_ORDERLINE_ID = :NEW.C_ORDERLINE_ID AND
o.C_ORDER_ID = ol.C_ORDER_ID;
+ END IF;
+ IF((v_Issotrx = 'Y' AND v_pricecancelAD <> 'Y') OR v_Issotrx = 'N') THEN
INSERT INTO C_INVOICELINE_OFFER
(C_INVOICELINE_OFFER_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
CREATED, CREATEDBY, UPDATED, UPDATEDBY,
@@ -179,6 +185,7 @@
(v_InvoiceLine_Offer_ID, :NEW.AD_Client_ID, :NEW.AD_Org_ID,
:NEW.IsActive,
now(),:NEW.CreatedBy, now(),:NEW.UpdatedBy,
:NEW.C_InvoiceLine_ID, v_lineno, Cur_Offer.M_Offer_Id,
ROUND(v_Price,v_Precision), ROUND(v_Amt, v_Precision));
+ END IF;
v_Price := v_PriceNew;
END LOOP;
END IF;
diff -r d425ef421479 -r a88fec5dfac2 src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Mon Jun 07 20:50:55 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Tue Jun 08 10:09:59 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.17411]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17576]]></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>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r d425ef421479 -r a88fec5dfac2
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Mon Jun
07 20:50:55 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom.java Tue Jun
08 10:09:59 2010 +0000
@@ -1481,6 +1481,9 @@
strBPartner, data[i].mProductId, priceStd,
data[i].quantityorder,
strPriceList, strKey);
}
+ if(isSOTrx.equals("Y") && price[0].cancelpricead.equals("Y")){
+ priceActual = priceStd;
+ }
price = null;
} else {
price = CreateFromInvoiceData.selectBOM(conn, this,
strDateInvoiced, strBPartner,
diff -r d425ef421479 -r a88fec5dfac2
src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Mon Jun 07 20:50:55 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
Tue Jun 08 10:09:59 2010 +0000
@@ -33,7 +33,7 @@
l.C_OrderLine_ID,l.Line, l.ad_org_id, '' as STDPRECISION,
'' as M_InOutLine_ID, '' AS PriceActual, '' AS PriceList, '' AS
PriceLimit, '' AS Description, '' as PriceStd,
'' AS QUANTITYORDER, '' AS M_Product_UOM_ID, '' AS
M_ATTRIBUTESETINSTANCE_ID, '' AS M_Offer_ID, '' AS PricePrecision,
- l.taxbaseamt
+ l.taxbaseamt, l.CancelPriceAD
FROM C_ORDERLINE l left join M_MATCHPO m on
l.C_OrderLine_ID=m.C_OrderLine_ID
AND m.C_InvoiceLine_ID IS NOT
NULL,
C_ORDER o, C_UOM uom, M_PRODUCT p
@@ -46,7 +46,7 @@
AND l.M_Product_ID=p.M_Product_ID
AND l.C_Order_ID = ?
GROUP BY o.C_ORDER_ID, o.DocumentNo, o.DateOrdered, o.GrandTotal,
l.QtyOrdered,l.C_UOM_ID,
- uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
l.ad_org_id, l.taxbaseamt
+ uom.UOMSymbol,l.M_Product_ID,p.NAME,l.Line,l.C_OrderLine_ID,
l.ad_org_id, l.taxbaseamt,l.CancelPriceAD
HAVING (l.QtyOrdered-SUM(COALESCE(m.Qty,0))) <> 0
ORDER BY NAME, l.Line
]]>
@@ -493,7 +493,7 @@
<SqlMethodComment></SqlMethodComment>
<Sql>
<![CDATA[
- SELECT PriceActual,PriceList,PriceLimit,Description, '' AS
C_ORDERLINE_ID, PriceStd
+ SELECT PriceActual,PriceList,PriceLimit,Description, '' AS
C_ORDERLINE_ID, PriceStd, CancelPriceAD
FROM C_OrderLine
WHERE C_OrderLine_ID=?
]]>
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
