details: https://code.openbravo.com/erp/devel/pi/rev/54875f8ea35b changeset: 15954:54875f8ea35b user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Mar 29 18:13:53 2012 +0200 summary: backed out changeset 7a40f5c42d23. related to fix of issue 0019944.
details: https://code.openbravo.com/erp/devel/pi/rev/a40438ae1ee5 changeset: 15955:a40438ae1ee5 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Thu Mar 29 18:17:42 2012 +0200 summary: backed out changeset 023c0a102dea. related to fix of issue 0019944. diffstat: 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-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml | 11 - src/org/openbravo/erpCommon/ad_callouts/BusinessPartner_Location.java | 70 ---------- 6 files changed, 0 insertions(+), 113 deletions(-) diffs (166 lines): diff -r 1a52e412153b -r a40438ae1ee5 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Thu Mar 29 17:42:53 2012 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Thu Mar 29 18:17:42 2012 +0200 @@ -896,15 +896,6 @@ <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--></AD_CALLOUT> -<!--A16736256E0E485D824F726A147713D4--><AD_CALLOUT> -<!--A16736256E0E485D824F726A147713D4--> <AD_CALLOUT_ID><![CDATA[A16736256E0E485D824F726A147713D4]]></AD_CALLOUT_ID> -<!--A16736256E0E485D824F726A147713D4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--A16736256E0E485D824F726A147713D4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--A16736256E0E485D824F726A147713D4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--A16736256E0E485D824F726A147713D4--> <NAME><![CDATA[BusinessPartner_Location]]></NAME> -<!--A16736256E0E485D824F726A147713D4--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> -<!--A16736256E0E485D824F726A147713D4--></AD_CALLOUT> - <!--B7913B8983F94C7AA8D871F657D9DD32--><AD_CALLOUT> <!--B7913B8983F94C7AA8D871F657D9DD32--> <AD_CALLOUT_ID><![CDATA[B7913B8983F94C7AA8D871F657D9DD32]]></AD_CALLOUT_ID> <!--B7913B8983F94C7AA8D871F657D9DD32--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a52e412153b -r a40438ae1ee5 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Mar 29 17:42:53 2012 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Mar 29 18:17:42 2012 +0200 @@ -45384,7 +45384,6 @@ <!--2959--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--2959--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--2959--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> -<!--2959--> <AD_CALLOUT_ID><![CDATA[A16736256E0E485D824F726A147713D4]]></AD_CALLOUT_ID> <!--2959--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--2959--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--2959--> <POSITION><![CDATA[19]]></POSITION> diff -r 1a52e412153b -r a40438ae1ee5 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Mar 29 17:42:53 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Mar 29 18:17:42 2012 +0200 @@ -4153,18 +4153,6 @@ <!--E11F44F0F1384CBEBA4425B16198A1AB--> <SEQNO><![CDATA[30]]></SEQNO> <!--E11F44F0F1384CBEBA4425B16198A1AB--></AD_MODEL_OBJECT> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--><AD_MODEL_OBJECT> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <AD_MODEL_OBJECT_ID><![CDATA[E5A76B028C7B43AABA5EAF8B5708DCBD]]></AD_MODEL_OBJECT_ID> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <ACTION><![CDATA[C]]></ACTION> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.BusinessPartner_Location]]></CLASSNAME> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <AD_CALLOUT_ID><![CDATA[A16736256E0E485D824F726A147713D4]]></AD_CALLOUT_ID> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> -<!--E5A76B028C7B43AABA5EAF8B5708DCBD--></AD_MODEL_OBJECT> - <!--E656BA54FAED4AC2885DDC63F9748C5D--><AD_MODEL_OBJECT> <!--E656BA54FAED4AC2885DDC63F9748C5D--> <AD_MODEL_OBJECT_ID><![CDATA[E656BA54FAED4AC2885DDC63F9748C5D]]></AD_MODEL_OBJECT_ID> <!--E656BA54FAED4AC2885DDC63F9748C5D--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a52e412153b -r a40438ae1ee5 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Mar 29 17:42:53 2012 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Mar 29 18:17:42 2012 +0200 @@ -4250,16 +4250,6 @@ <!--B17328E34CF1FF79E040007F0100103F--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--B17328E34CF1FF79E040007F0100103F--></AD_MODEL_OBJECT_MAPPING> -<!--B498E6541A6F438EBE37FF7507990B49--><AD_MODEL_OBJECT_MAPPING> -<!--B498E6541A6F438EBE37FF7507990B49--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[B498E6541A6F438EBE37FF7507990B49]]></AD_MODEL_OBJECT_MAPPING_ID> -<!--B498E6541A6F438EBE37FF7507990B49--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--B498E6541A6F438EBE37FF7507990B49--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--B498E6541A6F438EBE37FF7507990B49--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--B498E6541A6F438EBE37FF7507990B49--> <AD_MODEL_OBJECT_ID><![CDATA[E5A76B028C7B43AABA5EAF8B5708DCBD]]></AD_MODEL_OBJECT_ID> -<!--B498E6541A6F438EBE37FF7507990B49--> <MAPPINGNAME><![CDATA[/ad_callouts/BusinessPartner_Location.html]]></MAPPINGNAME> -<!--B498E6541A6F438EBE37FF7507990B49--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> -<!--B498E6541A6F438EBE37FF7507990B49--></AD_MODEL_OBJECT_MAPPING> - <!--BA6C980E6AE644FF8D9CC38E2746B8E7--><AD_MODEL_OBJECT_MAPPING> <!--BA6C980E6AE644FF8D9CC38E2746B8E7--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[BA6C980E6AE644FF8D9CC38E2746B8E7]]></AD_MODEL_OBJECT_MAPPING_ID> <!--BA6C980E6AE644FF8D9CC38E2746B8E7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a52e412153b -r a40438ae1ee5 src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml --- a/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml Thu Mar 29 17:42:53 2012 +0200 +++ b/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml Thu Mar 29 18:17:42 2012 +0200 @@ -550,15 +550,4 @@ <!--1006300013--> <COLUMNTYPE><![CDATA[I]]></COLUMNTYPE> <!--1006300013--></AD_REF_SEARCH_COLUMN> -<!--78B78E843C56490AB9C043F7C85932B8--><AD_REF_SEARCH_COLUMN> -<!--78B78E843C56490AB9C043F7C85932B8--> <AD_REF_SEARCH_COLUMN_ID><![CDATA[78B78E843C56490AB9C043F7C85932B8]]></AD_REF_SEARCH_COLUMN_ID> -<!--78B78E843C56490AB9C043F7C85932B8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> -<!--78B78E843C56490AB9C043F7C85932B8--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> -<!--78B78E843C56490AB9C043F7C85932B8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--78B78E843C56490AB9C043F7C85932B8--> <AD_REF_SEARCH_ID><![CDATA[800015]]></AD_REF_SEARCH_ID> -<!--78B78E843C56490AB9C043F7C85932B8--> <NAME><![CDATA[C_Location_ID]]></NAME> -<!--78B78E843C56490AB9C043F7C85932B8--> <COLUMNNAME><![CDATA[C_Location_ID]]></COLUMNNAME> -<!--78B78E843C56490AB9C043F7C85932B8--> <COLUMNTYPE><![CDATA[O]]></COLUMNTYPE> -<!--78B78E843C56490AB9C043F7C85932B8--></AD_REF_SEARCH_COLUMN> - </data> diff -r 1a52e412153b -r a40438ae1ee5 src/org/openbravo/erpCommon/ad_callouts/BusinessPartner_Location.java --- a/src/org/openbravo/erpCommon/ad_callouts/BusinessPartner_Location.java Thu Mar 29 17:42:53 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,70 +0,0 @@ -/* - ************************************************************************* - * 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) 2012 Openbravo SLU - * All Rights Reserved. - * Contributor(s): ______________________________________. - ************************************************************************ - */ -package org.openbravo.erpCommon.ad_callouts; - -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.ServletException; - -import org.openbravo.base.exception.OBException; -import org.openbravo.base.secureApp.VariablesSecureApp; -import org.openbravo.dal.service.OBDal; -import org.openbravo.erpCommon.ad_callouts.SimpleCallout; -import org.openbravo.model.common.geography.Location; -import org.openbravo.service.db.CallStoredProcedure; - -public class BusinessPartner_Location extends SimpleCallout { - - private static final long serialVersionUID = 1L; - - @Override - protected void execute(CalloutInfo info) throws ServletException { - VariablesSecureApp vars = info.vars; - - String strcLocationId = vars.getStringParameter("inpcLocationId"); - String strname = vars.getStringParameter("inpname"); - final Location loc = OBDal.getInstance().get(org.openbravo.model.common.geography.Location.class, strcLocationId); - - final List<Object> parameters = new ArrayList<Object>(); - - parameters.add(loc.getId()); - - // the procedure name - final String procedureName = "C_Location_Name"; - - try { - // calling the procedure and getting the result - - // STORED PROCEDURE - - String substr = strname.substring(0, 1); - - if (substr.equals(".")) { - String locationName = (String) CallStoredProcedure.getInstance().call(procedureName, parameters, null); - info.addResult("inpname", "." + locationName); - } - - // STORED PROCEDURE - - } catch (final Exception e) { - throw new OBException(e); - } - } -} \ No newline at end of file ------------------------------------------------------------------------------ This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
