details: https://code.openbravo.com/erp/devel/pi/rev/a363c29aeee3 changeset: 25491:a363c29aeee3 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Dec 04 13:09:42 2014 +0100 summary: Fixes Issue 28234: Check in Costing Rule Validation that the org has Currency.
If the organization has no currency defined, the costing process will use the currency defined in the client. This could be wrong if the currency for the transactions of this organization should be different that the currency of the client, so before validating a costing rule the organization of it should have a currency defined. details: https://code.openbravo.com/erp/devel/pi/rev/107d831cf383 changeset: 25492:107d831cf383 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Dec 04 16:58:28 2014 +0100 summary: Related to Issue 28238: Clear Goods Shipment Lines when changing Goods Shipment. A callout has been implemented in Goods Shipment field. diffstat: src-db/database/sourcedata/AD_CALLOUT.xml | 9 ++ src-db/database/sourcedata/AD_COLUMN.xml | 1 + src-db/database/sourcedata/AD_MESSAGE.xml | 12 +++ src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 +++ src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 +++ src/org/openbravo/costing/CostingRuleProcess.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Receipt.java | 31 ++++++++++ 7 files changed, 78 insertions(+), 1 deletions(-) diffs (143 lines): diff -r 3ccddc39ff88 -r 107d831cf383 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Thu Dec 04 16:58:28 2014 +0100 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Thu Dec 04 16:58:28 2014 +0100 @@ -997,6 +997,15 @@ <!--6C7A1DC738044D2880CF60856508FC81--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--6C7A1DC738044D2880CF60856508FC81--></AD_CALLOUT> +<!--6D1C09018D30444EB4F04E724A8D252A--><AD_CALLOUT> +<!--6D1C09018D30444EB4F04E724A8D252A--> <AD_CALLOUT_ID><![CDATA[6D1C09018D30444EB4F04E724A8D252A]]></AD_CALLOUT_ID> +<!--6D1C09018D30444EB4F04E724A8D252A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6D1C09018D30444EB4F04E724A8D252A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6D1C09018D30444EB4F04E724A8D252A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6D1C09018D30444EB4F04E724A8D252A--> <NAME><![CDATA[SL_LandedCost_Receipt]]></NAME> +<!--6D1C09018D30444EB4F04E724A8D252A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--6D1C09018D30444EB4F04E724A8D252A--></AD_CALLOUT> + <!--6D209ED20216469B826243233BD68A6A--><AD_CALLOUT> <!--6D209ED20216469B826243233BD68A6A--> <AD_CALLOUT_ID><![CDATA[6D209ED20216469B826243233BD68A6A]]></AD_CALLOUT_ID> <!--6D209ED20216469B826243233BD68A6A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3ccddc39ff88 -r 107d831cf383 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 04 16:58:28 2014 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 04 16:58:28 2014 +0100 @@ -222799,6 +222799,7 @@ <!--00E37E26A3AB0E3BE050007F010076CF--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--00E37E26A3AB0E3BE050007F010076CF--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--00E37E26A3AB0E3BE050007F010076CF--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--00E37E26A3AB0E3BE050007F010076CF--> <AD_CALLOUT_ID><![CDATA[6D1C09018D30444EB4F04E724A8D252A]]></AD_CALLOUT_ID> <!--00E37E26A3AB0E3BE050007F010076CF--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--00E37E26A3AB0E3BE050007F010076CF--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--00E37E26A3AB0E3BE050007F010076CF--> <POSITION><![CDATA[11]]></POSITION> diff -r 3ccddc39ff88 -r 107d831cf383 src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml Thu Dec 04 16:58:28 2014 +0100 +++ b/src-db/database/sourcedata/AD_MESSAGE.xml Thu Dec 04 16:58:28 2014 +0100 @@ -17563,6 +17563,18 @@ <!--2AA326CA514F44E0B8E8A16934EDC586--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--2AA326CA514F44E0B8E8A16934EDC586--></AD_MESSAGE> +<!--2AAC2B5D104840A09B86C24F4022727A--><AD_MESSAGE> +<!--2AAC2B5D104840A09B86C24F4022727A--> <AD_MESSAGE_ID><![CDATA[2AAC2B5D104840A09B86C24F4022727A]]></AD_MESSAGE_ID> +<!--2AAC2B5D104840A09B86C24F4022727A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--2AAC2B5D104840A09B86C24F4022727A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--2AAC2B5D104840A09B86C24F4022727A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--2AAC2B5D104840A09B86C24F4022727A--> <VALUE><![CDATA[NoCurrencyInCostingRuleOrg]]></VALUE> +<!--2AAC2B5D104840A09B86C24F4022727A--> <MSGTEXT><![CDATA[The Organization of the Costing Rule has no Currency defined.]]></MSGTEXT> +<!--2AAC2B5D104840A09B86C24F4022727A--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--2AAC2B5D104840A09B86C24F4022727A--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--2AAC2B5D104840A09B86C24F4022727A--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--2AAC2B5D104840A09B86C24F4022727A--></AD_MESSAGE> + <!--2AAD63985F6347A38D66D66A0DF86957--><AD_MESSAGE> <!--2AAD63985F6347A38D66D66A0DF86957--> <AD_MESSAGE_ID><![CDATA[2AAD63985F6347A38D66D66A0DF86957]]></AD_MESSAGE_ID> <!--2AAD63985F6347A38D66D66A0DF86957--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3ccddc39ff88 -r 107d831cf383 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Dec 04 16:58:28 2014 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Dec 04 16:58:28 2014 +0100 @@ -4013,6 +4013,18 @@ <!--7E8D14B5264B3E6CE040007F01010D94--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--7E8D14B5264B3E6CE040007F01010D94--></AD_MODEL_OBJECT> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--><AD_MODEL_OBJECT> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <AD_MODEL_OBJECT_ID><![CDATA[7FBEDB7A3B4B4A1BA6C2294AF4AEE704]]></AD_MODEL_OBJECT_ID> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <ACTION><![CDATA[C]]></ACTION> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_LandedCost_Receipt]]></CLASSNAME> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <AD_CALLOUT_ID><![CDATA[6D1C09018D30444EB4F04E724A8D252A]]></AD_CALLOUT_ID> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--7FBEDB7A3B4B4A1BA6C2294AF4AEE704--></AD_MODEL_OBJECT> + <!--83A12B7DAABDAB88E040007F01017CB8--><AD_MODEL_OBJECT> <!--83A12B7DAABDAB88E040007F01017CB8--> <AD_MODEL_OBJECT_ID><![CDATA[83A12B7DAABDAB88E040007F01017CB8]]></AD_MODEL_OBJECT_ID> <!--83A12B7DAABDAB88E040007F01017CB8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3ccddc39ff88 -r 107d831cf383 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Dec 04 16:58:28 2014 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Dec 04 16:58:28 2014 +0100 @@ -4340,6 +4340,16 @@ <!--ACF55029BBC7476AA1EB6C502EDE5BA9--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--ACF55029BBC7476AA1EB6C502EDE5BA9--></AD_MODEL_OBJECT_MAPPING> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--><AD_MODEL_OBJECT_MAPPING> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AEDDFFD4924046D0BCB219DDDF5ECE40]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <AD_MODEL_OBJECT_ID><![CDATA[7FBEDB7A3B4B4A1BA6C2294AF4AEE704]]></AD_MODEL_OBJECT_ID> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <MAPPINGNAME><![CDATA[/ad_callouts/SL_LandedCost_Receipt.html]]></MAPPINGNAME> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--AEDDFFD4924046D0BCB219DDDF5ECE40--></AD_MODEL_OBJECT_MAPPING> + <!--AFEFA3ECE5E543C8BFCB049F0208577F--><AD_MODEL_OBJECT_MAPPING> <!--AFEFA3ECE5E543C8BFCB049F0208577F--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AFEFA3ECE5E543C8BFCB049F0208577F]]></AD_MODEL_OBJECT_MAPPING_ID> <!--AFEFA3ECE5E543C8BFCB049F0208577F--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 3ccddc39ff88 -r 107d831cf383 src/org/openbravo/costing/CostingRuleProcess.java --- a/src/org/openbravo/costing/CostingRuleProcess.java Thu Dec 04 16:58:28 2014 +0100 +++ b/src/org/openbravo/costing/CostingRuleProcess.java Thu Dec 04 16:58:28 2014 +0100 @@ -77,7 +77,9 @@ OBContext.setAdminMode(false); final String ruleId = (String) bundle.getParams().get("M_Costing_Rule_ID"); CostingRule rule = OBDal.getInstance().get(CostingRule.class, ruleId); - + if (rule.getOrganization().getCurrency() == null) { + throw new OBException("@NoCurrencyInCostingRuleOrg@"); + } OrganizationStructureProvider osp = OBContext.getOBContext() .getOrganizationStructureProvider(rule.getClient().getId()); final Set<String> childOrgs = osp.getChildTree(rule.getOrganization().getId(), true); diff -r 3ccddc39ff88 -r 107d831cf383 src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Receipt.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_LandedCost_Receipt.java Thu Dec 04 16:58:28 2014 +0100 @@ -0,0 +1,31 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.erpCommon.ad_callouts; + +import javax.servlet.ServletException; + +public class SL_LandedCost_Receipt extends SimpleCallout { + + private static final long serialVersionUID = 1L; + + @Override + protected void execute(CalloutInfo info) throws ServletException { + info.addResult("inpmInoutlineId", ""); + } +} ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
