Author: adrianc
Date: Sat Jul 24 21:20:49 2010
New Revision: 978939
URL: http://svn.apache.org/viewvc?rev=978939&view=rev
Log:
A patch from matthieu bollot (https://issues.apache.org/jira/browse/OFBIZ-3859)
- Manufacturing: Incorrect data types in entity definition and groovy script.
Modified:
ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
Modified: ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml?rev=978939&r1=978938&r2=978939&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml Sat Jul 24
21:20:49 2010
@@ -99,8 +99,8 @@ under the License.
</description>
<field name="calendarId" type="id-ne"></field>
<field name="exceptionDateStartTime" type="date-time"></field>
- <field name="exceptionCapacity" type="floating-point"></field>
- <field name="usedCapacity" type="floating-point"></field>
+ <field name="exceptionCapacity" type="fixed-point"></field>
+ <field name="usedCapacity" type="fixed-point"></field>
<field name="description" type="description"></field>
<prim-key field="calendarId"/>
<prim-key field="exceptionDateStartTime"/>
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=978939&r1=978938&r2=978939&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
(original)
+++
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
Sat Jul 24 21:20:49 2010
@@ -53,7 +53,7 @@ context.listCalendarExceptionWeekWrapper
context.addCalendarExceptionWeekWrapper = addCalendarExceptionWeekWrapper;
exceptionDateStart = parameters.exceptionDateStart ?:
request.getAttribute("exceptionDateStart");
-exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart,
"Timestamp", null, null);
+exceptionDateStart = ObjectType.simpleTypeConvert(exceptionDateStart,
"java.sql.Date", null, null);
if (exceptionDateStart) {
calendarExceptionWeek =
delegator.findByPrimaryKey("TechDataCalendarExcWeek", [calendarId : calendarId
, exceptionDateStart : exceptionDateStart]);
