diff --git a/src-db/database/sourcedata/AD_MENU.xml b/src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml +++ b/src-db/database/sourcedata/AD_MENU.xml @@ -11,6 +11,7 @@ + diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml @@ -1,5 +1,25 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src-db/database/sourcedata/AD_MODULE.xml b/src-db/database/sourcedata/AD_MODULE.xml --- a/src-db/database/sourcedata/AD_MODULE.xml +++ b/src-db/database/sourcedata/AD_MODULE.xml @@ -6,7 +6,7 @@ - + + diff --git a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml @@ -1,5 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -22,6 +66,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -55,6 +121,17 @@ + + + + + + + + + + + @@ -121,6 +198,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -132,4 +231,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.html b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.html --- a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.html +++ b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.html @@ -2,7 +2,7 @@ diff --git a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.java b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.java --- a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.java +++ b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.java @@ -1,46 +1,72 @@ /* - ************************************************************************* - * Copyright (C) 2013 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************ - */ +************************************************************************* +* Copyright (C) 2013 - 2015 Openbravo S.L.U. +* Licensed under the Openbravo Commercial License version 1.0 +* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html +* or in the legal folder of this module distribution. +************************************************************************ +*/ package org.openbravo.warehouse.reportvaluedstockenhanced; +import java.io.FileOutputStream; import java.io.IOException; import java.io.PrintWriter; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Vector; import javax.servlet.ServletException; +import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JasperExportManager; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.JasperReport; + import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.costing.CostingStatus; -import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBQuery; +import org.openbravo.data.FieldProvider; import org.openbravo.erpCommon.businessUtility.WindowTabs; import org.openbravo.erpCommon.utility.ComboTableData; import org.openbravo.erpCommon.utility.DateTimeData; +import org.openbravo.erpCommon.utility.JRFieldProviderDataSource; import org.openbravo.erpCommon.utility.LeftTabsBar; import org.openbravo.erpCommon.utility.NavigationBar; import org.openbravo.erpCommon.utility.OBDateUtils; import org.openbravo.erpCommon.utility.OBError; import org.openbravo.erpCommon.utility.OBMessageUtils; +import org.openbravo.erpCommon.utility.PrintJRData; import org.openbravo.erpCommon.utility.ToolBar; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.common.enterprise.Locator; import org.openbravo.model.common.enterprise.Organization; -import org.openbravo.model.common.enterprise.Warehouse; import org.openbravo.model.common.plm.Product; import org.openbravo.model.materialmgmt.cost.CostingAlgorithm; import org.openbravo.model.materialmgmt.cost.CostingRule; import org.openbravo.model.materialmgmt.transaction.MaterialTransaction; +import org.openbravo.utils.FileUtility; +import org.openbravo.utils.Replace; import org.openbravo.xmlEngine.XmlDocument; +import com.lowagie.text.Document; +import com.lowagie.text.DocumentException; +import com.lowagie.text.pdf.PdfCopy; +import com.lowagie.text.pdf.PdfImportedPage; +import com.lowagie.text.pdf.PdfReader; + public class ReportValuedStockEnhanced extends HttpSecureAppServlet { private static final long serialVersionUID = 1L; @@ -50,41 +76,76 @@ // Get user Client's base currency String strUserCurrencyId = Utility.stringBaseCurrencyId(this, vars.getClient()); + String strOrganization = null; if (vars.commandIn("DEFAULT", "RELATION")) { String strDate = vars.getGlobalVariable("inpDate", "ReportValuedStockEnhanced|Date", DateTimeData.today(this)); + + strOrganization = vars.getGlobalVariable("inpOrg", "ReportValuedStockEnhanced|Organization", + ""); + String strWarehouse = vars.getGlobalVariable("inpmWarehouseId", "ReportValuedStockEnhanced|Warehouse", ""); String strCategoryProduct = vars.getGlobalVariable("inpCategoryProduct", "ReportValuedStockEnhanced|CategoryProduct", ""); String strCurrencyId = vars.getGlobalVariable("inpCurrencyId", "ReportValuedStockEnhanced|currency", strUserCurrencyId); - printPageDataSheet(request, response, vars, strDate, strWarehouse, strCategoryProduct, - strCurrencyId); + String strWarehouseConsolidation = vars.getGlobalVariable("inpWarehouseConsolidation", + "ReportValuedStockEnhanced|warehouseConsolidation", ""); + printPageDataSheet(request, response, vars, strDate, strOrganization, strWarehouse, + strCategoryProduct, strCurrencyId, strWarehouseConsolidation); } else if (vars.commandIn("FIND")) { String strDate = vars.getGlobalVariable("inpDate", "ReportValuedStockEnhanced|Date", DateTimeData.today(this)); + + strOrganization = vars.getGlobalVariable("inpOrg", "ReportValuedStockEnhanced|Organization"); + String strWarehouse = vars.getRequestGlobalVariable("inpmWarehouseId", "ReportValuedStockEnhanced|Warehouse"); String strCategoryProduct = vars.getRequestGlobalVariable("inpCategoryProduct", "ReportValuedStockEnhanced|CategoryProduct"); String strCurrencyId = vars.getGlobalVariable("inpCurrencyId", "ReportValuedStockEnhanced|currency", strUserCurrencyId); - printPageDataSheet(request, response, vars, strDate, strWarehouse, strCategoryProduct, - strCurrencyId); + String strWarehouseConsolidation = vars.getRequestGlobalVariable("inpWarehouseConsolidation", + "ReportValuedStockEnhanced|warehouseConsolidation"); + printPageDataSheet(request, response, vars, strDate, strOrganization, strWarehouse, + strCategoryProduct, strCurrencyId, strWarehouseConsolidation); + } else if (vars.commandIn("PDF", "XLS")) { + String strDate = vars.getGlobalVariable("inpDate", "ReportValuedStockEnhanced|Date", + DateTimeData.today(this)); + strOrganization = vars.getGlobalVariable("inpOrg", "ReportValuedStockEnhanced|Organization"); + String strWarehouse = vars.getRequestGlobalVariable("inpmWarehouseId", + "ReportValuedStockEnhanced|Warehouse"); + String strCategoryProduct = vars.getRequestGlobalVariable("inpCategoryProduct", + "ReportValuedStockEnhanced|CategoryProduct"); + String strCurrencyId = vars.getGlobalVariable("inpCurrencyId", + "ReportValuedStockEnhanced|currency", strUserCurrencyId); + String strWarehouseConsolidation = vars.getRequestGlobalVariable("inpWarehouseConsolidation", + "ReportValuedStockEnhanced|warehouseConsolidation"); + if (vars.commandIn("PDF")) + printPageDataPDF(request, response, vars, strDate, strOrganization, strWarehouse, + strCategoryProduct, strCurrencyId, strWarehouseConsolidation); + else + printPageDataXLS(request, response, vars, strDate, strOrganization, strWarehouse, + strCategoryProduct, strCurrencyId, strWarehouseConsolidation); } else pageError(response); } + // ++++ private void printPageDataSheet(HttpServletRequest request, HttpServletResponse response, - VariablesSecureApp vars, String strDate, String strWarehouse, String strCategoryProduct, - String strCurrencyId) throws IOException, ServletException { + VariablesSecureApp vars, String strDate, String strOrganization, String strWarehouse, + String strCategoryProduct, String strCurrencyId, String strWarehouseConsolidation) + throws IOException, ServletException { if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet"); response.setContentType("text/html; charset=UTF-8"); PrintWriter out = response.getWriter(); - String discard[] = { "discard" }; + String discard[] = { "discard", "discard1" }; XmlDocument xmlDocument; + boolean isWarehouseConsolidation = false; + if (strWarehouseConsolidation.equals("on")) + isWarehouseConsolidation = true; // Checks if there is a conversion rate for each of the transactions of // the report @@ -97,15 +158,10 @@ Utility.messageBD(this, "NotUsingNewCost", vars.getLanguage()), ""); return; } - Warehouse wh = null; + Organization legalEntity = null; try { - if (strWarehouse != null && !strWarehouse.isEmpty()) { - wh = OBDal.getInstance().get(Warehouse.class, strWarehouse); - legalEntity = OBContext.getOBContext() - .getOrganizationStructureProvider(wh.getClient().getId()) - .getLegalEntity(wh.getOrganization()); - } + legalEntity = OBDal.getInstance().get(Organization.class, strOrganization); } catch (Exception e) { throw new ServletException(e); } @@ -118,32 +174,29 @@ Utility.messageBD(this, "WarehouseNotInLE", vars.getLanguage()), ""); } ca = getLEsCostingAlgortithm(legalEntity); - String compare = DateTimeData.compare(this, strDate, - ReportValuedStockEnhancedData.getCostingMigrationDate(this, wh.getClient().getId())); - String avCostType; - String stdCostType; - if (compare.equals("-1")) { - avCostType = "AV"; - stdCostType = "ST"; + if (ca != null) { + if (!isWarehouseConsolidation) + data = ReportValuedStockEnhancedData.select(this, vars.getLanguage(), strCurrencyId, + DateTimeData.nDaysAfter(this, strDate, "1"), (legalEntity == null) ? null + : legalEntity.getId(), strOrganization, strWarehouse, strCategoryProduct); + else + data = ReportValuedStockEnhancedData.selectClusteredByWarehouse(this, + vars.getLanguage(), strCurrencyId, DateTimeData.nDaysAfter(this, strDate, "1"), + (legalEntity == null) ? null : legalEntity.getId(), strOrganization, strWarehouse, + strCategoryProduct); + } else { - avCostType = "AVA"; - stdCostType = "STA"; - } - if (ca.getJavaClassName().equalsIgnoreCase("org.openbravo.costing.AverageAlgorithm") - || ca.getJavaClassName().equalsIgnoreCase( - "org.openbravo.costing.algorithm.averageperinvoice.AveragePerInvoice")) { - data = ReportValuedStockEnhancedData.select(this, vars.getLanguage(), strCurrencyId, - DateTimeData.nDaysAfter(this, strDate, "1"), (legalEntity == null) ? null - : legalEntity.getId(), strWarehouse, avCostType, strCategoryProduct); - } else if (ca.getJavaClassName() - .equalsIgnoreCase("org.openbravo.costing.StandardAlgorithm")) { - data = ReportValuedStockEnhancedData.select(this, vars.getLanguage(), strCurrencyId, - DateTimeData.nDaysAfter(this, strDate, "1"), (legalEntity == null) ? null - : legalEntity.getId(), strWarehouse, stdCostType, strCategoryProduct); - } else { - data = ReportValuedStockEnhancedData.selectWithoutCost(this, vars.getLanguage(), - strCurrencyId, (legalEntity == null) ? null : legalEntity.getId(), - DateTimeData.nDaysAfter(this, strDate, "1"), strWarehouse, strCategoryProduct); + if (!isWarehouseConsolidation) + data = ReportValuedStockEnhancedData.selectWithoutCost(this, vars.getLanguage(), + strCurrencyId, (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); + else + data = ReportValuedStockEnhancedData.selectClusteredByWarehouseWithoutCost(this, + vars.getLanguage(), strCurrencyId, + (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); } boolean hasTrxWithNoCost = hasTrxWithNoCost(strDate, strWarehouse, strCategoryProduct); if (hasTrxWithNoCost) { @@ -168,34 +221,17 @@ if (data == null || data.length == 0) { data = ReportValuedStockEnhancedData.set(); discard[0] = "sectionCategoryProduct"; + discard[1] = "sectionWarehouse"; } + xmlDocument = xmlEngine.readXmlTemplate( + "org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced", discard) + .createXmlDocument(); - if (vars.commandIn("DEFAULT")) { - discard[0] = "sectionCategoryProduct"; - xmlDocument = xmlEngine.readXmlTemplate( - "org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced", discard) - .createXmlDocument(); - data = ReportValuedStockEnhancedData.set(); - } else { - - if (ca.getJavaClassName().equalsIgnoreCase("org.openbravo.costing.AverageAlgorithm") - || ca.getJavaClassName().equalsIgnoreCase( - "org.openbravo.costing.algorithm.averageperinvoice.AveragePerInvoice") - || ca.getJavaClassName().equalsIgnoreCase("org.openbravo.costing.StandardAlgorithm")) { - xmlDocument = xmlEngine.readXmlTemplate( - "org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced", - discard).createXmlDocument(); - } else { - xmlDocument = xmlEngine.readXmlTemplate( - "org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced2", - discard).createXmlDocument(); - } - - } - - ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "ReportValuedStockEnhanced", false, - "", "", "", false, "ad_reports", strReplaceWith, false, true); - toolbar.prepareSimpleToolBarTemplate(); + ToolBar toolbar = new ToolBar(this, vars.getLanguage(), "ReportValuedStockEnhanced", true, + "", "", "imprimir();return false;", false, "ad_reports", strReplaceWith, false, true); + toolbar + .prepareRelationBarTemplate(false, false, + "submitCommandForm('XLS', false, frmMain, 'ReportValuedStockEnhanced.xls', 'EXCEL');return false;"); xmlDocument.setParameter("toolbar", toolbar.toString()); try { @@ -224,15 +260,35 @@ xmlDocument.setParameter("messageMessage", myMessage.getMessage()); } } - + xmlDocument.setParameter("mWarehouseId", strWarehouse); xmlDocument.setParameter("calendar", vars.getLanguage().substring(0, 2)); xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n"); xmlDocument.setParameter("paramLanguage", "defaultLang=\"" + vars.getLanguage() + "\";"); xmlDocument.setParameter("date", strDate); + xmlDocument.setParameter("adOrgId", strOrganization); + if (isWarehouseConsolidation) + xmlDocument.setParameter("warehouseConsolidation", ""); + else + xmlDocument.setParameter("warehouseConsolidation", "on"); xmlDocument.setParameter("dateFromdisplayFormat", vars.getSessionValue("#AD_SqlDateFormat")); xmlDocument.setParameter("dateFromsaveFormat", vars.getSessionValue("#AD_SqlDateFormat")); - xmlDocument.setParameter("mWarehouseId", strWarehouse); + xmlDocument.setParameter("categoryProduct", strCategoryProduct); + + try { + ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "", + "D4DF252DEC3B44858454EE5292A8B836", Utility.getContext(this, vars, + "#AccessibleOrgTree", "ReportValuedStockEnhanced"), Utility.getContext(this, vars, + "#User_Client", "ReportValuedStockEnhanced"), 0); + Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportValuedStockEnhanced", + strOrganization); + xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false)); + comboTableData = null; + + } catch (Exception ex) { + throw new ServletException(ex); + } + try { ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "M_Warehouse_ID", "M_Warehouse of Client", "", Utility.getContext(this, vars, "#AccessibleOrgTree", ""), @@ -243,6 +299,13 @@ } catch (Exception ex) { throw new ServletException(ex); } + xmlDocument.setParameter( + "warehouses", + Utility.arrayDobleEntrada("arrWh", + ReportValuedStockEnhancedData.selectWhsDouble(this, vars.getClient()))); + xmlDocument.setParameter("warehouseID", strWarehouse); + xmlDocument.setParameter("whwh", strWarehouse); + try { ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "M_Product_Category_ID", "", "", Utility.getContext(this, vars, "#AccessibleOrgTree", @@ -269,26 +332,31 @@ throw new ServletException(ex); } - if (strWarehouse != null && !strWarehouse.isEmpty()) { - if (ca != null - && (ca.getJavaClassName().equalsIgnoreCase("org.openbravo.costing.AverageAlgorithm") || ca - .getJavaClassName().equalsIgnoreCase( - "org.openbravo.costing.algorithm.averageperinvoice.AveragePerInvoice"))) { - xmlDocument.setParameter("costTypeCol", "AVERAGE COST"); - xmlDocument.setParameter("valuationTypeCol", "AVERAGE VALUATION"); - xmlDocument.setData("structure1", data); - } else if (ca != null - && ca.getJavaClassName().equalsIgnoreCase("org.openbravo.costing.StandardAlgorithm")) { - xmlDocument.setParameter("costTypeCol", "STANDARD COST"); - xmlDocument.setParameter("valuationTypeCol", "STANDARD VALUATION"); + if (data != null && data.length > 0) { + if (ca != null) { + xmlDocument.setParameter("costTypeCol", ca.getName() + " COST"); + xmlDocument.setParameter("valuationTypeCol", ca.getName() + " VALUATION"); xmlDocument.setData("structure1", data); } else { + xmlDocument.setParameter("costTypeCol", ""); + xmlDocument.setParameter("valuationTypeCol", ""); xmlDocument.setData("structure1", data); } + } else { + if (vars.commandIn("FIND")) { + // No data has been found. Show warning message. + xmlDocument.setParameter("messageType", "WARNING"); + xmlDocument.setParameter("messageTitle", + Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage())); + xmlDocument.setParameter("messageMessage", + Utility.messageBD(this, "NoDataFound", vars.getLanguage())); + } } + out.println(xmlDocument.print()); out.close(); } + } private CostingAlgorithm getLEsCostingAlgortithm(Organization legalEntity) { @@ -300,8 +368,12 @@ OBQuery whereQry = OBDal.getInstance().createQuery(CostingRule.class, where.toString()); + if (!whereQry.list().isEmpty()) { + return whereQry.list().get(0).getCostingAlgorithm(); + } else { + return null; + } - return whereQry.list().get(0).getCostingAlgorithm(); } private boolean hasTrxWithNoCost(String strDate, String strWarehouse, String strCategoryProduct) { @@ -311,7 +383,8 @@ where.append(" join trx." + MaterialTransaction.PROPERTY_PRODUCT + " as p"); where.append(" where trx." + MaterialTransaction.PROPERTY_MOVEMENTDATE + " < :maxDate"); where.append(" and trx." + MaterialTransaction.PROPERTY_ISCOSTCALCULATED + " = false"); - where.append(" and loc." + Locator.PROPERTY_WAREHOUSE + ".id = :wh"); + if (!"".equals(strWarehouse) && strWarehouse != null) + where.append(" and loc." + Locator.PROPERTY_WAREHOUSE + ".id = :wh"); if (!"".equals(strCategoryProduct)) { where.append(" and p." + Product.PROPERTY_PRODUCTCATEGORY + ".id = :prodCategory"); } @@ -327,7 +400,10 @@ // DoNothing parse exception not expected. log4j.error("error parsing date: " + strDate, e); } - whereQry.setNamedParameter("wh", strWarehouse); + if (!"".equals(strWarehouse) && strWarehouse != null) { + whereQry.setNamedParameter("wh", strWarehouse); + } + if (!"".equals(strCategoryProduct)) { whereQry.setNamedParameter("prodCategory", strCategoryProduct); } @@ -338,4 +414,356 @@ public String getServletInfo() { return "Servlet ReportValuedStockEnhanced. This Servlet was made by Pablo Sarobe"; } // end of getServletInfo() method + + private void printPageDataXLS(HttpServletRequest request, HttpServletResponse response, + VariablesSecureApp vars, String strDate, String strOrganization, String strWarehouse, + String strCategoryProduct, String strCurrencyId, String strWarehouseConsolidation) + throws IOException, ServletException { + if (log4j.isDebugEnabled()) + log4j.debug("Output: XLS"); + response.setContentType("text/html; charset=UTF-8"); + boolean isWarehouseConsolidation = false; + if (strWarehouseConsolidation.equals("on")) + isWarehouseConsolidation = true; + + ReportValuedStockEnhancedData[] data = null; + + if (CostingStatus.getInstance().isMigrated() == false) { + advise(request, response, "ERROR", + Utility.messageBD(this, "NotUsingNewCost", vars.getLanguage()), ""); + return; + } + + if (strOrganization == null || strOrganization.isEmpty()) { + try { + advisePopUp(request, response, "WARNING", + Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()), + Utility.messageBD(this, "NoDataFound", vars.getLanguage())); + } catch (Exception e) { + throw new ServletException(e); + } + } else { + Organization legalEntity = null; + try { + legalEntity = OBDal.getInstance().get(Organization.class, strOrganization); + } catch (Exception e) { + throw new ServletException(e); + } + + CostingAlgorithm ca = null; + if (legalEntity == null) { + advise(request, response, "ERROR", + Utility.messageBD(this, "WarehouseNotInLE", vars.getLanguage()), ""); + } + String paramReport = ""; + ca = getLEsCostingAlgortithm(legalEntity); + if (ca != null) { + paramReport = ca.getName(); + + if (!isWarehouseConsolidation) { + data = ReportValuedStockEnhancedData.select(this, vars.getLanguage(), strCurrencyId, + DateTimeData.nDaysAfter(this, strDate, "1"), (legalEntity == null) ? null + : legalEntity.getId(), strOrganization, strWarehouse, strCategoryProduct); + } else { + data = ReportValuedStockEnhancedData.selectClusteredByWarehouse(this, vars.getLanguage(), + strCurrencyId, DateTimeData.nDaysAfter(this, strDate, "1"), + (legalEntity == null) ? null : legalEntity.getId(), strOrganization, strWarehouse, + strCategoryProduct); + } + + } else { + if (!isWarehouseConsolidation) { + data = ReportValuedStockEnhancedData.selectWithoutCost(this, vars.getLanguage(), + strCurrencyId, (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); + } else { + data = ReportValuedStockEnhancedData.selectClusteredByWarehouseWithoutCost(this, + vars.getLanguage(), strCurrencyId, + (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); + } + } + + if (data == null || data.length == 0) { + advisePopUp(request, response, "WARNING", + Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()), + Utility.messageBD(this, "NoDataFound", vars.getLanguage())); + } else { + + String strReportName = "@basedesign@/org/openbravo/warehouse/reportvaluedstockenhanced/ad_reports/ReportValuedStockEnhancedExcel.jrxml"; + + HashMap parameters = new HashMap(); + + parameters + .put("ALG_COST", (paramReport.length() > 0) ? paramReport + " COST" : paramReport); + parameters.put("SUM_ALG_COSTO", (paramReport.length() > 0) ? paramReport + " VALUATION" + : paramReport); + + renderJR(vars, response, strReportName, "xls", parameters, data, null); + } + } + } + + private void printPageDataPDF(HttpServletRequest request, HttpServletResponse response, + VariablesSecureApp vars, String strDate, String strOrganization, String strWarehouse, + String strCategoryProduct, String strCurrencyId, String strWarehouseConsolidation) + throws IOException, ServletException { + if (log4j.isDebugEnabled()) + log4j.debug("Output: PDF"); + response.setContentType("text/html; charset=UTF-8"); + boolean isWarehouseConsolidation = false; + if (strWarehouseConsolidation.equals("on")) + isWarehouseConsolidation = true; + + ReportValuedStockEnhancedData[] data = null; + + if (CostingStatus.getInstance().isMigrated() == false) { + advise(request, response, "ERROR", + Utility.messageBD(this, "NotUsingNewCost", vars.getLanguage()), ""); + return; + } + + if (strOrganization == null || strOrganization.isEmpty()) { + try { + advisePopUp(request, response, "WARNING", + Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()), + Utility.messageBD(this, "NoDataFound", vars.getLanguage())); + } catch (Exception e) { + throw new ServletException(e); + } + } else { + Organization legalEntity = null; + try { + legalEntity = OBDal.getInstance().get(Organization.class, strOrganization); + } catch (Exception e) { + throw new ServletException(e); + } + CostingAlgorithm ca = null; + if (legalEntity == null) { + advise(request, response, "ERROR", + Utility.messageBD(this, "WarehouseNotInLE", vars.getLanguage()), ""); + } + String paramReport = ""; + + ca = getLEsCostingAlgortithm(legalEntity); + if (ca != null) { + paramReport = ca.getName(); + + if (!isWarehouseConsolidation) { + data = ReportValuedStockEnhancedData.select(this, vars.getLanguage(), strCurrencyId, + DateTimeData.nDaysAfter(this, strDate, "1"), (legalEntity == null) ? null + : legalEntity.getId(), strOrganization, strWarehouse, strCategoryProduct); + } else { + data = ReportValuedStockEnhancedData.selectClusteredByWarehouse(this, vars.getLanguage(), + strCurrencyId, DateTimeData.nDaysAfter(this, strDate, "1"), + (legalEntity == null) ? null : legalEntity.getId(), strOrganization, strWarehouse, + strCategoryProduct); + } + + } else { + if (!isWarehouseConsolidation) { + data = ReportValuedStockEnhancedData.selectWithoutCost(this, vars.getLanguage(), + strCurrencyId, (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); + } else { + data = ReportValuedStockEnhancedData.selectClusteredByWarehouseWithoutCost(this, + vars.getLanguage(), strCurrencyId, + (legalEntity == null) ? null : legalEntity.getId(), + DateTimeData.nDaysAfter(this, strDate, "1"), strOrganization, strWarehouse, + strCategoryProduct); + } + } + + if (data == null || data.length == 0) { + advisePopUp(request, response, "WARNING", + Utility.messageBD(this, "ProcessStatus-W", vars.getLanguage()), + Utility.messageBD(this, "NoDataFound", vars.getLanguage())); + } else { + + Vector v = new Vector(); + boolean esta = false; + BigDecimal total = new BigDecimal(0); + BigDecimal aux; + for (int i = 0; i < data.length; i++) { + + for (int j = 0; j < v.size(); j++) { + if (v.get(j).category.equals(data[i].categoryName)) { + esta = true; + break; + } + } + + if (!esta) { + total = new BigDecimal(0); + for (int j = 0; j < data.length; j++) { + if (data[i] != null && data[j] != null + && data[i].categoryName.equals(data[j].categoryName)) { + try { + aux = new BigDecimal(data[j].totalCost); + } catch (Exception e) { + aux = new BigDecimal(0); + } + total = total.add(aux); + } + } + v.add(new SumaryProductCategory(data[i].categoryName, total.toString())); + } + esta = false; + } + SumaryProductCategory[] datos = new SumaryProductCategory[v.size()]; + + for (int i = 0; i < v.size(); i++) + datos[i] = v.get(i); + + String strReportName = "@basedesign@/org/openbravo/warehouse/reportvaluedstockenhanced/ad_reports/ReportValuedStockEnhancedPDF.jrxml"; + + response.setHeader("Content-disposition", + "inline; filename=ReportValuedStockEnhancedPDF.pdf"); + + HashMap parameters = new HashMap(); + parameters.put("DATE", strDate); + parameters + .put("ALG_COST", (paramReport.length() > 0) ? paramReport + " COST" : paramReport); + + parameters.put("SUM_ALG_COST", (paramReport.length() > 0) ? paramReport + " VALUATION" + : paramReport); + + // agregado + parameters.put("subreport_datasource", datos); + + String strSubReportName = "@basedesign@/org/openbravo/warehouse/reportvaluedstockenhanced/ad_reports/SumaryProductCategory.jrxml"; + response.setHeader("Content-disposition", "inline; filename=SumaryProductCategory.pdf"); + + HashMap parametersSubReport = new HashMap(); + + // renderJR(vars, response, strReportName, "pdf", parameters, data, null); + try { + + JasperPrint jasperPrint = null; + Collection jrPrintReports = new ArrayList(); + + try { + jasperPrint = myRenderJR(vars, strReportName, null, parameters, data); + jrPrintReports.add(jasperPrint); + jasperPrint = myRenderJR(vars, strSubReportName, null, parametersSubReport, datos); + jrPrintReports.add(jasperPrint); + + } catch (Exception e) { + log4j.error(e.getMessage()); + e.getStackTrace(); + } + printReports(response, jrPrintReports, "ReportValuedStock-Enhanced.pdf", vars); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + } + + protected JasperPrint myRenderJR(VariablesSecureApp variables, String strReportName, + String strFileName, HashMap designParameters, FieldProvider[] data) + throws ServletException { + + if (strReportName == null || strReportName.equals("")) + strReportName = PrintJRData.getReportName(this, classInfo.id); + + final String strAttach = globalParameters.strFTPDirectory + "/284-" + classInfo.id; + + final String strLanguage = variables.getLanguage(); + final Locale locLocale = new Locale(strLanguage.substring(0, 2), strLanguage.substring(3, 5)); + + final String strBaseDesign = getBaseDesignPath(strLanguage); + + strReportName = Replace.replace(Replace.replace(strReportName, "@basedesign@", strBaseDesign), + "@attach@", strAttach); + if (strFileName == null) { + strFileName = strReportName.substring(strReportName.lastIndexOf("/") + 1); + } + + // UUID reportId = null; + try { + + final JasperReport jasperReport = Utility.getTranslatedJasperReport(this, strReportName, + strLanguage, strBaseDesign); + if (designParameters == null) + designParameters = new HashMap(); + + designParameters.put("IS_IGNORE_PAGINATION", false); + designParameters.put("BASE_WEB", strReplaceWithFull); + designParameters.put("BASE_DESIGN", strBaseDesign); + designParameters.put("ATTACH", strAttach); + designParameters.put("USER_CLIENT", Utility.getContext(this, variables, "#User_Client", "")); + designParameters.put("USER_ORG", Utility.getContext(this, variables, "#User_Org", "")); + designParameters.put("LANGUAGE", strLanguage); + designParameters.put("LOCALE", locLocale); + designParameters.put("REPORT_TITLE", + PrintJRData.getReportTitle(this, variables.getLanguage(), classInfo.id)); + + final DecimalFormatSymbols dfs = new DecimalFormatSymbols(); + dfs.setDecimalSeparator(variables.getSessionValue("#AD_ReportDecimalSeparator").charAt(0)); + dfs.setGroupingSeparator(variables.getSessionValue("#AD_ReportGroupingSeparator").charAt(0)); + final DecimalFormat numberFormat = new DecimalFormat( + variables.getSessionValue("#AD_ReportNumberFormat"), dfs); + designParameters.put("NUMBERFORMAT", numberFormat); + + return JasperFillManager.fillReport(jasperReport, designParameters, + new JRFieldProviderDataSource(data, variables.getJavaDateFormat())); + + } catch (final JRException e) { + log4j.error("JR: Error: ", e); + throw new ServletException(e.getMessage(), e); + } catch (final Exception e) { + throw new ServletException(e.getMessage(), e); + } + } + + private void printReports(HttpServletResponse response, Collection jrPrintReports, + String filename, VariablesSecureApp vars) throws DocumentException { + ServletOutputStream os = null; + int i = 0; + try { + os = response.getOutputStream(); + FileOutputStream oos = new FileOutputStream(globalParameters.strFTPDirectory + "/" + filename); + Document document = null; + PdfCopy writer = null; + int n; + for (Iterator iterator = jrPrintReports.iterator(); iterator.hasNext();) { + JasperExportManager.exportReportToPdfFile((JasperPrint) iterator.next(), + globalParameters.strFTPDirectory + "/" + i + ".pdf"); + PdfReader reader = new PdfReader(globalParameters.strFTPDirectory + "/" + i + ".pdf"); + n = reader.getNumberOfPages(); + if (i == 0) { + document = new Document(reader.getPageSizeWithRotation(1)); + writer = new PdfCopy(document, oos); + document.open(); + } + PdfImportedPage page; + for (int j = 0; j < n;) { + ++j; + page = writer.getImportedPage(reader, j); + writer.addPage(page); + } + FileUtility fdelete = new FileUtility(globalParameters.strFTPDirectory, i + ".pdf", false, + true); + if (!fdelete.deleteFile()) + log4j.error("Download report could not delete the file :" + i + ".pdf"); + i++; + } + document.close(); + printPagePopUpDownload(os, filename); + + } catch (IOException e) { + e.printStackTrace(); + } catch (ServletException e) { + e.printStackTrace(); + } catch (JRException e) { + e.printStackTrace(); + } + + } + } diff --git a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.xml b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.xml --- a/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.xml +++ b/src/org/openbravo/warehouse/reportvaluedstockenhanced/ReportValuedStockEnhanced.xml @@ -1,7 +1,7 @@