Author: jleroux
Date: Fri Sep 14 05:01:20 2007
New Revision: 575647
URL: http://svn.apache.org/viewvc?rev=575647&view=rev
Log:
Applied fix from trunk for revision: 575601
Modified:
ofbiz/branches/release4.0/applications/manufacturing/data/ManufacturingData.xml
ofbiz/branches/release4.0/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
Modified:
ofbiz/branches/release4.0/applications/manufacturing/data/ManufacturingData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/manufacturing/data/ManufacturingData.xml?rev=575647&r1=575646&r2=575647&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/manufacturing/data/ManufacturingData.xml
(original)
+++
ofbiz/branches/release4.0/applications/manufacturing/data/ManufacturingData.xml
Fri Sep 14 05:01:20 2007
@@ -27,7 +27,7 @@
<InventoryEventPlannedType inventoryEventPlanTypeId="PUR_ORDER_RECP"
description="Purchase Order receipt" inOut="+"/>
<InventoryEventPlannedType inventoryEventPlanTypeId="PROD_REQ_RECP"
description="Product Requirement Receipt" inOut="+"/>
<InventoryEventPlannedType inventoryEventPlanTypeId="PROP_PUR_O_RECP"
description="Proposed Purchase Order receipt" inOut="+"/>
- <InventoryEventPlannedType inventoryEventPlanTypeId="SALE_ORDER_SHIP"
description="Sales order shipment" inOut="-"/>
+ <InventoryEventPlannedType inventoryEventPlanTypeId="SALES_ORDER_SHIP"
description="Sales order shipment" inOut="-"/>
<InventoryEventPlannedType inventoryEventPlanTypeId="ERROR"
description="Error"/>
<TechDataCalendarWeek calendarWeekId="SUPPLIER" description="8hours/days,
currently the Re-Order Process convert day to mms with 8h/days"
mondayStartTime="08:30:00" mondayCapacity="2.88E7" tuesdayStartTime="08:30:00"
tuesdayCapacity="2.88E7" wednesdayStartTime="08:30:00"
wednesdayCapacity="2.88E7" thursdayStartTime="08:30:00"
thursdayCapacity="2.88E7" fridayStartTime="08:30:00" fridayCapacity="2.88E7"/>
<TechDataCalendar calendarId="SUPPLIER" description="Calendar used for
Re-Order date calculation for bought product" calendarWeekId="SUPPLIER"/>
Modified:
ofbiz/branches/release4.0/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java?rev=575647&r1=575646&r2=575647&view=diff
==============================================================================
---
ofbiz/branches/release4.0/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
(original)
+++
ofbiz/branches/release4.0/applications/manufacturing/src/org/ofbiz/manufacturing/mrp/MrpServices.java
Fri Sep 14 05:01:20 2007
@@ -199,11 +199,11 @@
}
}
}
- parameters = UtilMisc.toMap("productId", productId, "eventDate",
requiredByDate, "inventoryEventPlanTypeId", "SALE_ORDER_SHIP");
+ parameters = UtilMisc.toMap("productId", productId, "eventDate",
requiredByDate, "inventoryEventPlanTypeId", "SALES_ORDER_SHIP");
try {
InventoryEventPlannedServices.createOrUpdateInventoryEventPlanned(parameters,
eventQuantityTmp, null, genericResult.getString("orderId") + "-" +
genericResult.getString("orderItemSeqId"), false, delegator);
} catch (GenericEntityException e) {
- return ServiceUtil.returnError("Problem initializing the
InventoryEventPlanned entity (SALE_ORDER_SHIP)");
+ return ServiceUtil.returnError("Problem initializing the
InventoryEventPlanned entity (SALES_ORDER_SHIP)");
}
}
// ----------------------------------------
