details: https://code.openbravo.com/erp/devel/pi/rev/875ccb64c6c5 changeset: 22890:875ccb64c6c5 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Apr 21 15:07:52 2014 +0530 summary: Fixes Issue 25792: Voiding a good shipment is failing when the user assigns a freight cost
details: https://code.openbravo.com/erp/devel/pi/rev/53336a710a77 changeset: 22891:53336a710a77 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Apr 21 01:47:00 2014 +0530 summary: Fixes Issue 25879: Create all pricelists does not work diffstat: src-db/database/model/functions/M_INOUT_POST.xml | 6 ++++-- src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.java | 5 ++--- src/org/openbravo/erpCommon/ad_process/PriceListCreateAll_data.xsql | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diffs (66 lines): diff -r 393ff5c59853 -r 53336a710a77 src-db/database/model/functions/M_INOUT_POST.xml --- a/src-db/database/model/functions/M_INOUT_POST.xml Thu Apr 17 10:46:22 2014 +0200 +++ b/src-db/database/model/functions/M_INOUT_POST.xml Mon Apr 21 01:47:00 2014 +0530 @@ -975,7 +975,8 @@ C_Costcenter_ID, A_Asset_ID, DeliveryViaRule, M_Shipper_ID, C_Charge_ID, ChargeAmt, PriorityRule, DocStatus, DocAction, Processing, - Processed, ISLOGISTIC, salesrep_id, Process_Goods_Java + Processed, ISLOGISTIC, salesrep_id, Process_Goods_Java, + calculate_freight, m_freightcategory_id, freight_currency_id ) VALUES ( @@ -990,7 +991,8 @@ Cur_InOut.C_Costcenter_ID, Cur_InOut.A_Asset_ID, Cur_InOut.DeliveryViaRule, Cur_InOut.M_Shipper_ID, Cur_InOut.C_Charge_ID, Cur_InOut.ChargeAmt * -1, Cur_InOut.PriorityRule, 'DR', 'CO', 'N', - 'N', Cur_InOut.islogistic, Cur_InOut.salesrep_id, 'CO' + 'N', Cur_InOut.islogistic, Cur_InOut.salesrep_id, 'CO', + Cur_InOut.calculate_freight, Cur_InOut.m_freightcategory_id, Cur_InOut.freight_currency_id ) ; v_ResultStr:='InsertInOutLine'; diff -r 393ff5c59853 -r 53336a710a77 src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.java --- a/src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.java Thu Apr 17 10:46:22 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_process/PriceListCreateAll.java Mon Apr 21 01:47:00 2014 +0530 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -153,8 +153,7 @@ PInstanceProcessData.insertPInstance(this, pinstance, "800040", data.mPricelistVersionId, "N", vars.getUser(), vars.getClient(), vars.getOrg()); - PriceListCreateAllData.process(conn, this, pinstance); - + PriceListCreateAllData.process(this, pinstance); PInstanceProcessData[] pinstanceData = PInstanceProcessData.select(this, pinstance); String messageResult = ""; if (pinstanceData != null && pinstanceData.length > 0) { diff -r 393ff5c59853 -r 53336a710a77 src/org/openbravo/erpCommon/ad_process/PriceListCreateAll_data.xsql --- a/src/org/openbravo/erpCommon/ad_process/PriceListCreateAll_data.xsql Thu Apr 17 10:46:22 2014 +0200 +++ b/src/org/openbravo/erpCommon/ad_process/PriceListCreateAll_data.xsql Mon Apr 21 01:47:00 2014 +0530 @@ -12,7 +12,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2001-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -55,7 +55,7 @@ <Parameter name="clientOrg" optional="true" type="replace" after="AND AD_ORG_ID IN (" text="'1'"/> <Parameter name="clientUser" optional="true" type="replace" after="AND AD_CLIENT_ID IN (" text="'1'"/> </SqlMethod> - <SqlMethod name="process" type="callableStatement" connection="true" return="object" object="PriceListCreateAllData"> + <SqlMethod name="process" type="callableStatement" return="object" object="PriceListCreateAllData"> <SqlMethodComment></SqlMethodComment> <Sql><![CDATA[ CALL M_PriceList_Create(?) ------------------------------------------------------------------------------ Start Your Social Network Today - Download eXo Platform Build your Enterprise Intranet with eXo Platform Software Java Based Open Source Intranet - Social, Extensible, Cloud Ready Get Started Now And Turn Your Intranet Into A Collaboration Platform http://p.sf.net/sfu/ExoPlatform _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
