[OFBiz] SVN: r7913 - in trunk/applications/manufacturing: config entitydef webapp/manufacturing/bom webapp/manufacturing/jobshopmgt webapp/manufacturing/mrp webapp/manufacturing/reports webapp/manufacturing/requirement webapp/manufacturing/routing

jacopo@svn.ofbiz.org jacopo at svn.ofbiz.org
Fri Jun 30 17:17:23 CDT 2006


Author: jacopo
Date: 2006-06-30 17:16:59 -0500 (Fri, 30 Jun 2006)
New Revision: 7913

Modified:
   trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
   trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
   trunk/applications/manufacturing/entitydef/entitymodel.xml
   trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
   trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
   trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
   trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
   trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
   trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
   trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml
   trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
Log:
i18n patch for the manufacturing component from Marco Risaliti (Apache OFBIZ-25).

Modified: trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
===================================================================
--- trunk/applications/manufacturing/config/ManufacturingUiLabels.properties	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/config/ManufacturingUiLabels.properties	2006-06-30 22:16:59 UTC (rev 7913)
@@ -54,6 +54,8 @@
 ManufacturingCreateCalendarWeek=Create Calendar Week
 ManufacturingCreateMachineGroup=Create a Fixed Asset group
 ManufacturingCreateProductionRun=Create a Production Run
+ManufacturingCuttingList=Cutting List
+ManufacturingDeliveryDate=Delivery date
 ManufacturingDependentWorkEfforts=Dependent Production Runs
 ManufacturingEditCalendarExceptionDayFor=Edit Calendar Exception day for
 ManufacturingEditCalendarExceptionWeekFor=Edit Calendar Exception week for
@@ -82,6 +84,7 @@
 ManufacturingFindRoutingTasks=Find Routing Tasks
 ManufacturingFindRouting=Find Routing
 ManufacturingFixedAssetNotExist=FixedAsset does not exist
+ManufacturingFormula=Formula
 ManufacturingImplosion=Implosion
 ManufacturingInstruction=Instruction
 ManufacturingInventoryEventPlanned=Inventory Event Planned
@@ -119,6 +122,7 @@
 ManufacturingNewRoutingTask=New Routing Task
 ManufacturingNewRoutingTaskProduct=Add Deliverable Product
 ManufacturingNoCalendarFound=No calendar found
+ManufacturingNoDataAvailable=No Data Available.
 ManufacturingNoMachineGroupFound=No Fixed Asset group found
 ManufacturingNoProductionRunSelected=No ProductionRun Selected
 ManufacturingProductLevel=Product Level
@@ -140,6 +144,7 @@
 ManufacturingProductionRunQuantityNotCorrect=ProductionRun Quantity field is not formatted correctly
 ManufacturingProductionRunStartDateMissing=ProductionRun StartDate is Missing
 ManufacturingProductionRunStartDateNotCorrect=the Start Date field is incorrect, format must be AAAA-mm-jj HH:mm:ss
+ManufacturingProductId=Product ID
 ManufacturingProductIdTo=Product ID To
 ManufacturingProductNotExist=Product does not exist
 ManufacturingProductRoutingNotExist=Product Routing link doesn't exist
@@ -180,6 +185,7 @@
 ManufacturingTechData=Tech. Data
 ManufacturingTechDataCalendarNotExist=TechDataCalendar does not exist
 ManufacturingTechDataCalendarWeekNotExist=TechDataCalendarWeek does not exist
+ManufacturingTotalQuantity=Total Quantity
 ManufacturingMrpName=Mrp Name
 ManufacturingTwoRoutingTaskWithSameSeqId=Two routing task with same SeqId and same period
 ManufacturingUpdateCalendar=Update Calendar
@@ -229,6 +235,7 @@
 ManufacturingShowBOMAssocs=Show BOM
 ManufacturingCopyBOMAssocs=Copy BOM
 ManufacturingCopyToProductId=To Product Id
+ManufacturingWillBeSetToNow=Will be set to now if empty
 
 PageTitleEditCalendar=Edit Calendar
 PageTitleEditCalendarExceptionDay=Edit Calendar Exception Day

Modified: trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
===================================================================
--- trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties	2006-06-30 22:16:59 UTC (rev 7913)
@@ -54,6 +54,8 @@
 ManufacturingCreateCalendarWeek=Creare Calendario Settimana
 ManufacturingCreateMachineGroup=Creare un gruppo Macchine
 ManufacturingCreateProductionRun=Creare un Ciclo Produzione
+ManufacturingCuttingList=Lista di Montaggio
+ManufacturingDeliveryDate=Data Consegna
 ManufacturingDependentWorkEfforts=Dipendenza Ciclo Produzione
 ManufacturingEditCalendarExceptionDayFor=Aggiorna Calendario giorni speciali per
 ManufacturingEditCalendarExceptionWeekFor=Aggiorna Calendario settimane speciali per
@@ -82,6 +84,7 @@
 ManufacturingFindRoutingTasks=Ricerca Operazioni
 ManufacturingFindRouting=Ricerca Ciclo
 ManufacturingFixedAssetNotExist=Macchina non esiste
+ManufacturingFormula=Formula
 ManufacturingImplosion=Implosione
 ManufacturingInstruction=Istruzione
 ManufacturingInventoryEventPlanned=Inventario Evento Pianificato
@@ -119,6 +122,7 @@
 ManufacturingNewRoutingTask=Nuova Operazione
 ManufacturingNewRoutingTaskProduct=Aggiungi Prodotti Consegnabili
 ManufacturingNoCalendarFound=Nessun calendario trovato
+ManufacturingNoDataAvailable=Nessun Dato Disponibile.
 ManufacturingNoMachineGroupFound=Nessun Gruppo Macchine trovato
 ManufacturingNoProductionRunSelected=Nessun Ciclo Produzione Selezionato
 ManufacturingProductLevel=Livello Prodotto
@@ -140,6 +144,7 @@
 ManufacturingProductionRunQuantityNotCorrect=Ciclo Produzione campo Quantit\u00e0 non \u00e8 formattato correttamente
 ManufacturingProductionRunStartDateMissing=Ciclo Produzione Data Inizio \u00e8 Mancante
 ManufacturingProductionRunStartDateNotCorrect=il campo Data Inizio non \u00e8 corretto, il formato deve essere AAAA-mm-jj HH:mm:ss
+ManufacturingProductId=Codice Prodotto
 ManufacturingProductIdTo=Codice Prodotto A
 ManufacturingProductNotExist=Prodotto inesistente
 ManufacturingProductRoutingNotExist=Link Ciclo Prodotto inesistente
@@ -180,6 +185,7 @@
 ManufacturingTechData=Tech. Data
 ManufacturingTechDataCalendarNotExist=TechDataCalendar non esiste
 ManufacturingTechDataCalendarWeekNotExist=TechDataCalendarWeek non esiste
+ManufacturingTotalQuantity=Totale Quantit\u00e0
 ManufacturingMrpName=Nome Mrp
 ManufacturingTwoRoutingTaskWithSameSeqId=Due Operazioni con stesso Codice Seq e stesso periodo
 ManufacturingUpdateCalendar=Aggiorna Calendario
@@ -229,6 +235,7 @@
 ManufacturingShowBOMAssocs=Mostra Distinte Base
 ManufacturingCopyBOMAssocs=Copia Distinte Base
 ManufacturingCopyToProductId=Al Codice Prodotto
+ManufacturingWillBeSetToNow=Verr\u00e0 impostato ad oggi se vuoto
 
 PageTitleEditCalendar=Aggiorna Calendario
 PageTitleEditCalendarExceptionDay=Aggiorna Giorno Calendario Speciale
@@ -301,4 +308,3 @@
 FormFieldTitle_estimatedSetupMillis=Configurazione Stimata in Milli secondi
 FormFieldTitle_estimatedMilliSeconds=Milli Secondi Stimati
 FormFieldTitle_perMilliSecond=Per Milli Secondi
-

Modified: trunk/applications/manufacturing/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/manufacturing/entitydef/entitymodel.xml	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/entitydef/entitymodel.xml	2006-06-30 22:16:59 UTC (rev 7913)
@@ -80,6 +80,7 @@
 
     <entity entity-name="TechDataCalendar"
             package-name="org.ofbiz.manufacturing.techdata"
+            default-resource-name="ManufacturingEntityLabels"
             title="Calendar entity"
             author="Olivier Heintz">
       <description>Used to defined the availability of the machines, this entity define the Id and the week definition.
@@ -130,6 +131,7 @@
     </entity>
     <entity entity-name="TechDataCalendarWeek"
             package-name="org.ofbiz.manufacturing.techdata"
+            default-resource-name="ManufacturingEntityLabels"
             title="Week definition entity"
             author="Olivier Heintz">
       <description>Used to defined the week definition disponibility for machine</description>
@@ -180,6 +182,7 @@
     </entity>
     <entity entity-name="InventoryEventPlannedType"
             package-name="org.ofbiz.manufacturing.mrp"
+            default-resource-name="ManufacturingEntityLabels"
             title="Inventory  event Planned type"
             author="Olivier Heintz">
       <description>Used to describe the InventoryEventPlanned and give the information if it's an in or out event</description>

Modified: trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/bom/BomForms.xml	2006-06-30 22:16:59 UTC (rev 7913)
@@ -101,8 +101,8 @@
         </field>
         <field name="ruleOperator">
             <drop-down>
-                <option key="OR"/>
-                <option key="AND"/>
+                <option key="OR" description="${uiLabelMap.CommonOr}"/>
+                <option key="AND" description="${uiLabelMap.CommonAnd}"/>
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit">

Modified: trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -46,12 +46,12 @@
             <#if productAssocTypeId?has_content>
                 <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))>
                 <#if curAssocType?exists>
-                    <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.description)?if_exists}</option>
+                    <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option>
                     <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option>
                 </#if>
             </#if>
             <#list assocTypes as assocType>
-                <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.description)?if_exists}</option>
+                <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option>
             </#list>
             </select>
             </td>
@@ -93,12 +93,12 @@
                 <#if productAssocTypeId?has_content>
                     <#assign curAssocType = delegator.findByPrimaryKey("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId))>
                     <#if curAssocType?exists>
-                        <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.description)?if_exists}</option>
+                        <option selected value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option>
                         <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option>
                     </#if>
                 </#if>
                 <#list assocTypes as assocType>
-                    <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.description)?if_exists}</option>
+                    <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option>
                 </#list>
                 </select>
             </td>
@@ -126,7 +126,7 @@
                 <div class="tabletext">
                     <input type="text" class="inputBox" name="fromDate" size="25" maxlength="40" value=""/>
                     <a href="javascript:call_cal(document.editProductAssocForm.fromDate,'${nowTimestampString}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"/></a>
-                    (Will be set to now if empty)
+                    (${uiLabelMap.ManufacturingWillBeSetToNow})
                 </div>
             </td>
             </tr>
@@ -151,7 +151,7 @@
         <tr>
             <td align="right"><div class='tableheadtext'>${uiLabelMap.ManufacturingBomType}:</div></td>
             <td>&nbsp;</td>
-            <td><b><#if curProductAssocType?exists>${(curProductAssocType.description)?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b></td>
+            <td><b><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b></td>
         </tr>
         <tr>
             <td align="right"><div class='tableheadtext'>${uiLabelMap.CommonFromDate}:</div></td>
@@ -210,7 +210,7 @@
                 <#assign selectedFormula = (request.getParameter("estimateCalcMethod"))?if_exists>
             </#if>
             <#list formulae as formula>
-                <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected</#if>>${formula.description?if_exists}</option>
+                <option value="${formula.customMethodId}" <#if selectedFormula = formula.customMethodId>selected</#if>>${formula.get("description",locale)?if_exists}</option>
             </#list>
             </select>
         </td>

Modified: trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/CuttingListReport.fo.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -33,8 +33,8 @@
 <#if cuttingList?has_content>
         <fo:page-sequence master-reference="main">
         <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
-            <fo:block font-size="16pt">Cutting List</fo:block>
-            <fo:block font-size="12pt">Shipment Plan: ${shipmentId} Delivery date: ${shipment.estimatedShipDate?if_exists}</fo:block>
+            <fo:block font-size="16pt">${uiLabelMap.ManufacturingCuttingList}</fo:block>
+            <fo:block font-size="12pt">${uiLabelMap.ProductShipmentPlan}: ${shipmentId} ${uiLabelMap.ManufacturingDeliveryDate}: ${shipment.estimatedShipDate?if_exists}</fo:block>
             <fo:block space-after.optimum="10pt" font-size="10pt">
             <fo:table>
                 <fo:table-column column-width="60pt"/>
@@ -44,11 +44,11 @@
                 <fo:table-column column-width="180pt"/>
                 <fo:table-header>
                     <fo:table-row font-weight="bold">
-                        <fo:table-cell border-bottom="thin solid grey"><fo:block>Width</fo:block></fo:table-cell>
-                        <fo:table-cell border-bottom="thin solid grey"><fo:block>Height</fo:block></fo:table-cell>
-                        <fo:table-cell border-bottom="thin solid grey"><fo:block>Quantity</fo:block></fo:table-cell>
-                        <fo:table-cell border-bottom="thin solid grey"><fo:block>ProductId</fo:block></fo:table-cell>
-                        <fo:table-cell border-bottom="thin solid grey"><fo:block>Description</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductWidth}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductHeight}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantity}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProduct}</fo:block></fo:table-cell>
+                        <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductDescription}</fo:block></fo:table-cell>
                     </fo:table-row>
                 </fo:table-header>
                 <fo:table-body>
@@ -103,7 +103,7 @@
     <fo:page-sequence master-reference="main">
     <fo:flow flow-name="xsl-region-body" font-family="Helvetica">
         <fo:block font-size="14pt">
-            No Data Available.
+            ${uiLabelMap.ManufacturingNoDataAvailable}
         </fo:block>
     </fo:flow>
     </fo:page-sequence>

Modified: trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -161,7 +161,7 @@
             <#assign productTmp = product>
             <#assign inventoryEventPlannedType = inven.getRelatedOne("InventoryEventPlannedType")>
             <tr class="${rowClass}">
-              <td><div class='tabletext'>${inventoryEventPlannedType.description}</div></td>
+              <td><div class='tabletext'>${inventoryEventPlannedType.get("description",locale)}</div></td>
               <td><div class='tabletext'>${inven.getString("eventDate")}</div></td>
               <td>&nbsp</td>
               <td><div class='tabletext'align="right"> ${inven.getString("eventQuantity")}</div></td>

Modified: trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsComponentsByFeature.fo.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -98,7 +98,7 @@
                         </fo:table-cell>
                         <fo:table-cell>
                             <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
-                                <fo:inline font-size="10pt"><#if featureType?exists>${featureType.description?if_exists}: </#if></fo:inline>
+                                <fo:inline font-size="10pt"><#if featureType?exists>${featureType.get("description",locale)?if_exists}: </#if></fo:inline>
                                 <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature?exists>${feature.productFeature.description?if_exists}</#if></fo:inline>
                             </fo:block>
                         </fo:table-cell>

Modified: trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsByFeature.fo.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -92,7 +92,7 @@
                         </fo:table-cell>
                         <fo:table-cell>
                             <fo:block line-height="13pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="end">
-                                <fo:inline font-size="10pt"><#if featureType?exists>${featureType.description?if_exists}: </#if></fo:inline>
+                                <fo:inline font-size="10pt"><#if featureType?exists>${featureType.get("description",locale)?if_exists}: </#if></fo:inline>
                                 <fo:inline font-weight="bold" font-size="10pt"><#if feature.productFeature?exists>${feature.productFeature.description?if_exists}</#if></fo:inline>
                             </fo:block>
                         </fo:table-cell>

Modified: trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/requirement/RequirementForms.xml	2006-06-30 22:16:59 UTC (rev 7913)
@@ -22,8 +22,8 @@
             target="ApproveRequirements" title=""
             default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
         <field name="hideSearch"><hidden value="Y"/></field>
-        <field name="requirementId" title="${uiLabelMap.ManufacturingRequirementId}"><text-find/></field>
-        <field name="requirementTypeId" title="${uiLabelMap.ManufacturingRequirementTypeId}">
+        <field name="requirementId"><text-find/></field>
+        <field name="requirementTypeId">
             <drop-down allow-empty="true">
                 <entity-options entity-name="RequirementType" description="${description}"/>
             </drop-down>
@@ -32,8 +32,8 @@
             <lookup target-form-name="LookupProduct"/>
         </field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
-        <field name="requirementStartDate" title="${uiLabelMap.ManufacturingRequirementStartDate}"><date-find type="date"/></field>
-        <field name="requiredByDate" title="${uiLabelMap.ManufacturingRequirementByDate}"><date-find type="date"/></field>
+        <field name="requirementStartDate"><date-find type="date"/></field>
+        <field name="requiredByDate"><date-find type="date"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
             <submit button-type="button"/>
         </field>
@@ -49,17 +49,17 @@
                 <field-map field-name="entityName" env-name="entityName"/>
             </service>
         </actions>
-        <field name="requirementId" title="${uiLabelMap.ManufacturingRequirementId}" widget-style="buttontext">
+        <field name="requirementId" widget-style="buttontext">
             <hyperlink target-type="inter-app" also-hidden="true" description="${requirementId}" target="/ordermgr/control/EditRequirement?requirementId=${requirementId}"/>
         </field>
-        <field name="requirementTypeId" title="${uiLabelMap.ManufacturingRequirementTypeId}">
+        <field name="requirementTypeId">
             <display-entity entity-name="RequirementType" also-hidden="true"/>
         </field>
         <field name="productId" title="${uiLabelMap.ProductProductId}">
             <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
         </field>
-        <field name="requirementStartDate" title="${uiLabelMap.ManufacturingRequirementStartDate}"><display/></field>
-        <field name="requiredByDate" title="${uiLabelMap.ManufacturingRequirementByDate}"><display/></field>
+        <field name="requirementStartDate"><display/></field>
+        <field name="requiredByDate"><display/></field>
         <field name="quantity" title="${uiLabelMap.CommonQuantity}"><display/></field>
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">

Modified: trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl
===================================================================
--- trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl	2006-06-30 22:16:13 UTC (rev 7912)
+++ trunk/applications/manufacturing/webapp/manufacturing/routing/FindCalendar.ftl	2006-06-30 22:16:59 UTC (rev 7913)
@@ -35,7 +35,7 @@
     <#list techDataCalendars as techDataCalendar>
       <tr>
         <td><div class="tabletext">${techDataCalendar.calendarId}</div></td>
-        <td><div class="tabletext">${techDataCalendar.description?if_exists}</div></td>
+        <td><div class="tabletext">${techDataCalendar.get("description",locale)?if_exists}</div></td>
         <td><div class="tabletext">${techDataCalendar.calendarWeekId?if_exists}</div></td>
         <td align="right">
           <a href="<@ofbizUrl>EditCalendar?calendarId=${techDataCalendar.calendarId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>



More information about the Svn mailing list