# HG changeset patch # User Sandra Huguet # Date 1335343090 -7200 # Node ID 705c297b4a4e2a4c98fc507c3527542f2ce0d1a3 # Parent 01c9ee1b4fb9a1b566fc487d578e6ff10e387d29 Fixed issue 14610 Add warehouse to Product Movements Report Add a new column with warehouse for each table Product Movements Report diff -r 01c9ee1b4fb9 -r 705c297b4a4e src-db/database/sourcedata/AD_TEXTINTERFACES.xml --- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Apr 25 15:50:07 2012 +0200 +++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Wed Apr 25 10:38:10 2012 +0200 @@ -19421,6 +19421,17 @@ + + + + + + + + + + + @@ -20037,6 +20048,17 @@ + + + + + + + + + + + diff -r 01c9ee1b4fb9 -r 705c297b4a4e src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html Wed Apr 25 15:50:07 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.html Wed Apr 25 10:38:10 2012 +0200 @@ -13,7 +13,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): ______________________________________. ************************************************************************ @@ -452,35 +452,37 @@
- +
- + - - - - - + + + + + - + - +
- - - - - - - - - - + + + + + + + + + + + - + @@ -512,41 +516,43 @@
Incoming/OutgoingIncoming/Outgoing
Customer: xxAguinagaCustomer: xxAguinaga
Document No.DateDescriptionAttribute + Document No.DateDescriptionAttributeStarting Warehouse - + - +
Starting location
X Y Z
+ Final Warehouse - + - + @@ -488,23 +490,25 @@
Final location
X Y Z
 ExitQuantityQuantity
+ xx850000007xxfd200xx2345xx2345xx3xx3xx3xx2xx2xx2xxfd200xx2345xx2345xx3xx3xx3xx3xx2xx2xx2xx2 xxsixx23xx23
- +
- + - - +
- - + - + + - + @@ -555,34 +561,36 @@
Inventory regulationInventory regulation
Customer: xxAguinagaCustomer: xxAguinaga
Date - Movement - Description + Date + Movement + Description + Warehouse - + - +
Location
X Y Z
ExitExit Quantity
xx23-02-2004 + xx23-02-2004 xx850000007xx2345xx2345xx3 xx3 xx3 xx3xxsixxsi xx23
- +
- + - - - - + + + + - + - +
- - + - - - - - - - + + + + + + + + + - + @@ -613,34 +623,36 @@
Internal movementsInternal movements
Customer: xxAguinagaCustomer: xxAguinaga
DateMovementDescription + DateMovementDescriptionStarting Warehouse - + - +
Starting location
X Y Z
+ Final Warehouse - + - + @@ -590,22 +598,24 @@
Final location
X Y Z
 ExitQuantityQuantity
xxfd200 + xxfd200 xx850000007xx2345xx3xx3xx3xx2xx2xx2xx2345xx3xx3xx3xx3xx2xx2xx2xx2 xxsixx23xx23
-
- + - - - - + + + + - + - +
- - + - - - - - - - + + + + + + + + + - + @@ -672,22 +686,23 @@
Production + Production
Customer: xxAguinagaCustomer: xxAguinaga
DateMovementDescription + DateMovementDescriptionStarting Warehouse - + - +
Location
X Y Z
+ Final Warehouse - + - + @@ -648,23 +660,25 @@
Location
X Y Z
 ExitQuantityQuantity
xxfd200 + xxfd200 xx850000007xx2345xx3xx3xx3xx2xx2xx2xx2345xx3xx3xx3xx3xx2xx2xx2xx2 xxsixx23xx23
- +
- + - +
- - + + - + diff -r 01c9ee1b4fb9 -r 705c297b4a4e src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java Wed Apr 25 15:50:07 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.java Wed Apr 25 10:38:10 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): ______________________________________. ************************************************************************ @@ -61,9 +61,10 @@ String strProduction = vars.getGlobalVariable("inpProduction", "ReportProductMovement|production", "-1"); String strInternalConsumption = vars.getGlobalVariable("inpInternalConsumption", - "ReportProductMovement|internalConsumption", "-1"); + "ReportProductMovement|internalConsumption", "-1"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, + strInternalConsumption); } else if (vars.commandIn("DIRECT")) { String strDateFrom = vars.getGlobalVariable("inpDateFrom", "ReportProductMovement|dateFrom", ""); @@ -82,10 +83,11 @@ String strProduction = vars.getGlobalVariable("inpProduction", "ReportProductMovement|production", ""); String strInternalConsumption = vars.getGlobalVariable("inpInternalConsumption", - "ReportProductMovement|internalConsumption", ""); + "ReportProductMovement|internalConsumption", ""); setHistoryCommand(request, "DIRECT"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, + strInternalConsumption); } else if (vars.commandIn("FIND")) { String strDateFrom = vars.getRequestGlobalVariable("inpDateFrom", "ReportProductMovement|dateFrom"); @@ -104,10 +106,11 @@ String strProduction = vars.getRequestGlobalVariable("inpProduction", "ReportProductMovement|production"); String strInternalConsumption = vars.getRequestGlobalVariable("inpInternalConsumption", - "ReportProductMovement|internalConsumption"); + "ReportProductMovement|internalConsumption"); setHistoryCommand(request, "DIRECT"); printPageDataSheet(response, vars, strDateFrom, strDateTo, strcBpartnerId, strmProductId, - strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, strInternalConsumption); + strInout, strInventory, strMovement, strProduction, strmAttributesetinstanceId, + strInternalConsumption); } else pageError(response); } @@ -115,7 +118,8 @@ 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, String strInternalConsumption) throws IOException, ServletException { + String strmAttributesetinstanceId, String strInternalConsumption) throws IOException, + ServletException { if (log4j.isDebugEnabled()) log4j.debug("Output: dataSheet"); response.setContentType("text/html; charset=UTF-8"); @@ -189,19 +193,19 @@ data3 = ReportProductMovementData.set(); } if (strInternalConsumption.equals("-1")) { - data4 = ReportProductMovementData.selectInternalConsumption(this, - Utility.getContext(this, vars, "#User_Client", "ReportProductMovement"), - Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportProductMovement"), - strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), strcBpartnerId, - strmProductId); - if (data4 == null || data4.length == 0) { - discard[4] = "selEliminar5"; - data4 = ReportProductMovementData.set(); - } - } else { + data4 = ReportProductMovementData.selectInternalConsumption(this, + Utility.getContext(this, vars, "#User_Client", "ReportProductMovement"), + Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportProductMovement"), + strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"), strcBpartnerId, + strmProductId); + if (data4 == null || data4.length == 0) { discard[4] = "selEliminar5"; data4 = ReportProductMovementData.set(); } + } else { + discard[4] = "selEliminar5"; + data4 = ReportProductMovementData.set(); + } } else { discard[0] = "selEliminar1"; discard[1] = "selEliminar2"; diff -r 01c9ee1b4fb9 -r 705c297b4a4e src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.xml --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.xml Wed Apr 25 15:50:07 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement.xml Wed Apr 25 10:38:10 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): ______________________________________. ************************************************************************ @@ -74,9 +74,11 @@ xOriginyOriginzOrigin + waOriginxDestinyyDestinyzDestiny + waDestinyout
@@ -94,6 +96,7 @@ xOrigin yOrigin zOrigin + waOrigin out
@@ -110,9 +113,11 @@ xOrigin yOrigin zOrigin + waOrigin xDestiny yDestiny zDestiny + waDestiny out
@@ -130,9 +135,11 @@ xOrigin yOrigin zOrigin + waOrigin xDestiny yDestiny zDestiny + waDestiny out
@@ -150,6 +157,7 @@ xOrigin yOrigin zOrigin + waOrigin out
diff -r 01c9ee1b4fb9 -r 705c297b4a4e src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql --- a/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql Wed Apr 25 15:50:07 2012 +0200 +++ b/src/org/openbravo/erpCommon/ad_reports/ReportProductMovement_data.xsql Wed Apr 25 10:38:10 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-2010 Openbravo SLU + * All portions are Copyright (C) 2001-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -29,9 +29,11 @@ @@ -70,22 +74,24 @@ 0 ORDER BY C_BPARTNER.NAME, M_TRANSACTION.MOVEMENTDATE DESC ]]> @@ -102,18 +108,20 @@ 0 ORDER BY C_BPARTNER.NAME, M_TRANSACTION.MOVEMENTDATE DESC ]]> @@ -169,22 +178,24 @@ 0 ORDER BY C_BPARTNER.NAME, M_TRANSACTION.MOVEMENTDATE DESC ]]>
Internal ConsumptionInternal Consumption
Customer: xxAguinagaCustomer: xxAguinaga
Date - Movement - Description + Movement + Description + Warehouse - + - + @@ -695,19 +710,20 @@
Location
X Y Z
 ExitQuantityQuantity
xx23-02-2004 + xx850000007xx2345xx2345xx3 xx3 xx3 xx3 xxsixx23xx23