details: https://code.openbravo.com/erp/devel/main/rev/061922babebd changeset: 21674:061922babebd user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Dec 19 05:19:48 2013 +0100 summary: Merge back from main
details: https://code.openbravo.com/erp/devel/main/rev/a4f03638ab68 changeset: 21675:a4f03638ab68 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Thu Dec 12 16:47:38 2013 +0530 summary: Fixes Issue 0024575: Not suitable default Currency (USD) in Product/Costing Tab. details: https://code.openbravo.com/erp/devel/main/rev/aae6cc6636ea changeset: 21676:aae6cc6636ea user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Dec 19 10:42:28 2013 +0100 summary: fixes issue 25372: Pick and Execute window can't be used if it is launched from a menu entry details: https://code.openbravo.com/erp/devel/main/rev/8909c0775e65 changeset: 21677:8909c0775e65 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Dec 19 11:29:41 2013 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/3ce09750f1bd changeset: 21678:3ce09750f1bd user: Stefan Hühner <stefan.huehner <at> openbravo.com> date: Thu Dec 19 16:34:59 2013 +0100 summary: dummy commit to trigger a build diffstat: .hgsigs | 1 + .hgtags | 1 + lib/README | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 1 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src/org/openbravo/erpCommon/ad_callouts/SL_Costing_Currency.java | 61 ++++++++++ 9 files changed, 97 insertions(+), 1 deletions(-) diffs (179 lines): diff -r e16bf47ff9ce -r 3ce09750f1bd .hgsigs --- a/.hgsigs Wed Dec 04 11:31:35 2013 +0530 +++ b/.hgsigs Thu Dec 19 16:34:59 2013 +0100 @@ -131,6 +131,7 @@ ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh 3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ 8b9a63ffa8e5d52b063db22a52f747a3c616affc 0 iEYEABECAAYFAlKe/L8ACgkQCX/oGf+2qkMfuwCfafnQo9e1Wva5pycMnkB4/WDQgJoAoLJdXDJt51XxtNI5Orod5XJA+HMX +bfe21782cd33b4c3bed1cd733f455de6dc61c766 0 iEYEABECAAYFAlKup5AACgkQCX/oGf+2qkNIUwCgmrPTAq/4glNIJPzOxIl9C5gw1pEAoN+hKrdK0v/e9SEVmKsNYlQx/NZr 2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI f2a17a54900bff00269ae2ea9b904a32134de48f 0 iEYEABECAAYFAlKMuRsACgkQCX/oGf+2qkN1pwCeJzq8oiozQ5qgSNB6ZBboqjEwppEAniyBrwJie/OiwFTaP5VIxp+ceDSQ 4c222ccbbea79a4343b1ff1729106becebebbc39 0 iEYEABECAAYFAlKwPmcACgkQCX/oGf+2qkP0awCfVBWE5p7hLNtnbzLL60SS5+ZsrogAn1d7xhYIm/nJ03Jlqs1jXg0iJcgM diff -r e16bf47ff9ce -r 3ce09750f1bd .hgtags --- a/.hgtags Wed Dec 04 11:31:35 2013 +0530 +++ b/.hgtags Thu Dec 19 16:34:59 2013 +0100 @@ -142,6 +142,7 @@ 750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1 0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 72950e8d3e2a52a8c2c704f38f53977dcd46a297 3.0MP28.3 +0b0fda0f36cb25ffd9652b73d69d81f711275091 3.0MP28.4 cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29 f7af9706971ab040115da0a457c0034c53731ead 3.0MP29.1 d58f931280521ed35a3bfc7d7fcaa60186489ba2 3.0MP30 diff -r e16bf47ff9ce -r 3ce09750f1bd lib/README --- a/lib/README Wed Dec 04 11:31:35 2013 +0530 +++ b/lib/README Thu Dec 19 16:34:59 2013 +0100 @@ -1,3 +1,4 @@ When adding or removing libraries to Openbravo ERP please update this page with your changes: http://wiki.openbravo.com/wiki/Openbravo_Libraries + diff -r e16bf47ff9ce -r 3ce09750f1bd modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Wed Dec 04 11:31:35 2013 +0530 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Thu Dec 19 16:34:59 2013 +0100 @@ -398,7 +398,7 @@ } } } - return null; + return OB.User.organizationId; }, onFetchData: function (criteria, requestProperties) { diff -r e16bf47ff9ce -r 3ce09750f1bd src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Wed Dec 04 11:31:35 2013 +0530 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Thu Dec 19 16:34:59 2013 +0100 @@ -1016,6 +1016,15 @@ <!--A455D9729EB646EDBF7FC0C4FFCDDC02--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--A455D9729EB646EDBF7FC0C4FFCDDC02--></AD_CALLOUT> +<!--ADC97564E61F49CCAB8D92034DECC64C--><AD_CALLOUT> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <AD_CALLOUT_ID><![CDATA[ADC97564E61F49CCAB8D92034DECC64C]]></AD_CALLOUT_ID> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <NAME><![CDATA[SL_Costing_Currency]]></NAME> +<!--ADC97564E61F49CCAB8D92034DECC64C--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--ADC97564E61F49CCAB8D92034DECC64C--></AD_CALLOUT> + <!--AE1F6503340441ABBF1BC89FD46DEF13--><AD_CALLOUT> <!--AE1F6503340441ABBF1BC89FD46DEF13--> <AD_CALLOUT_ID><![CDATA[AE1F6503340441ABBF1BC89FD46DEF13]]></AD_CALLOUT_ID> <!--AE1F6503340441ABBF1BC89FD46DEF13--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r e16bf47ff9ce -r 3ce09750f1bd src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Dec 04 11:31:35 2013 +0530 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Dec 19 16:34:59 2013 +0100 @@ -138933,6 +138933,7 @@ <!--800756--> <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR> <!--800756--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--800756--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--800756--> <AD_CALLOUT_ID><![CDATA[ADC97564E61F49CCAB8D92034DECC64C]]></AD_CALLOUT_ID> <!--800756--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--800756--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--800756--> <POSITION><![CDATA[7]]></POSITION> diff -r e16bf47ff9ce -r 3ce09750f1bd src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Wed Dec 04 11:31:35 2013 +0530 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Dec 19 16:34:59 2013 +0100 @@ -3784,6 +3784,18 @@ <!--70AAEDDC523E44C6B903E7DAFD3C3228--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--70AAEDDC523E44C6B903E7DAFD3C3228--></AD_MODEL_OBJECT> +<!--74993EB84A38413CA6109A5D2B563552--><AD_MODEL_OBJECT> +<!--74993EB84A38413CA6109A5D2B563552--> <AD_MODEL_OBJECT_ID><![CDATA[74993EB84A38413CA6109A5D2B563552]]></AD_MODEL_OBJECT_ID> +<!--74993EB84A38413CA6109A5D2B563552--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--74993EB84A38413CA6109A5D2B563552--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--74993EB84A38413CA6109A5D2B563552--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--74993EB84A38413CA6109A5D2B563552--> <ACTION><![CDATA[C]]></ACTION> +<!--74993EB84A38413CA6109A5D2B563552--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_Costing_Currency]]></CLASSNAME> +<!--74993EB84A38413CA6109A5D2B563552--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--74993EB84A38413CA6109A5D2B563552--> <AD_CALLOUT_ID><![CDATA[ADC97564E61F49CCAB8D92034DECC64C]]></AD_CALLOUT_ID> +<!--74993EB84A38413CA6109A5D2B563552--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--74993EB84A38413CA6109A5D2B563552--></AD_MODEL_OBJECT> + <!--75CE8C1D309F44B7A3545E7B0EFC5449--><AD_MODEL_OBJECT> <!--75CE8C1D309F44B7A3545E7B0EFC5449--> <AD_MODEL_OBJECT_ID><![CDATA[75CE8C1D309F44B7A3545E7B0EFC5449]]></AD_MODEL_OBJECT_ID> <!--75CE8C1D309F44B7A3545E7B0EFC5449--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r e16bf47ff9ce -r 3ce09750f1bd src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Wed Dec 04 11:31:35 2013 +0530 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Dec 19 16:34:59 2013 +0100 @@ -4040,6 +4040,16 @@ <!--6AE5F2D3163D178BE040007F010174B7--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--6AE5F2D3163D178BE040007F010174B7--></AD_MODEL_OBJECT_MAPPING> +<!--6CC86B3FF0CE460B8972901C6BC63063--><AD_MODEL_OBJECT_MAPPING> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6CC86B3FF0CE460B8972901C6BC63063]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <AD_MODEL_OBJECT_ID><![CDATA[74993EB84A38413CA6109A5D2B563552]]></AD_MODEL_OBJECT_ID> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <MAPPINGNAME><![CDATA[/ad_callouts/SL_Costing_Currency.html]]></MAPPINGNAME> +<!--6CC86B3FF0CE460B8972901C6BC63063--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--6CC86B3FF0CE460B8972901C6BC63063--></AD_MODEL_OBJECT_MAPPING> + <!--6E33721FD01845F291D0A69866C60821--><AD_MODEL_OBJECT_MAPPING> <!--6E33721FD01845F291D0A69866C60821--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6E33721FD01845F291D0A69866C60821]]></AD_MODEL_OBJECT_MAPPING_ID> <!--6E33721FD01845F291D0A69866C60821--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r e16bf47ff9ce -r 3ce09750f1bd src/org/openbravo/erpCommon/ad_callouts/SL_Costing_Currency.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Costing_Currency.java Thu Dec 19 16:34:59 2013 +0100 @@ -0,0 +1,61 @@ +/* + ************************************************************************* + * 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) 2013 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.erpCommon.ad_callouts; + +import javax.servlet.ServletException; + +import org.openbravo.base.filter.IsIDFilter; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.ad.system.Client; +import org.openbravo.model.common.enterprise.Organization; + +public class SL_Costing_Currency extends SimpleCallout { + + private static final long serialVersionUID = 1L; + + @Override + protected void execute(CalloutInfo info) throws ServletException { + + final String strAdOrgId = info.getStringParameter("inpadOrgId", IsIDFilter.instance); + final String strClientId = info.getStringParameter("inpadClientId", IsIDFilter.instance); + String strCurrencyId = null; + try { + OBContext.setAdminMode(); + Organization org = OBDal.getInstance().get(Organization.class, strAdOrgId); + if (org.getCurrency() != null) + strCurrencyId = org.getCurrency().getId(); + else { + Organization legalOrg = OBContext.getOBContext().getOrganizationStructureProvider() + .getLegalEntity(org); + if (legalOrg != null) + strCurrencyId = legalOrg.getCurrency() != null ? legalOrg.getCurrency().getId() : null; + if (strCurrencyId == null || org.getId().equals("0")) { + Client client = OBDal.getInstance().get(Client.class, strClientId); + strCurrencyId = client.getCurrency() != null ? client.getCurrency().getId() : null; + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + OBContext.restorePreviousMode(); + } + info.addResult("inpcCurrencyId", strCurrencyId); + } +} ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
