details: https://code.openbravo.com/erp/devel/pi/rev/490bc7a0d28c changeset: 16424:490bc7a0d28c user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Fri Apr 27 11:07:36 2012 +0200 summary: Fixed bug 9628 Modify Production Cost Report Modify real cost and standard cost colums and delete the sum of materials in Production Cost Report.
details: https://code.openbravo.com/erp/devel/pi/rev/c4b77f87c25d changeset: 16425:c4b77f87c25d user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu May 03 15:17:51 2012 +0200 summary: Fixed bug 9694 Modify input filters in Service project report details: https://code.openbravo.com/erp/devel/pi/rev/95561cbd34d4 changeset: 16426:95561cbd34d4 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu May 03 12:10:56 2012 +0200 summary: Fixed bug 12983 Add logic to good behavior in BusinessPartnerMultiple Add logic to clear the previous search in BusinessPartnerMultiple selector in General Ledger Report. diffstat: src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.srpt | 7 +- src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.xml | 46 ++++----- src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java | 28 ++++- src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java | 6 +- 4 files changed, 49 insertions(+), 38 deletions(-) diffs (223 lines): diff -r 4e30e8a98386 -r 95561cbd34d4 src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.srpt --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.srpt Mon May 07 15:12:33 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.srpt Thu May 03 12:10:56 2012 +0200 @@ -12,18 +12,13 @@ * 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-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ --> <div> <table cellspacing="0" cellpadding="0" width="100%" class="DataGrid_Header_Table DataGrid_Body_Table" style="table-layout: auto;"> - <tr class="DataGrid_Body_Cell DataGrid_Body_Cell_hover"> - <td class="DataGrid_Body_Cell" colspan="6"></td> - <td class="DataGrid_Body_Cell" width="10%" id="fieldRealCostMaterialTotal"></td> - <td class="DataGrid_Body_Cell" width="10%" id="fieldStandardCostMaterialTotal"></td> - </tr> <div id="sectionMaterial"> <tr class="DataGrid_Body_Row DataGrid_Body_Row_1" id="fieldLevelMaterial"> <td width="xx%" class="DataGrid_Body_Cell" id="fieldLevelBlanckMaterial"></td> diff -r 4e30e8a98386 -r 95561cbd34d4 src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.xml --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.xml Mon May 07 15:12:33 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductionCostSubreport.xml Thu May 03 12:10:56 2012 +0200 @@ -12,7 +12,7 @@ * 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-2006 Openbravo SLU +* All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -58,9 +58,6 @@ <FUNCTION id="fieldStandardConsumedMaterialAux" name="SUM" attribute="value" format="euroInform">consumedPerUnitStd</FUNCTION> <FUNCTION id="fieldStandardCostMaterialAux" name="SUM" attribute="value" format="euroInform">costPerUnitStd</FUNCTION--> - <FUNCTION id="fieldRealCostMaterialTotal" name="SUM" format="euroInform">realunitcost</FUNCTION> - <FUNCTION id="fieldStandardCostMaterialTotal" name="SUM" format="euroInform">standarunitcost</FUNCTION> - <SECTION id="sectionMaterial"/> </structure> @@ -71,22 +68,22 @@ <FIELD id="fieldLevelNameMachine" attribute="width" replace="jj">levelName</FIELD> <FIELD id="fieldNameMachine">name</FIELD> <FIELD id="fieldIdMachine" attribute="value">id</FIELD> - <FIELD id="fieldCostPerUnitMachine" format="euroInform">costPerUnit</FIELD> - <FIELD id="fieldCostPerUnitStdMachine" format="euroInform">costPerUnitStd</FIELD> - + <FIELD id="fieldRealCostMachine" format="euroInform">costPerUnit</FIELD> + <FIELD id="fieldStandardCostMachine" format="euroInform">costPerUnitStd</FIELD> + <FIELD id="fieldLevelId">levelid</FIELD> <FUNCTION id="fieldLevelMachine" name="MODULE" arg1="fieldLevelId" arg2="param2" format="integerEdition" attribute="class" replace="1"/> - <!--FIELD id="fieldLevelNameMachine" attribute="class">className</FIELD> - <FIELD id="fieldConsumedPerUnitMachine" attribute="class">className</FIELD> - <FIELD id="fieldCostPerUnitMachine" attribute="class">className</FIELD> - <FIELD id="fieldConsumedPerUnitStdMachine" attribute="class">className</FIELD> - <FIELD id="fieldCostPerUnitStdMachine" attribute="class">className</FIELD> - <FIELD id="fieldRealCostMachine" attribute="class">className</FIELD> - <FIELD id="fieldStandardCostMachine" attribute="class">className</FIELD--> - - <!--FIELD id="buttonTreeMachinezxy" attribute="class">buttonClass</FIELD> -<FIELD id="buttonTreeMachinezxy" attribute="id" replace="zxy">id</FIELD> -<FIELD id="returnTextMachinezxy" attribute="id" replace="zxy">id</FIELD--> + + <!--FIELD id="fieldLevelNameMachine" attribute="class">className</FIELD> + <FIELD id="fieldConsumedPerUnitMachine" attribute="class">className</FIELD> + <FIELD id="fieldCostPerUnitMachine" attribute="class">className</FIELD> + <FIELD id="fieldConsumedPerUnitStdMachine" attribute="class">className</FIELD> + <FIELD id="fieldCostPerUnitStdMachine" attribute="class">className</FIELD> + <FIELD id="fieldRealCostMachine" attribute="class">className</FIELD> + <FIELD id="fieldStandardCostMachine" attribute="class">className</FIELD + <FIELD id="buttonTreeMachinezxy" attribute="class">buttonClass</FIELD> + <FIELD id="buttonTreeMachinezxy" attribute="id" replace="zxy">id</FIELD> + <FIELD id="returnTextMachinezxy" attribute="id" replace="zxy">id</FIELD--> <!--FUNCTION id="fieldRealCostMachine" name="MULTIPLY" arg1="fieldConsumedPerUnitMachine" arg2="fieldCostPerUnitMachine" format="euroInform"/> <FUNCTION id="fieldStandardCostMachine" name="MULTIPLY" arg1="fieldConsumedPerUnitStdMachine" arg2="fieldCostPerUnitStdMachine" format="euroInform"/> @@ -106,8 +103,8 @@ <FIELD id="fieldLevelNameIndirect" attribute="width" replace="jj">levelName</FIELD> <FIELD id="fieldNameIndirect">name</FIELD> <FIELD id="fieldIdIndirect" attribute="value">id</FIELD> - <FIELD id="fieldCostPerUnitIndirect" format="euroInform">costPerUnit</FIELD> - <FIELD id="fieldCostPerUnitStdIndirect" format="euroInform">costPerUnitStd</FIELD> + <FIELD id="fieldRealCostIndirect" format="euroInform">costPerUnit</FIELD> + <FIELD id="fieldStandardCostIndirect" format="euroInform">costPerUnitStd</FIELD> <FIELD id="fieldLevelId">levelid</FIELD> <FUNCTION id="fieldLevelIndirect" name="MODULE" arg1="fieldLevelId" arg2="param2" format="integerEdition" attribute="class" replace="1"/> @@ -134,6 +131,7 @@ <FUNCTION id="fieldRealCostIndirectTotal" name="MULTIPLY" arg1="fieldRealCostIndirectAux1" arg2="fieldRealCostIndirectAux2"/> <FUNCTION id="fieldStandardCostIndirectTotal" name="MULTIPLY" arg1="fieldRealCostIndirectAux3" arg2="fieldRealCostIndirectAux4"/--> + <SECTION id="sectionIndirect"/> </structure> @@ -142,8 +140,8 @@ <FIELD id="fieldLevelNameEmployee" attribute="width" replace="jj">levelName</FIELD> <FIELD id="fieldNameEmployee">name</FIELD> <FIELD id="fieldIdEmployee" attribute="value">id</FIELD> - <FIELD id="fieldCostPerUnitEmployee" format="euroInform">costPerUnit</FIELD> - <FIELD id="fieldCostPerUnitStdEmployee" format="euroInform">costPerUnitStd</FIELD> + <FIELD id="fieldRealCostEmployee" format="euroInform">costPerUnit</FIELD> + <FIELD id="fieldStandardCostEmployee" format="euroInform">costPerUnitStd</FIELD> <FIELD id="fieldLevelId">levelid</FIELD> <!--FUNCTION id="funcLevelEmployee" name="MODULE" arg1="fieldLevelId" arg2="param2" format="integerEdition" attribute="class" replace="1"/--> @@ -177,8 +175,8 @@ <FIELD id="fieldLevelNameCostCenter" attribute="width" replace="jj">levelName</FIELD> <FIELD id="fieldNameCostCenter">name</FIELD> <FIELD id="fieldIdCostCenter" attribute="value">id</FIELD> - <FIELD id="fieldCostPerUnitCostCenter" format="euroInform">costPerUnit</FIELD> - <FIELD id="fieldCostPerUnitStdCostCenter" format="euroInform">costPerUnitStd</FIELD> + <FIELD id="fieldRealCostCostCenter" format="euroInform">costPerUnit</FIELD> + <FIELD id="fieldStandardCostCostCenter" format="euroInform">costPerUnitStd</FIELD> <FIELD id="fieldLevelId">levelid</FIELD> <!--FUNCTION id="funcLevelCostCenter" name="MODULE" arg1="fieldLevelId" arg2="param2" format="integerEdition" attribute="class" replace="1"/--> diff -r 4e30e8a98386 -r 95561cbd34d4 src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java Mon May 07 15:12:33 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProjectBuildingSiteJR.java Thu May 03 12:10:56 2012 +0200 @@ -11,7 +11,7 @@ * 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-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse; import org.openbravo.base.filter.IsIDFilter; +import org.openbravo.base.filter.ValueListFilter; import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.erpCommon.businessUtility.WindowTabs; @@ -38,6 +39,7 @@ import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.ToolBar; import org.openbravo.erpCommon.utility.Utility; +import org.openbravo.erpCommon.utility.UtilityData; import org.openbravo.xmlEngine.XmlDocument; public class ReportProjectBuildingSiteJR extends HttpSecureAppServlet { @@ -47,6 +49,18 @@ ServletException { VariablesSecureApp vars = new VariablesSecureApp(request); + String referenceId = UtilityData.getReferenceId(this, "ProjectStatus"); + String[] referenceValues = Utility.getReferenceValues(this, vars.getLanguage(), referenceId); + ValueListFilter valueFilterstatus = new ValueListFilter(referenceValues); + + referenceId = UtilityData.getReferenceId(this, "Projectkind"); + referenceValues = Utility.getReferenceValues(this, vars.getLanguage(), referenceId); + ValueListFilter valueFilterkind = new ValueListFilter(referenceValues); + + referenceId = UtilityData.getReferenceId(this, "Projectphase"); + referenceValues = Utility.getReferenceValues(this, vars.getLanguage(), referenceId); + ValueListFilter valueFilterphase = new ValueListFilter(referenceValues); + // Get user Client's base currency String strUserCurrencyId = Utility.stringBaseCurrencyId(this, vars.getClient()); if (vars.commandIn("DEFAULT")) { @@ -61,11 +75,11 @@ String strmCategoryId = vars.getInGlobalVariable("inpmProductCategoryId", "ReportProjectBuildingSiteJR|mCategoryId", "", IsIDFilter.instance); String strProjectkind = vars.getInGlobalVariable("inpProjectkind", - "ReportProjectBuildingSiteJR|Projectkind", "", IsIDFilter.instance); + "ReportProjectBuildingSiteJR|Projectkind", "", valueFilterkind); String strProjectstatus = vars.getInGlobalVariable("inpProjectstatus", - "ReportProjectBuildingSiteJR|Projectstatus", "", IsIDFilter.instance); + "ReportProjectBuildingSiteJR|Projectstatus", "", valueFilterstatus); String strProjectphase = vars.getInGlobalVariable("inpProjectphase", - "ReportProjectBuildingSiteJR|Projectphase", "", IsIDFilter.instance); + "ReportProjectBuildingSiteJR|Projectphase", "", valueFilterphase); String strProduct = vars.getInGlobalVariable("inpmProductId_IN", "ReportProjectBuildingSiteJR|mProductId_IN", "", IsIDFilter.instance); String strProjectpublic = vars.getGlobalVariable("inpProjectpublic", @@ -91,11 +105,11 @@ String strmCategoryId = vars.getRequestInGlobalVariable("inpmProductCategoryId", "ReportProjectBuildingSiteJR|mCategoryId", IsIDFilter.instance); String strProjectkind = vars.getRequestInGlobalVariable("inpProjectkind", - "ReportProjectBuildingSiteJR|Projectkind", null); + "ReportProjectBuildingSiteJR|Projectkind", valueFilterkind); String strProjectstatus = vars.getRequestInGlobalVariable("inpProjectstatus", - "ReportProjectBuildingSiteJR|Projectstatus", null); + "ReportProjectBuildingSiteJR|Projectstatus", valueFilterstatus); String strProjectphase = vars.getRequestInGlobalVariable("inpProjectphase", - "ReportProjectBuildingSiteJR|Projectphase", null); + "ReportProjectBuildingSiteJR|Projectphase", valueFilterphase); String strProduct = vars.getRequestInGlobalVariable("inpmProductId_IN", "ReportProjectBuildingSiteJR|mProductId_IN", IsIDFilter.instance); String strProjectpublic = vars.getRequestGlobalVariable("inpProjectpublic", diff -r 4e30e8a98386 -r 95561cbd34d4 src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java --- a/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java Mon May 07 15:12:33 2012 +0200 +++ b/src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java Thu May 03 12:10:56 2012 +0200 @@ -11,7 +11,7 @@ * 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 portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -85,6 +85,10 @@ String action = vars.getStringParameter("action"); log4j.debug("command DATA - action: " + action); + if (vars.getStringParameter("clear").equals("true")) { + vars.removeSessionValue("BusinessPartnerMultiple.key"); + vars.removeSessionValue("BusinessPartnerMultiple.name"); + } String strKey = vars.getGlobalVariable("inpKey", "BusinessPartnerMultiple.key", ""); String strName = vars.getGlobalVariable("inpName", "BusinessPartnerMultiple.name", ""); String strContact = vars.getStringParameter("inpContact"); ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
