details: https://code.openbravo.com/erp/stable/2.50/rev/21fb7e9d9baf changeset: 9642:21fb7e9d9baf user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Wed Aug 24 12:53:56 2011 +0200 summary: Fixes issue 18141: In G/L Category window, there are two records with None name. The solution, is for the future installations. It doesn't affect to installed environment
details: https://code.openbravo.com/erp/stable/2.50/rev/b3e3fb8b899e changeset: 9643:b3e3fb8b899e user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Aug 26 12:33:03 2011 +0200 summary: Fixes issue 18303: Stocked field should be set to N when defining product type different from Item diffstat: src-db/database/sourcedata/AD_CALLOUT.xml | 11 + 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/referencedData/GL_CATEGORY.xml | 2 +- src/org/openbravo/erpCommon/ad_callouts/SL_Product_Type.java | 82 ++++++++++++ 6 files changed, 117 insertions(+), 1 deletions(-) diffs (170 lines): diff -r 2d9f4530fd60 -r b3e3fb8b899e src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Thu Sep 01 10:28:41 2011 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Fri Aug 26 12:33:03 2011 +0200 @@ -983,4 +983,15 @@ <!--F6E343E77DA249559AEF8651D595E880--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--F6E343E77DA249559AEF8651D595E880--></AD_CALLOUT> +<!--FF808181320551FD01320576AAAF0008--><AD_CALLOUT> +<!--FF808181320551FD01320576AAAF0008--> <AD_CALLOUT_ID><![CDATA[FF808181320551FD01320576AAAF0008]]></AD_CALLOUT_ID> +<!--FF808181320551FD01320576AAAF0008--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF808181320551FD01320576AAAF0008--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF808181320551FD01320576AAAF0008--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF808181320551FD01320576AAAF0008--> <NAME><![CDATA[SL_Product_Type]]></NAME> +<!--FF808181320551FD01320576AAAF0008--> <DESCRIPTION><![CDATA[This callout changes the value of the stocked field if the product type is Service. +]]></DESCRIPTION> +<!--FF808181320551FD01320576AAAF0008--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--FF808181320551FD01320576AAAF0008--></AD_CALLOUT> + </data> diff -r 2d9f4530fd60 -r b3e3fb8b899e src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Sep 01 10:28:41 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Fri Aug 26 12:33:03 2011 +0200 @@ -122434,6 +122434,7 @@ <!--7795--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--7795--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--7795--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--7795--> <AD_CALLOUT_ID><![CDATA[FF808181320551FD01320576AAAF0008]]></AD_CALLOUT_ID> <!--7795--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--7795--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--7795--> <POSITION><![CDATA[40]]></POSITION> diff -r 2d9f4530fd60 -r b3e3fb8b899e src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Sep 01 10:28:41 2011 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Fri Aug 26 12:33:03 2011 +0200 @@ -15977,6 +15977,18 @@ <!--0FE40D66384144BEA116F3F6E8287B13--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--0FE40D66384144BEA116F3F6E8287B13--></AD_MODEL_OBJECT> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--><AD_MODEL_OBJECT> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <AD_MODEL_OBJECT_ID><![CDATA[0D2DE4E10E51447CAFE108E955F2B1F4]]></AD_MODEL_OBJECT_ID> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <ACTION><![CDATA[C]]></ACTION> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_Product_Type]]></CLASSNAME> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <AD_CALLOUT_ID><![CDATA[FF808181320551FD01320576AAAF0008]]></AD_CALLOUT_ID> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--0D2DE4E10E51447CAFE108E955F2B1F4--></AD_MODEL_OBJECT> + <!--103BD1E3D87C4A69A5FA03DC6BD85ABD--><AD_MODEL_OBJECT> <!--103BD1E3D87C4A69A5FA03DC6BD85ABD--> <AD_MODEL_OBJECT_ID><![CDATA[103BD1E3D87C4A69A5FA03DC6BD85ABD]]></AD_MODEL_OBJECT_ID> <!--103BD1E3D87C4A69A5FA03DC6BD85ABD--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 2d9f4530fd60 -r b3e3fb8b899e src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Sep 01 10:28:41 2011 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Fri Aug 26 12:33:03 2011 +0200 @@ -27570,6 +27570,16 @@ <!--A874FEED581A4D50A211C22A6BACD15D--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--A874FEED581A4D50A211C22A6BACD15D--></AD_MODEL_OBJECT_MAPPING> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--><AD_MODEL_OBJECT_MAPPING> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[A8BCFC7ADBD64277A5E6645DC15ACCF7]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <AD_MODEL_OBJECT_ID><![CDATA[0D2DE4E10E51447CAFE108E955F2B1F4]]></AD_MODEL_OBJECT_ID> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <MAPPINGNAME><![CDATA[/ad_callouts/SL_Product_Type.html]]></MAPPINGNAME> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--A8BCFC7ADBD64277A5E6645DC15ACCF7--></AD_MODEL_OBJECT_MAPPING> + <!--AA17604E2E4F11DEB31B8B9D5D2EB7B9--><AD_MODEL_OBJECT_MAPPING> <!--AA17604E2E4F11DEB31B8B9D5D2EB7B9--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[AA17604E2E4F11DEB31B8B9D5D2EB7B9]]></AD_MODEL_OBJECT_MAPPING_ID> <!--AA17604E2E4F11DEB31B8B9D5D2EB7B9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 2d9f4530fd60 -r b3e3fb8b899e src-db/database/sourcedata/referencedData/GL_CATEGORY.xml --- a/src-db/database/sourcedata/referencedData/GL_CATEGORY.xml Thu Sep 01 10:28:41 2011 +0200 +++ b/src-db/database/sourcedata/referencedData/GL_CATEGORY.xml Fri Aug 26 12:33:03 2011 +0200 @@ -9,7 +9,7 @@ <!--0--> <CREATEDBY><![CDATA[0]]></CREATEDBY> <!--0--> <UPDATED><![CDATA[2011-02-22 17:06:39.0]]></UPDATED> <!--0--> <UPDATEDBY><![CDATA[0]]></UPDATEDBY> -<!--0--> <NAME><![CDATA[None]]></NAME> +<!--0--> <NAME><![CDATA[None of System]]></NAME> <!--0--> <CATEGORYTYPE><![CDATA[M]]></CATEGORYTYPE> <!--0--> <ISDEFAULT><![CDATA[N]]></ISDEFAULT> <!--0--></GL_CATEGORY> diff -r 2d9f4530fd60 -r b3e3fb8b899e src/org/openbravo/erpCommon/ad_callouts/SL_Product_Type.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Product_Type.java Fri Aug 26 12:33:03 2011 +0200 @@ -0,0 +1,82 @@ +/* + ************************************************************************* + * 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) 2001-2011 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ +package org.openbravo.erpCommon.ad_callouts; + +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.openbravo.base.secureApp.HttpSecureAppServlet; +import org.openbravo.base.secureApp.VariablesSecureApp; +import org.openbravo.xmlEngine.XmlDocument; + +public class SL_Product_Type extends HttpSecureAppServlet { + private static final long serialVersionUID = 1L; + + public void init(ServletConfig config) { + super.init(config); + boolHist = false; + } + + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, + ServletException { + VariablesSecureApp vars = new VariablesSecureApp(request); + // callout calls always come in with the DEFAULT parameter + if (vars.commandIn("DEFAULT")) { + // parse input parameters here + String strProductType = vars.getStringParameter("inpproducttype"); + String strIsStocked = vars.getStringParameter("inpisstocked"); + try { + printPage(response, vars, strProductType, strIsStocked); // pass additional parameters you + // have parsed above to the printPage + // rendering subroutine + } catch (ServletException ex) { + pageErrorCallOut(response); + } + } else + pageError(response); + } + + private void printPage(HttpServletResponse response, VariablesSecureApp vars, + String strProductType, String strIsStocked) throws IOException, ServletException { + log4j.debug("Output: dataSheet"); + XmlDocument xmlDocument = xmlEngine.readXmlTemplate( + "org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument(); + + StringBuffer result = new StringBuffer(); + result.append("var calloutName='SL_Product_Type';\n\n"); + result.append("var respuesta = new Array("); + if (!strProductType.equals("I")) + result.append("new Array(\"inpisstocked\", \"" + "N" + "\")"); + else + result.append("new Array(\"inpisstocked\", \"" + "Y" + "\")"); + result.append(");"); + + xmlDocument.setParameter("array", result.toString()); + xmlDocument.setParameter("frameName", "appFrame"); + response.setContentType("text/html; charset=UTF-8"); + PrintWriter out = response.getWriter(); + out.println(xmlDocument.print()); + out.close(); + } +} ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
