Return-Path: 
 <commits-return-27584-apmail-ofbiz-commits-archive=ofbiz.apache.org@ofbiz.apache.org>
X-Original-To: apmail-ofbiz-commits-archive@www.apache.org
Delivered-To: apmail-ofbiz-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0CFFE10B77
	for <apmail-ofbiz-commits-archive@www.apache.org>;
 Tue, 11 Mar 2014 21:44:22 +0000 (UTC)
Received: (qmail 6018 invoked by uid 500); 11 Mar 2014 21:44:21 -0000
Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org
Received: (qmail 5954 invoked by uid 500); 11 Mar 2014 21:44:20 -0000
Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ofbiz.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ofbiz.apache.org>
List-Post: <mailto:commits@ofbiz.apache.org>
List-Id: <commits.ofbiz.apache.org>
Reply-To: dev@ofbiz.apache.org
Delivered-To: mailing list commits@ofbiz.apache.org
Received: (qmail 5947 invoked by uid 99); 11 Mar 2014 21:44:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 21:44:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2014 21:44:19 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2D43F238883D;
	Tue, 11 Mar 2014 21:43:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r1576512 - in /ofbiz/branches/release13.07: ./
 applications/manufacturing/config/ManufacturingUiLabels.xml
 applications/manufacturing/widget/manufacturing/CalendarForms.xml
Date: Tue, 11 Mar 2014 21:43:59 -0000
To: commits@ofbiz.apache.org
From: jleroux@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140311214359.2D43F238883D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>