details: https://code.openbravo.com/erp/devel/pi/rev/023c0a102dea changeset: 15890:023c0a102dea user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Mar 21 16:07:10 2012 +0100 summary: Fixes Issue 19944: Changing location of a business partner, name does not change
details: https://code.openbravo.com/erp/devel/pi/rev/3d5a75391c27 changeset: 15891:3d5a75391c27 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Wed Mar 21 17:34:15 2012 +0100 summary: Fixes Issue 20005: Internal consumption mov. do not appear in product mov. rep. 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 ++++++++++ src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html | 49 +++++++ src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java | 35 ++++- src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.xml | 19 ++ src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql | 34 ++++- 10 files changed, 244 insertions(+), 6 deletions(-) diffs (truncated from 429 to 300 lines): diff -r eb9992adfdfa -r 3d5a75391c27 src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Thu Mar 22 11:18:38 2012 +0100 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Wed Mar 21 17:34:15 2012 +0100 @@ -896,6 +896,15 @@ <!--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 eb9992adfdfa -r 3d5a75391c27 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Mar 22 11:18:38 2012 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Wed Mar 21 17:34:15 2012 +0100 @@ -45384,6 +45384,7 @@ <!--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 eb9992adfdfa -r 3d5a75391c27 src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Thu Mar 22 11:18:38 2012 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Wed Mar 21 17:34:15 2012 +0100 @@ -4153,6 +4153,18 @@ <!--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 eb9992adfdfa -r 3d5a75391c27 src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Thu Mar 22 11:18:38 2012 +0100 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Wed Mar 21 17:34:15 2012 +0100 @@ -4250,6 +4250,16 @@ <!--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 eb9992adfdfa -r 3d5a75391c27 src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml --- a/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml Thu Mar 22 11:18:38 2012 +0100 +++ b/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml Wed Mar 21 17:34:15 2012 +0100 @@ -550,4 +550,15 @@ <!--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 eb9992adfdfa -r 3d5a75391c27 src/org/openbravo/erpCommon/ad_callouts/BusinessPartner_Location.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/BusinessPartner_Location.java Wed Mar 21 17:34:15 2012 +0100 @@ -0,0 +1,70 @@ +/* + ************************************************************************* + * 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) 2010 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 diff -r eb9992adfdfa -r 3d5a75391c27 src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html Thu Mar 22 11:18:38 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html Wed Mar 21 17:34:15 2012 +0100 @@ -122,6 +122,7 @@ <input type="hidden" name="inpmInventoryId"></input> <input type="hidden" name="inpmMovementId"></input> <input type="hidden" name="inpmProductionplanId"></input> + <input type="hidden" name="inpmInternalConsumptionId"></input> <input type="hidden" name="inpLastFieldChanged" value=""/> <table height="100%" border="0" cellpadding="0" cellspacing="0" id="main"> <tr> @@ -389,6 +390,11 @@ <td class="ContentCell"> </td> </tr> <tr> + <td class="TitleCell"><span class="LabelText">Internal Consumption</span></td> + <td class="Radio_Check_ContentCell"><span class="Checkbox_container_NOT_Focused"><input type="checkbox" name="inpInternalConsumption" id="paramInternalConsumption" value="-1" checked></input></span></td> + <td class="ContentCell"> </td> + </tr> + <tr> <td colspan="6"> <table class="FieldGroup" cellspacing="0" cellpadding="0" border="0"> <tbody> @@ -664,6 +670,49 @@ </div> </table> <div style="height:15px;" /> + <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;" id="selEliminar5"> + <tr class="DataGrid_Body_Row"> + <th class="DataGrid_Header_Cell" align="center" colspan="8"><span>Internal Consumption</span></th> + </tr> + <div id="sectionPartner4"> + <tr class="DataGrid_Body_Row"> + <th class="DataGrid_Header_Cell" colspan="8"><span>Customer<span>: </span><span id="fieldPartnername4">xxAguinaga</span></span></th> + </tr> + <tr class="DataGrid_Body_Row"> + <th class="DataGrid_Header_Cell" width="8%">Date</td> + <th class="DataGrid_Header_Cell" width="26%">Movement</td> + <th class="DataGrid_Header_Cell" width="26%">Description</td> + <th class="DataGrid_Header_Cell" width="12%" colspan="3"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" style="background: none; border: 0px none"> + <tr class="DataGrid_Body_Row"> + <th class="DataGrid_Header_Cell" width="100%" colspan="3" style="background: none; border: 0px none">Location</th> + </tr> + <tr class="DataGrid_Body_Row"> + <th class="DataGrid_Header_Cell" width="34%" style="background: none; border: 0px none">X</th> + <th class="DataGrid_Header_Cell" width="33%" style="background: none; border: 0px none">Y</th> + <th class="DataGrid_Header_Cell" width="33%" style="background: none; border: 0px none">Z</th> + </tr> + </table> + </th> + <th class="DataGrid_Header_Cell" width="6%">Exit</th> + <th class="DataGrid_Header_Cell" width="15%">Quantity</th> + </tr> + <div id="sectionDetail4"> + <tr class="DataGrid_Body_Row DataGrid_Body_Row_yy" id="funcEvenOddRow5xx"> + <td class="DataGrid_Body_Cell" width="8%" id="fieldMovementdate4">xx23-02-2004</td> + <td class="DataGrid_Body_Cell" width="26%"> <a href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpmInternalConsumptionId, 'xx', false, document.frmMain, '../InternalConsumption/Header_Relation.html', null, false, true);return false;" onmouseover="window.status='yy';return true;" onmouseout="window.status='';return true;" class="LabelLink" id="fieldId5"> + <span id="fieldMovement3">xx850000007</span></a></td> + <td class="DataGrid_Body_Cell" width="26%" id="fieldName4">xx2345</td> + <td class="DataGrid_Body_Cell" width="4%" id="fieldXOrigin4">xx3</td> + <td class="DataGrid_Body_Cell" width="4%" id="fieldYOrigin4">xx3</td> + <td class="DataGrid_Body_Cell" width="4%" id="fieldZOrigin4">xx3</td> + <td class="DataGrid_Body_Cell" width="6%" id="fieldOut4">xxsi</td> + <td class="DataGrid_Body_Cell" width="15%" id="fieldMovementqty4">xx23</td> + </tr> + </div> + </div> + </table> + <div style="height:15px;" /> <!-- USER CONTROLS --> </td> diff -r eb9992adfdfa -r 3d5a75391c27 src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java Thu Mar 22 11:18:38 2012 +0100 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java Wed Mar 21 17:34:15 2012 +0100 @@ -60,8 +60,10 @@ "-1"); String strProduction = vars.getGlobalVariable("inpProduction", "ReportProductMovement|production", "-1"); + String strInternalConsumption = vars.getGlobalVariable("inpInternalConsumption", + "ReportProductMovement|internalConsumption", "-1"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); } else if (vars.commandIn("DIRECT")) { String strDateFrom = vars.getGlobalVariable("inpDateFrom", "ReportProductMovement|dateFrom", ""); @@ -79,9 +81,11 @@ ""); String strProduction = vars.getGlobalVariable("inpProduction", "ReportProductMovement|production", ""); + String strInternalConsumption = vars.getGlobalVariable("inpInternalConsumption", + "ReportProductMovement|internalConsumption", ""); setHistoryCommand(request, "DIRECT"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); } else if (vars.commandIn("FIND")) { String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom", "ReportProductMovement|dateFrom"); @@ -99,9 +103,11 @@ "ReportProductMovement|movement"); String strProduction = vars.getRequestGlobalVariable("inpProduction", "ReportProductMovement|production"); + String strInternalConsumption = vars.getRequestGlobalVariable("inpInternalConsumption", + "ReportProductMovement|internalConsumption"); setHistoryCommand(request, "DIRECT"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); } else pageError(response); } @@ -109,7 +115,7 @@ private void printPageDataSheet(HttpServletResponse response, VariablesSecureApp vars, String strDateFrom, String strDateTo, String strcBpartnerId, String strmProductId, String strInout, String strInventory, String strMovement, String strProduction, - String strmAttributesetinstanceId) throws IOException, ServletException { + String strmAttributesetinstanceId, String strInternalConsumption) throws IOException, ServletException { if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet"); response.setContentType("text/html; charset=UTF-8"); @@ -119,7 +125,8 @@ ReportProductMovementData[] data1 = null; ReportProductMovementData[] data2 = null; ReportProductMovementData[] data3 = null; - String discard[] = { "discard", "discard", "discard", "discard" }; + ReportProductMovementData[] data4 = null; + String discard[] = { "discard", "discard", "discard", "discard", "discard" }; if (strDateFrom.equals("") && strDateTo.equals("")) { strDateTo = DateTimeData.today(this); strDateFrom = DateTimeData.weekBefore(this); @@ -181,15 +188,31 @@ ------------------------------------------------------------------------------ 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
