details: https://code.openbravo.com/erp/devel/pi/rev/3c4f28793d60 changeset: 25192:3c4f28793d60 user: Reinaldo Guerra <reinaldo.guerra <at> peoplewalking.com> date: Tue Oct 28 22:55:46 2014 -0500 summary: Fixed bug 27944: Not Stocked BOM lines are printed without price in orders.
Print sales order report was modified to take into account price and total amount for order lines reffering products with some bill of material defined. Now it is possible to delete invoice header. This change affects also the purchase flow so now when printing an order, price and total of the exploded BOM lines are included, and the total match the total gross amount of the order. details: https://code.openbravo.com/erp/devel/pi/rev/9ae96f2b5bc9 changeset: 25193:9ae96f2b5bc9 user: Fernando Soto <fernando.soto <at> peoplewalking.com> date: Tue Oct 28 15:10:32 2014 -0500 summary: Fixed bug 27572: Reactivate a Purchase Order with a Goods Receipt related Changed C_ORDER_POST1 stored procedure to check when reactivating a Purchase Order don't have Goods Receipt/Shipment related Added OrderReactivateHasGoodsReceipt and OrderReactivateHasGoodsShipment message for the error. diffstat: src-db/database/model/functions/C_ORDER_POST1.xml | 18 +++++++ src-db/database/sourcedata/AD_MESSAGE.xml | 24 ++++++++++ src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml | 7 +- src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml | 6 +- 4 files changed, 49 insertions(+), 6 deletions(-) diffs (117 lines): diff -r 3f611c5121c8 -r 9ae96f2b5bc9 src-db/database/model/functions/C_ORDER_POST1.xml --- a/src-db/database/model/functions/C_ORDER_POST1.xml Mon Nov 10 16:01:05 2014 +0100 +++ b/src-db/database/model/functions/C_ORDER_POST1.xml Tue Oct 28 15:10:32 2014 -0500 @@ -127,6 +127,8 @@ v_iscashvat C_Order.IsCashVat%TYPE; v_recalculateDiscounts VARCHAR(1):='Y'; v_isactive VARCHAR2(1):='N'; + + v_has_M_InOut NUMBER; BEGIN IF (p_PInstance_ID IS NOT NULL) THEN @@ -411,6 +413,22 @@ IF (v_DocSubTypeSO IN ('WR', 'WI')) THEN RAISE_APPLICATION_ERROR(-20000, '@ActionNotSupported@'); END IF; + + --Verify that have not Goods Receipt related + + select count(1) into v_has_M_InOut from dual + where exists (select 1 from m_inoutline iol, c_orderline ol + where iol.c_orderline_id = ol.c_orderline_id + and ol.c_order_id = v_record_id); + + if (v_has_M_InOut > 0) then + if (v_issotrx = 'N') then + RAISE_APPLICATION_ERROR(-20000, '@OrderReactivateHasGoodsReceipt@'); + else + RAISE_APPLICATION_ERROR(-20000, '@OrderReactivateHasGoodsShipment@'); + end if; + end if; + --Verify not managed debtPayments added by ALO --Added by P.Sarobe. New messages SELECT max(c_debt_payment_id), COUNT(*) diff -r 3f611c5121c8 -r 9ae96f2b5bc9 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Mon Nov 10 16:01:05 2014 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Tue Oct 28 15:10:32 2014 -0500 @@ -18913,6 +18913,18 @@ <!--4B01F0CD52ED45D78AD503199D5AB1C6--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--4B01F0CD52ED45D78AD503199D5AB1C6--></AD_MESSAGE> +<!--4B824C2DFA5C467FBAEC01CD6873B578--><AD_MESSAGE> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <AD_MESSAGE_ID><![CDATA[4B824C2DFA5C467FBAEC01CD6873B578]]></AD_MESSAGE_ID> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <VALUE><![CDATA[OrderReactivateHasGoodsShipment]]></VALUE> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <MSGTEXT><![CDATA[The Order can not be reactivated because any of its lines is already linked to a Goods Shipment]]></MSGTEXT> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--4B824C2DFA5C467FBAEC01CD6873B578--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--4B824C2DFA5C467FBAEC01CD6873B578--></AD_MESSAGE> + <!--4BAA0D78C8634088961947091B4D6633--><AD_MESSAGE> <!--4BAA0D78C8634088961947091B4D6633--> <AD_MESSAGE_ID><![CDATA[4BAA0D78C8634088961947091B4D6633]]></AD_MESSAGE_ID> <!--4BAA0D78C8634088961947091B4D6633--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -20001,6 +20013,18 @@ <!--65C05BD368ED471CB1E6AE97DD911EDF--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--65C05BD368ED471CB1E6AE97DD911EDF--></AD_MESSAGE> +<!--65D856ED1A584F128F4C7AB8A2102DFA--><AD_MESSAGE> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <AD_MESSAGE_ID><![CDATA[65D856ED1A584F128F4C7AB8A2102DFA]]></AD_MESSAGE_ID> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <VALUE><![CDATA[OrderReactivateHasGoodsReceipt]]></VALUE> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <MSGTEXT><![CDATA[The Order can not be reactivated because any of its lines is already linked to a Goods Receipt]]></MSGTEXT> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--65D856ED1A584F128F4C7AB8A2102DFA--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--65D856ED1A584F128F4C7AB8A2102DFA--></AD_MESSAGE> + <!--66BEE4A0FBD44C96B2967716918A1318--><AD_MESSAGE> <!--66BEE4A0FBD44C96B2967716918A1318--> <AD_MESSAGE_ID><![CDATA[66BEE4A0FBD44C96B2967716918A1318]]></AD_MESSAGE_ID> <!--66BEE4A0FBD44C96B2967716918A1318--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3f611c5121c8 -r 9ae96f2b5bc9 src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml --- a/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml Mon Nov 10 16:01:05 2014 +0100 +++ b/src/org/openbravo/erpReports/C_OrderLinesJR_new.jrxml Tue Oct 28 15:10:32 2014 -0500 @@ -37,15 +37,16 @@ AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID AND C_ORDERLINE.BOM_PARENT_ID IS NULL UNION - SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED*M_PRODUCT_BOM.BOMQTY AS QUANTITY, - TO_CHAR(C_UOM.NAME) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE, + SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED AS QUANTITY, + TO_CHAR(C_UOM.NAME) AS UOM, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.PRICEACTUAL ELSE C_ORDERLINE.GROSS_UNIT_PRICE END AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.LINENETAMT ELSE C_ORDERLINE.LINE_GROSS_AMOUNT END AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE, C_ORDER.docstatus AS STATUS, TO_CHAR(M_PRODUCT.VALUE) AS VALUE FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM, C_ORDER - WHERE C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCT_ID + WHERE C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCTBOM_ID AND M_PRODUCT_BOM.M_PRODUCTBOM_ID = M_PRODUCT.M_PRODUCT_ID AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID} AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID + AND C_ORDERLINE.BOM_PARENT_ID IS NOT NULL UNION SELECT 3 AS ISBOM, TO_NUMBER(null) AS LINE, C_TAX.NAME AS PRODUCT_NAME, TO_NUMBER(NULL) AS QUANTITY, '' AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, C_ORDERTAX.TAXBASEAMT AS BASE, C_ORDERTAX.TAXAMT AS LINENETAMT, C_ORDERTAX.LINE AS TAXLINE, C_ORDER.docstatus AS STATUS, diff -r 3f611c5121c8 -r 9ae96f2b5bc9 src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml --- a/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml Mon Nov 10 16:01:05 2014 +0100 +++ b/src/org/openbravo/erpReports/C_OrderLinesTaxIncludedJR_new.jrxml Tue Oct 28 15:10:32 2014 -0500 @@ -36,11 +36,11 @@ WHERE C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID} AND C_ORDERLINE.C_ORDER_ID=C_ORDER.C_ORDER_ID UNION - SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED*M_PRODUCT_BOM.BOMQTY AS QUANTITY, - TO_CHAR(C_UOM.NAME) AS UOM, TO_NUMBER(NULL) AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, TO_NUMBER(NULL) AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE, + SELECT 2 AS ISBOM, C_ORDERLINE.LINE, M_PRODUCT.NAME AS PRODUCT_NAME, C_ORDERLINE.QTYORDERED AS QUANTITY, + TO_CHAR(C_UOM.NAME) AS UOM, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.PRICEACTUAL ELSE C_ORDERLINE.GROSS_UNIT_PRICE END AS PRICEACTUAL, TO_NUMBER(NULL) AS BASE, CASE WHEN $P{ISTAXINCLUDED} = 'N' THEN C_ORDERLINE.LINENETAMT ELSE C_ORDERLINE.LINE_GROSS_AMOUNT END AS LINENETAMT, TO_NUMBER(NULL) AS TAXLINE, C_ORDER.docstatus AS STATUS, TO_CHAR(M_PRODUCT.VALUE) AS VALUE FROM M_PRODUCT_BOM, M_PRODUCT, C_ORDERLINE, C_UOM, C_ORDER - WHERE C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCT_ID + WHERE C_ORDERLINE.M_PRODUCT_ID = M_PRODUCT_BOM.M_PRODUCTBOM_ID AND M_PRODUCT_BOM.M_PRODUCTBOM_ID = M_PRODUCT.M_PRODUCT_ID AND M_PRODUCT.C_UOM_ID = C_UOM.C_UOM_ID AND C_ORDERLINE.C_ORDER_ID = $P{C_ORDER_ID} ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://pubads.g.doubleclick.net/gampad/clk?id=154624111&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
