You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/03/11 22:43:59 UTC
svn commit: r1576512 - in /ofbiz/branches/release13.07: ./
applications/manufacturing/config/ManufacturingUiLabels.xml
applications/manufacturing/widget/manufacturing/CalendarForms.xml
Author: jleroux
Date: Tue Mar 11 21:43:58 2014
New Revision: 1576512
URL: http://svn.apache.org/r1576512
Log:
"Applied fix from trunk for revision: 1576511 "
------------------------------------------------------------------------
r1576511 | jleroux | 2014-03-11 22:41:25 +0100 (mar. 11 mars 2014) | 1 ligne
The used capacity field was not correctly taken into account, also fixes the order. I wonder if we should not put all fields on the same column (narrow screens), but that's another story
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml
ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/CalendarForms.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1576511
Modified: ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml?rev=1576512&r1=1576511&r2=1576512&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/config/ManufacturingUiLabels.xml Tue Mar 11 21:43:58 2014
@@ -5061,6 +5061,11 @@
<value xml:lang="zh">å®å
¨é误ï¼è¦è¿è¡è¿ä¸ªæä½ï¼ä½ å¿
é¡»å
·æ MANUFACTURING_UPDATE æ MANUFACTURING_ADMIN æé</value>
<value xml:lang="zh_TW">å®å
¨é¯èª¤ï¼è¦éè¡éåæä½ï¼ä½ å¿
é å
·æ MANUFACTURING_UPDATE æ MANUFACTURING_ADMIN æ¬é</value>
</property>
+ <property key="ManufacturingUsedCapacity">
+ <value xml:lang="en">Manufacturing Used Capacity</value>
+ <value xml:lang="fr">Capacité de fabrication utilisée</value>
+ </property>
+
<property key="ManufacturingViewPermissionError">
<value xml:lang="de">Sie haben keine Berechtigung um diese Seite anzuzeigen. ("MANUFACTURING_VIEWW oder WMANUFACTURING_ADMINW wird benötigt)</value>
<value xml:lang="en">You do not have permission to view this page. ("MANUFACTURING_VIEW" or "MANUFACTURING_ADMIN" needed)</value>
Modified: ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/CalendarForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/CalendarForms.xml?rev=1576512&r1=1576511&r2=1576512&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/CalendarForms.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/CalendarForms.xml Tue Mar 11 21:43:58 2014
@@ -54,9 +54,10 @@ under the License.
<form name="ListCalendarExceptionDay" type="list" target="UpdateCalendarExceptionDay" title="" list-name="calendarExceptionDays"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="calendarId"><hidden/></field>
- <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}"><display/></field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" ><display/></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}" ><display/></field>
<field name="updateLink" title=" " widget-style="buttontext">
<hyperlink target="EditCalendarExceptionDay" description="${uiLabelMap.CommonSelect}" >
<parameter param-name="calendarId"/>
@@ -75,14 +76,16 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="updateCalendarExceptionDay" map-name="calendarExceptionDay"/>
<field name="calendarId" ><hidden/></field>
- <field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ><display/></field>
+ <field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" position="1"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}" position="2" ></field>
- <field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" position="3" ></field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}" position="4" ><submit button-type="button"/></field>
+ <field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}" position="3" ></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}" position="4" ></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" position="5" ><submit button-type="button"/></field>
<sort-order>
<sort-field name="exceptionDateStartTime"/>
<sort-field name="description"/>
<sort-field name="exceptionCapacity"/>
+ <sort-field name="usedCapacity"/>
</sort-order>
</form>
@@ -93,6 +96,7 @@ under the License.
<field name="description" title="${uiLabelMap.CommonDescription}" ></field>
<field name="exceptionDateStartTime" title="${uiLabelMap.ManufacturingExceptionDateStartTime}" ></field>
<field name="exceptionCapacity" title="${uiLabelMap.ManufacturingCalendarCapacity}"></field>
+ <field name="usedCapacity" title="${uiLabelMap.ManufacturingUsedCapacity}"></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
</form>