details: https://code.openbravo.com/erp/devel/pi/rev/f5a2287dd8b5 changeset: 15137:f5a2287dd8b5 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jan 13 10:53:53 2012 +0100 summary: Fixes issue 18973: Incorrect Error message displayed creating shipments. The problem was that the flag next_order was not activated and the process tried to post an order that it was imposible because it has not got any line
details: https://code.openbravo.com/erp/devel/pi/rev/f3c74e42f447 changeset: 15138:f3c74e42f447 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jan 13 10:54:37 2012 +0100 summary: Fixes issue 19250: Lines that are invoiced show up on the Invoiceable expenses window diffstat: src-db/database/model/functions/M_INOUT_CREATE.xml | 14 ++++++-------- src-db/database/sourcedata/AD_TAB.xml | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diffs (41 lines): diff -r cd4d937d352b -r f3c74e42f447 src-db/database/model/functions/M_INOUT_CREATE.xml --- a/src-db/database/model/functions/M_INOUT_CREATE.xml Thu Jan 12 17:45:24 2012 +0100 +++ b/src-db/database/model/functions/M_INOUT_CREATE.xml Fri Jan 13 10:54:37 2012 +0100 @@ -572,19 +572,17 @@ END;--END DECLARE VARIABLES FOR ORDER LINE LOOP END IF;--Next_Order -- Validate result message for user - IF (Cur_Order.DeliveryRule='O' AND v_lines <= 10) THEN + IF (v_lines <= 10) THEN DELETE FROM M_INOUTLINE WHERE M_INOUT_ID = p_InOut_ID; DELETE FROM M_INOUT WHERE M_INOUT_ID = p_InOut_ID; next_order := TRUE; - result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ': ' || '@ShipmentError@. @notEnoughStockDeliveryRuleOrder@.'; - ELSIF (v_lines <= 10) THEN - DELETE FROM M_INOUTLINE - WHERE M_INOUT_ID = p_InOut_ID; - DELETE FROM M_INOUT - WHERE M_INOUT_ID = p_InOut_ID; - result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ': ' || '@ShipmentError@.' || v_resultlinesstr; + IF (Cur_Order.DeliveryRule='O') THEN + result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ': ' || '@ShipmentError@. @notEnoughStockDeliveryRuleOrder@.'; + ELSE + result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ': ' || '@ShipmentError@.' || v_resultlinesstr; + END IF; ELSIF (v_hasPartial) THEN v_order_partial_count := v_order_partial_count +1; result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ' @InoutDocumentno@ ' || v_DocumentNo || ': @ShipmentPartial@.' || v_resultlinesstr; diff -r cd4d937d352b -r f3c74e42f447 src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Thu Jan 12 17:45:24 2012 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Fri Jan 13 10:54:37 2012 +0100 @@ -4898,7 +4898,7 @@ <!--432--> <ISSORTTAB><![CDATA[N]]></ISSORTTAB> <!--432--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--432--> <UIPATTERN><![CDATA[RO]]></UIPATTERN> -<!--432--> <HQLWHERECLAUSE><![CDATA[e.reinvoice='Y' and e.expenseSheet in (select t from TimeAndExpenseSheet t where t.processed='Y'))]]></HQLWHERECLAUSE> +<!--432--> <HQLWHERECLAUSE><![CDATA[e.reinvoice='Y' and e.salesOrderLine is NULL and e.expenseSheet in (select t from TimeAndExpenseSheet t where t.processed='Y'))]]></HQLWHERECLAUSE> <!--432--> <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS> <!--432--> <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD> <!--432--> <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE> ------------------------------------------------------------------------------ RSA(R) Conference 2012 Mar 27 - Feb 2 Save $400 by Jan. 27 Register now! http://p.sf.net/sfu/rsa-sfdev2dev2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
