Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PRunsProductsStacks.fo.ftl Tue Jan 13 13:50:56 2009 @@ -58,7 +58,7 @@ <fo:table-row> <fo:table-cell> <fo:block line-height="6pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="6pt">${uiLabelMap.estimatedCompletionDate}:</fo:inline> + <fo:inline font-size="6pt">${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -72,7 +72,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="6pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="6pt">${uiLabelMap.estimatedCompletionDate}:</fo:inline> + <fo:inline font-size="6pt">${uiLabelMap.ManufacturingEstimatedCompletionDate}:</fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -121,7 +121,7 @@ <fo:table-row> <fo:table-cell> <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="6pt">${uiLabelMap.CommonPrintoutDate}:</fo:inline> + <fo:inline font-size="6pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -135,7 +135,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="6pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="6pt">${uiLabelMap.CommonPrintoutDate}:</fo:inline> + <fo:inline font-size="6pt">${uiLabelMap.ManufacturingPrintoutDate}:</fo:inline> </fo:block> </fo:table-cell> </fo:table-row> @@ -284,7 +284,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="12pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="9pt">${uiLabelMap.CommonLabelNumber} : ${stackInfo.stackNum} di ${stackInfo.numOfStacks}</fo:inline> + <fo:inline font-size="9pt">${uiLabelMap.ManufacturingLabelNumber} : ${stackInfo.stackNum} di ${stackInfo.numOfStacks}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell>
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/PackageContentsAndOrder.fo.ftl Tue Jan 13 13:50:56 2009 @@ -72,7 +72,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle dell'etichetta - 1° riga --> +<!-- nota: righe o celle dell'etichetta - 1� riga --> <fo:table text-align="start" table-layout="fixed"> <fo:table-column column-width="4.00cm"/> <fo:table-column column-width="4.00cm"/> @@ -105,7 +105,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle dell'etichetta - 2° riga --> +<!-- nota: righe o celle dell'etichetta - 2� riga --> <fo:table text-align="start" table-layout="fixed"> <fo:table-column column-width="2.00cm"/> <fo:table-column column-width="3.00cm"/> @@ -118,7 +118,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="8pt">${uiLabelMap.CustomerOrderId} :</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.OrderOrderId} :</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -146,7 +146,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle dell'etichetta - 3° riga --> +<!-- nota: righe o celle dell'etichetta - 3� riga --> <fo:table text-align="start" table-layout="fixed"> <fo:table-column column-width="2.00cm"/> @@ -160,7 +160,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="8pt">${uiLabelMap.CommonDestination}:</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.ManufacturingDestination}:</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -175,7 +175,7 @@ </fo:table-row> </fo:table-body> </fo:table> -<!-- nota: righe o celle dell'etichetta - 4° riga --> +<!-- nota: righe o celle dell'etichetta - 4� riga --> <fo:table text-align="start" table-layout="fixed"> <fo:table-column column-width="2.00cm"/> <fo:table-column column-width="3.00cm"/> @@ -188,7 +188,7 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="8pt">${uiLabelMap.CommonCustomer}</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.PartyParty}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -204,7 +204,7 @@ </fo:table-body> </fo:table> -<!-- nota: righe o celle dell'etichetta - 5° riga --> +<!-- nota: righe o celle dell'etichetta - 5� riga --> <fo:table text-align="start" table-layout="fixed"> <fo:table-column column-width="2.00cm"/> @@ -218,12 +218,12 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always"> - <fo:inline font-size="8pt">${uiLabelMap.CommonReference} :</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.ManufacturingReference} :</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> <fo:block line-height="10pt" space-before.optimum="5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="10pt">{CommonReference}</fo:inline> + <fo:inline font-size="10pt">${uiLabelMap.ManufacturingReference}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> @@ -255,12 +255,12 @@ </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="8pt">${uiLabelMap.CommonCustomLength}</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.ManufacturingCustomLength}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> <fo:block line-height="8pt" space-before.optimum="1.5pt" space-after.optimum="1.5pt" keep-together="always" text-align="start"> - <fo:inline font-size="8pt">${uiLabelMap.CommonMeasure}</fo:inline> + <fo:inline font-size="8pt">${uiLabelMap.CommonMeasures}</fo:inline> </fo:block> </fo:table-cell> <fo:table-cell> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentLabel.fo.ftl Tue Jan 13 13:50:56 2009 @@ -135,7 +135,7 @@ <fo:block>${uiLabelMap.ProductShipmentPlan}</fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.FacilityEstimatedShipDate}</fo:block> + <fo:block>${uiLabelMap.ManufacturingEstimatedShipDate}</fo:block> </fo:table-cell> </fo:table-row> <fo:table-row> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/reports/ShipmentPlanStockReport.fo.ftl Tue Jan 13 13:50:56 2009 @@ -53,7 +53,7 @@ <fo:block>${uiLabelMap.estimatedCompletionDate}: <#if estimatedReadyDatePar?has_content>${estimatedReadyDatePar}</#if></fo:block> </fo:table-cell> <fo:table-cell padding="2pt"> - <fo:block>${uiLabelMap.FacilityEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar}</#if></fo:block> + <fo:block>${uiLabelMap.ManufacturingEstimatedShipDate}: <#if estimatedShipDatePar?has_content>${estimatedShipDatePar}</#if></fo:block> </fo:table-cell> </fo:table-row> </fo:table-header> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/BomScreens.xml Tue Jan 13 13:50:56 2009 @@ -147,7 +147,7 @@ <screen name="FindBom"> <section> <actions> - <set field="titleProperty" value="PageTitleFindProductBom"/> + <set field="titleProperty" value="PageTitleFindBom"/> <set field="tabButtonItem" value="findBom"/> <set field="labelTitleProperty" value="findBom"/> <set field="headerItem" value="bom"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/CommonScreens.xml Tue Jan 13 13:50:56 2009 @@ -28,6 +28,8 @@ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.ManufacturingCompanyName" global="true"/> Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml?rev=734248&r1=734247&r2=734248&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ReportScreens.xml Tue Jan 13 13:50:56 2009 @@ -59,6 +59,8 @@ <actions> <set field="title" value="Cutting List Report"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/widget/manufacturing/CuttingListReport.groovy"/> @@ -75,6 +77,8 @@ <actions> <set field="title" value="MRPPRunsProductsByFeature"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="mrpName" from-field="parameters.mrpName"/> <set field="planName" value="MRP_${mrpName}"/> @@ -104,6 +108,8 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <entity-one entity-name="Shipment" value-name="shipment"/> @@ -122,6 +128,8 @@ <actions> <set field="title" value="MRPPRunsComponentsByFeature"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="mrpName" from-field="parameters.mrpName"/> <set field="planName" value="MRP_${mrpName}"/> @@ -153,6 +161,8 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <entity-one entity-name="Shipment" value-name="shipment"/> @@ -180,6 +190,7 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsStacks.groovy"/> @@ -204,6 +215,7 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PackageContentsAndOrder.groovy"/> @@ -229,6 +241,7 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsProductsAndOrder.groovy"/> @@ -253,6 +266,7 @@ <set field="productFeatureTypeIdPar" from-field="parameters.productFeatureTypeIdPar"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/PRunsInfoAndOrder.groovy"/> @@ -271,6 +285,7 @@ <set field="title" value="ShipmentPlanStockReport"/> <set field="shipmentId" from-field="parameters.shipmentId"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentPlanStockReport.groovy"/> @@ -289,6 +304,7 @@ <set field="title" value="ShipmentLabel"/> <set field="shipmentId" from-field="parameters.shipmentId"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentLabel.groovy"/> @@ -307,6 +323,7 @@ <set field="title" value="ShipmentWorkEffortTasks"/> <set field="shipmentId" from-field="parameters.shipmentId"/> <property-map resource="ManufacturingReportsUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://manufacturing/webapp/manufacturing/WEB-INF/actions/reports/ShipmentWorkEffortTasks.groovy"/>
