You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2015/04/18 14:43:47 UTC
svn commit: r1674492 - in /ofbiz/branches/release14.12: ./
applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/
applications/manufacturing/webapp/manufacturing/reports/
applications/manufacturing/widget/manufacturing/
Author: deepak
Date: Sat Apr 18 12:43:46 2015
New Revision: 1674492
URL: http://svn.apache.org/r1674492
Log:
Applied fix from trunk r#1674491
============================================================
Applied patch from jira issue OFBIZ-6188 - Task Report error for Manufacturing Shipment Plan.
Thanks Christian Carlow for reporting the issue and thanks Amardeep Jhajj for verifying it the patch.
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl
ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr 18 12:43:46 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491
Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy?rev=1674492&r1=1674491&r2=1674492&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy Sat Apr 18 12:43:46 2015
@@ -25,7 +25,7 @@ shipment = from("Shipment").where("shipm
context.shipmentIdPar = shipment.shipmentId;
context.date = new Date();
Double fixedAssetTime = new Double(0);
-
+records = [];
if (shipment) {
shipmentPlans = from("OrderShipment").where("shipmentId", shipmentId).queryList();
shipmentPlans.each { shipmentPlan ->
@@ -51,7 +51,9 @@ if (shipment) {
record.taskEstimatedTime = task.getDouble("estimatedMilliSeconds");
record.taskEstimatedSetup = task.getDouble("estimatedSetupMillis");
records.add(record);
- fixedAssetTime = fixedAssetTime + task.getDouble("estimatedMilliSeconds");
+ if(task.getDouble("estimatedMilliSeconds") != null){
+ fixedAssetTime = fixedAssetTime + task.getDouble("estimatedMilliSeconds");
+ }
}
}
}
Modified: ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl?rev=1674492&r1=1674491&r2=1674492&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/webapp/manufacturing/reports/ShipmentWorkEffortTasks.fo.ftl Sat Apr 18 12:43:46 2015
@@ -65,60 +65,48 @@ under the License.
<fo:table-cell padding="2pt">
<fo:block>${uiLabelMap.ManufacturingOperationCodeAndDescription}</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt">
+ <fo:table-cell padding="2pt" text-align="right">
<fo:block>${uiLabelMap.ManufacturingTaskRunTime}</fo:block>
</fo:table-cell>
- <fo:table-cell padding="2pt">
+ <fo:table-cell padding="2pt" text-align="right">
<fo:block>${uiLabelMap.ManufacturingTaskSetupTime}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
- <fo:table-body/>
- </fo:table>
- <#list records as record>
- <fo:table font-size="8pt">
- <fo:table-column column-width="45pt"/>
- <fo:table-column column-width="45pt"/>
- <fo:table-column column-width="60pt"/>
- <fo:table-column column-width="90pt"/>
- <fo:table-column column-width="90pt"/>
- <fo:table-column column-width="60pt"/>
- <fo:table-column column-width="60pt"/>
- <fo:table-header/>
- <fo:table-body>
+ <fo:table-body>
+ <#list records as record>
<fo:table-row>
<fo:table-cell padding="2pt">
- <fo:block>${record.get("workEffortId")}</fo:block>
+ <fo:block>${record.get("workEffortId")?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
- <fo:block><#if estimatedReadyDatePar?has_content>${record.get("fixedAssetId")}</#if></fo:block>
+ <fo:block><#if estimatedReadyDatePar?has_content>${record.get("fixedAssetId")?if_exists}</#if></fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
- <fo:block>${record.get("productId")}</fo:block>
+ <fo:block>${record.get("productId")?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
- <fo:block>${record.get("productName")}</fo:block>
+ <fo:block>${record.get("productName")?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
- <fo:block>${record.get("taskName")} ${record.get("taskDescription")}</fo:block>
+ <fo:block>${record.get("taskName")} ${record.get("taskDescription")?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" text-align="right">
- <fo:block>${record.get("taskEstimatedTime")}</fo:block>
+ <fo:block>${record.get("taskEstimatedTime")?if_exists}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" text-align="right">
- <fo:block>${record.get("taskEstimatedSetup")}</fo:block>
+ <fo:block>${record.get("taskEstimatedSetup")?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
- </fo:table-body>
- </fo:table>
- </#list>
- <fo:table font-size="8pt">
+ </#list>
+ </fo:table-body>
+ </fo:table>
+ <fo:table font-size="8pt">
<fo:table-column column-width="450pt"/>
- <fo:table-header/>
<fo:table-body>
<fo:table-row>
<fo:table-cell padding="2pt" text-align="right">
- <fo:block>${fixedAssetTime}</fo:block>
+ <fo:block>${fixedAssetTime?if_exists}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
Modified: ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=1674492&r1=1674491&r2=1674492&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original)
+++ ofbiz/branches/release14.12/applications/manufacturing/widget/manufacturing/ReportScreens.xml Sat Apr 18 12:43:46 2015
@@ -315,6 +315,7 @@ under the License.
<set field="shipmentId" from-field="parameters.shipmentId"/>
<property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy"/>