svn commit: r979537 - in /ofbiz/branches/release10.04: ./ applications/manufacturing/entitydef/entitymodel.xml applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy

[adrianc]

Author: adrianc
Date: Tue Jul 27 05:19:08 2010
New Revision: 979537

URL: http://svn.apache.org/viewvc?rev=979537&view=rev
Log:
Merged rev 978939 from trunk.

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/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/manufacturing/entitydef/entitymodel.xml
    ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 27 05:19:08 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,979104
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104

Modified: ofbiz/branches/release10.04/applications/manufacturing/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/entitydef/entitymodel.xml?rev=979537&r1=979536&r2=979537&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/manufacturing/entitydef/entitymodel.xml (original)
+++ ofbiz/branches/release10.04/applications/manufacturing/entitydef/entitymodel.xml Tue Jul 27 05:19:08 2010
@@ -101,8 +101,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/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy?rev=979537&r1=979536&r2=979537&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy (original)
+++ ofbiz/branches/release10.04/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.groovy Tue Jul 27 05:19:08 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]);