You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/10/18 17:39:23 UTC
svn commit: r1533520 - in /ofbiz/branches/release11.04: ./
applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
Author: jleroux
Date: Fri Oct 18 15:39:23 2013
New Revision: 1533520
URL: http://svn.apache.org/r1533520
Log:
"Applied fix from trunk for revision: 1517780"
------------------------------------------------------------------------
r1517780 | jleroux | 2013-08-27 12:26:02 +0200 (mar. 27 août 2013) | 6 lignes
A patch from Pierre Smits for "ProudctionRunServices.xml doesn't set dateTimeManufactured in inventoryItem" https://issues.apache.org/jira/browse/OFBIZ-5299
When producing a good in Manufacturing the manufacturing date and time doesn't get set in the inventoryItem
jleroux: I also noticed that 1 instance of datetimeReceived for SERIALIZED_INV_ITEM in productionRunTaskProduce used UtilDateTime.nowDate() instead UtilDateTime.nowTimestamp(), I changed it.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1517780
Modified: ofbiz/branches/release11.04/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1533520&r1=1533519&r2=1533520&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original)
+++ ofbiz/branches/release11.04/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Fri Oct 18 15:39:23 2013
@@ -1692,6 +1692,7 @@ public class ProductionRunServices {
"statusId", "INV_AVAILABLE");
serviceContext.put("facilityId", productionRun.getGenericValue().getString("facilityId"));
serviceContext.put("datetimeReceived", UtilDateTime.nowTimestamp());
+ serviceContext.put("datetimeManufactured", UtilDateTime.nowTimestamp());
serviceContext.put("comments", "Created by production run " + productionRunId);
if (unitCost.compareTo(ZERO) != 0) {
serviceContext.put("unitCost", unitCost);
@@ -1729,6 +1730,7 @@ public class ProductionRunServices {
"inventoryItemTypeId", "NON_SERIAL_INV_ITEM");
serviceContext.put("facilityId", productionRun.getGenericValue().getString("facilityId"));
serviceContext.put("datetimeReceived", UtilDateTime.nowTimestamp());
+ serviceContext.put("datetimeManufactured", UtilDateTime.nowTimestamp());
serviceContext.put("comments", "Created by production run " + productionRunId);
serviceContext.put("lotId", lotId);
if (unitCost.compareTo(ZERO) != 0) {
@@ -1884,7 +1886,8 @@ public class ProductionRunServices {
"inventoryItemTypeId", "SERIALIZED_INV_ITEM",
"statusId", "INV_AVAILABLE");
serviceContext.put("facilityId", facilityId);
- serviceContext.put("datetimeReceived", UtilDateTime.nowDate());
+ serviceContext.put("datetimeReceived", UtilDateTime.nowTimestamp());
+ serviceContext.put("datetimeManufactured", UtilDateTime.nowTimestamp());
serviceContext.put("comments", "Created by production run task " + productionRunTaskId);
if (unitCost != null) {
serviceContext.put("unitCost", unitCost);
@@ -1921,6 +1924,7 @@ public class ProductionRunServices {
"inventoryItemTypeId", "NON_SERIAL_INV_ITEM");
serviceContext.put("facilityId", facilityId);
serviceContext.put("datetimeReceived", UtilDateTime.nowTimestamp());
+ serviceContext.put("datetimeManufactured", UtilDateTime.nowTimestamp());
serviceContext.put("comments", "Created by production run task " + productionRunTaskId);
if (unitCost != null) {
serviceContext.put("unitCost", unitCost);