details: http://code.openbravo.com/erp/devel/main/rev/ab81bc82f31d changeset: 3515:ab81bc82f31d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Mar 31 14:41:51 2009 +0200 summary: fixed bug 0008365: Completing requisition not possible, no permission
details: http://code.openbravo.com/erp/devel/main/rev/078ab7f80dd1 changeset: 3516:078ab7f80dd1 user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com> date: Tue Mar 31 16:23:50 2009 +0200 summary: Merge from pi diffstat: .hgtags | 1 + config/Openbravo.properties.template | 2 +- src-db/database/model/functions/M_INOUT_CREATE.xml | 6 ++- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 33 ++++++++++++++++ src/org/openbravo/erpCommon/ad_actionButton/DocAction.xml | 4 +- 5 files changed, 42 insertions(+), 4 deletions(-) diffs (121 lines): diff -r 559b875daf9d -r 078ab7f80dd1 .hgtags --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgtags Tue Mar 31 16:23:50 2009 +0200 @@ -0,0 +1,1 @@ +bcc34be9b9cd957277a0fe80b1f3d7dbbc7e8a1d 2.50beta diff -r 559b875daf9d -r 078ab7f80dd1 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Tue Mar 31 13:05:59 2009 +0200 +++ b/config/Openbravo.properties.template Tue Mar 31 16:23:50 2009 +0200 @@ -118,4 +118,4 @@ # Validation # ############## -validate.model=true \ No newline at end of file +validate.model=true diff -r 559b875daf9d -r 078ab7f80dd1 src-db/database/model/functions/M_INOUT_CREATE.xml --- a/src-db/database/model/functions/M_INOUT_CREATE.xml Tue Mar 31 13:05:59 2009 +0200 +++ b/src-db/database/model/functions/M_INOUT_CREATE.xml Tue Mar 31 16:23:50 2009 +0200 @@ -77,6 +77,7 @@ v_order_partial_count NUMBER:= 0; v_Record_ID VARCHAR2(32):=NULL; v_Selection VARCHAR2(1):='N'; + v_hasPartial BOOLEAN := false; -- Orders to process - one per warehouse Cur_Order RECORD; -- Order Lines per Warehouse @@ -490,11 +491,13 @@ DBMS_OUTPUT.PUT_LINE('Not enough stocked products, delivery type Line'); v_lines := v_lines - v_lines_per_orderline; v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notenoughstockdeliveryrulel...@.' ; + v_hasPartial := true; DELETE FROM M_INOUTLINE WHERE M_INOUT_ID = v_documentno AND C_ORDERLINE_ID = ol.C_ORDERLINE_ID; ELSE v_resultlinesstr := COALESCE(v_resultlinesstr, '') || '<br>@OrderLine@: ' || ol.Line || ' @ForProduct@ ' || ol.name || ': @notEnoughStockPartial@' || '.' ; + v_hasPartial := true; END IF; END IF; -- Copy Ad-hoc lines, Comments OR Service Items @@ -546,7 +549,7 @@ DELETE FROM M_INOUT WHERE M_INOUT_ID = p_InOut_ID; result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ': ' || '@shipmenter...@.' || v_resultlinesstr; - ELSIF (v_resultlinesstr IS NOT NULL OR v_resultlinesstr != '') THEN + ELSIF (v_hasPartial) THEN v_order_partial_count := v_order_partial_count +1; result_String := '@OrderDocumentno@ ' || cur_order.DocumentNo || ' @InoutDocumentno@ ' || v_DocumentNo || ': @shipmentpart...@.' || v_resultlinesstr; ELSE @@ -561,6 +564,7 @@ END IF; result_String := ''; v_resultlinesstr := ''; + v_hasPartial := false; IF(NOT Next_Order) THEN IF(v_lines=0) THEN DBMS_OUTPUT.PUT_LINE('v_lines!!!!!!!!!!!!!!!!!' || v_lines) ; diff -r 559b875daf9d -r 078ab7f80dd1 src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 31 13:05:59 2009 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Tue Mar 31 16:23:50 2009 +0200 @@ -22131,6 +22131,39 @@ <!--27B5251AA1F411DD8EAED3B037B9C016--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--27B5251AA1F411DD8EAED3B037B9C016--></AD_TEXTINTERFACES> +<!--28180A84124411DE9AAA000C2901CB3B--><AD_TEXTINTERFACES> +<!--28180A84124411DE9AAA000C2901CB3B--> <AD_TEXTINTERFACES_ID><![CDATA[28180A84124411DE9AAA000C2901CB3B]]></AD_TEXTINTERFACES_ID> +<!--28180A84124411DE9AAA000C2901CB3B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--28180A84124411DE9AAA000C2901CB3B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--28180A84124411DE9AAA000C2901CB3B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--28180A84124411DE9AAA000C2901CB3B--> <TEXT><![CDATA[AEAT]]></TEXT> +<!--28180A84124411DE9AAA000C2901CB3B--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GenerateModel347.html]]></FILENAME> +<!--28180A84124411DE9AAA000C2901CB3B--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--28180A84124411DE9AAA000C2901CB3B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--28180A84124411DE9AAA000C2901CB3B--></AD_TEXTINTERFACES> + +<!--281B8BE6124411DE9B3B000C2901CB3B--><AD_TEXTINTERFACES> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <AD_TEXTINTERFACES_ID><![CDATA[281B8BE6124411DE9B3B000C2901CB3B]]></AD_TEXTINTERFACES_ID> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <TEXT><![CDATA[Hac.Navarra]]></TEXT> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GenerateModel347.html]]></FILENAME> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--281B8BE6124411DE9B3B000C2901CB3B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--281B8BE6124411DE9B3B000C2901CB3B--></AD_TEXTINTERFACES> + +<!--281D5FC0124411DEA72E000C2901CB3B--><AD_TEXTINTERFACES> +<!--281D5FC0124411DEA72E000C2901CB3B--> <AD_TEXTINTERFACES_ID><![CDATA[281D5FC0124411DEA72E000C2901CB3B]]></AD_TEXTINTERFACES_ID> +<!--281D5FC0124411DEA72E000C2901CB3B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--281D5FC0124411DEA72E000C2901CB3B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--281D5FC0124411DEA72E000C2901CB3B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--281D5FC0124411DEA72E000C2901CB3B--> <TEXT><![CDATA[Id]]></TEXT> +<!--281D5FC0124411DEA72E000C2901CB3B--> <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GenerateModel347.html]]></FILENAME> +<!--281D5FC0124411DEA72E000C2901CB3B--> <ISUSED><![CDATA[Y]]></ISUSED> +<!--281D5FC0124411DEA72E000C2901CB3B--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--281D5FC0124411DEA72E000C2901CB3B--></AD_TEXTINTERFACES> + <!--2DD0E85EA59A11DD93D1B7F7941B0A40--><AD_TEXTINTERFACES> <!--2DD0E85EA59A11DD93D1B7F7941B0A40--> <AD_TEXTINTERFACES_ID><![CDATA[2DD0E85EA59A11DD93D1B7F7941B0A40]]></AD_TEXTINTERFACES_ID> <!--2DD0E85EA59A11DD93D1B7F7941B0A40--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 559b875daf9d -r 078ab7f80dd1 src/org/openbravo/erpCommon/ad_actionButton/DocAction.xml --- a/src/org/openbravo/erpCommon/ad_actionButton/DocAction.xml Tue Mar 31 13:05:59 2009 +0200 +++ b/src/org/openbravo/erpCommon/ad_actionButton/DocAction.xml Tue Mar 31 16:23:50 2009 +0200 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SL - * All portions are Copyright (C) 2001-2008 Openbravo SL + * All portions are Copyright (C) 2001-2009 Openbravo SL * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -30,7 +30,7 @@ <PARAMETER id="docstatus" name="docstatus" attribute="value" default=""/> <PARAMETER id="adTableId" name="adTableId" attribute="value" default=""/> <PARAMETER id="paramArray" name="array" default=""/> - <PARAMETER id="linkButtonOk" name="processId" default="" attribute="onclick" replace="xx"/> + <PARAMETER id="buttonOK" name="processId" default="" attribute="onclick" replace="xx"/> <PARAMETER id="linkButtonOk" name="ok" default="" attribute="onmouseover" replace="xx"/> <PARAMETER id="tableButtonOk" name="ok" default="" attribute="onmouseover" replace="xx"/> <PARAMETER id="linkButtonCancel" name="cancel" default="" attribute="onmouseover" replace="xx"/> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
