Author: jleroux
Date: Sun Oct 19 08:43:38 2008
New Revision: 706036
URL:
http://svn.apache.org/viewvc?rev=706036&view=revLog:
Applied fix from trunk for revision: 706035
Modified:
ofbiz/branches/release4.0/ (props changed)
ofbiz/branches/release4.0/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
Propchange: ofbiz/branches/release4.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 19 08:43:38 2008
@@ -1 +1 @@
-/ofbiz/trunk:674173,676162,676227,676246,679704,705862
+/ofbiz/trunk:674173,676162,676227,676246,679704,705862,706035
Modified: ofbiz/branches/release4.0/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml?rev=706036&r1=706035&r2=706036&view=diff==============================================================================
--- ofbiz/branches/release4.0/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml (original)
+++ ofbiz/branches/release4.0/applications/manufacturing/webapp/manufacturing/routing/CalendarForms.xml Sun Oct 19 08:43:38 2008
@@ -42,14 +42,13 @@
</field>
</form>
<form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays">
- <auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId"><hidden/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}"><display/></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
<field name="updateLink" title="" widget-style="buttontext">
<hyperlink target="EditCalendarExceptionDay?calendarId=${calendarId}&exceptionDateStartTime=${exceptionDateStartTime}"
- description="${uiLabelMap.CommonSelected}" />
+ description="${uiLabelMap.CommonSelect}" />
</field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink target="RemoveCalendarExceptionDay?calendarId=${calendarId}&exceptionDateStartTime=${exceptionDateStartTime}"
@@ -90,7 +89,7 @@
</field>
<field name="updateLink" title="" widget-style="buttontext">
<hyperlink target="EditCalendarExceptionWeek?calendarId=${calendarExceptionWeek.calendarId}&exceptionDateStart=${calendarExceptionWeek.exceptionDateStart}"
- description="${uiLabelMap.CommonSelected}" />
+ description="${uiLabelMap.CommonSelect}" />
</field>
<field name="deleteLink" title="" widget-style="buttontext">
<hyperlink target="RemoveCalendarExceptionWeek?calendarId=${calendarExceptionWeek.calendarId}&exceptionDateStart=${calendarExceptionWeek.exceptionDateStart}"