Author: jleroux
Date: Sat Oct 18 02:08:30 2008
New Revision: 705863
URL:
http://svn.apache.org/viewvc?rev=705863&view=revLog:
Applied fix from trunk for revision: 705862
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 Sat Oct 18 02:08:30 2008
@@ -1 +1 @@
-/ofbiz/trunk:674173,676162,676227,676246,679704
+/ofbiz/trunk:674173,676162,676227,676246,679704,705862
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=705863&r1=705862&r2=705863&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 Sat Oct 18 02:08:30 2008
@@ -21,9 +21,9 @@
<forms xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="
http://www.ofbiz.org/dtds/widget-form.xsd">
<form name="ListTechDataCalendars" type="list" title="" list-name="techDataCalendars">
- <field name="calendarId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
+ <field name="calendarId" title="${uiLabelMap.ManufacturingCalendarId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarId}"><display/></field>
+ <field name="calendarWeekId" title="${uiLabelMap.ManufacturingCalendarWeekId}"><display/></field>
<field name="updateLink" title="" widget-style="buttontext">
<hyperlink target="EditCalendar?calendarId=${calendarId}" description="${uiLabelMap.CommonUpdate}" />
</field>