[OFBiz] SVN: r7764 - in trunk/applications: accounting/config content/webapp/content/includes content/widget/content ecommerce/config marketing/config order/entitydef product/entitydef product/webapp/facility/facility product/webapp/facility/group product/webapp/facility/inventory product/webapp/facility/returns product/webapp/facility/shipment
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Sat Jun 10 03:32:57 CDT 2006
Author: jacopo
Date: 2006-06-10 03:31:55 -0500 (Sat, 10 Jun 2006)
New Revision: 7764
Modified:
trunk/applications/accounting/config/AccountingEntityLabels_it.properties
trunk/applications/content/webapp/content/includes/appheader.ftl
trunk/applications/content/widget/content/ContentScreens.xml
trunk/applications/ecommerce/config/EcommerceUiLabels.properties
trunk/applications/marketing/config/MarketingEntityLabels.properties
trunk/applications/order/entitydef/entitymodel.xml
trunk/applications/product/entitydef/entitymodel.xml
trunk/applications/product/entitydef/entitymodel_shipment.xml
trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
trunk/applications/product/webapp/facility/facility/EditFacility.ftl
trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl
trunk/applications/product/webapp/facility/facility/EditFacilityInventoryItems.ftl
trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl
trunk/applications/product/webapp/facility/facility/FindFacility.ftl
trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl
trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
trunk/applications/product/webapp/facility/group/EditFacilityGroup.ftl
trunk/applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl
trunk/applications/product/webapp/facility/group/EditFacilityGroupRoles.ftl
trunk/applications/product/webapp/facility/group/FindFacilityGroup.ftl
trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl
trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
Log:
i18n mods and labels from Marco Risaliti (AOFBIZ-6).
Modified: trunk/applications/accounting/config/AccountingEntityLabels_it.properties
===================================================================
--- trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-10 08:31:55 UTC (rev 7764)
@@ -29,4 +29,90 @@
PaymentMethodType.description.GIFT_CARD=Carta Regalo
PaymentMethodType.description.GIFT_CERTIFICATE=Certificato Regalo
PaymentMethodType.description.MONEY_ORDER=Ordine Soldi
-PaymentMethodType.description.PERSONAL_CHECK=Assegno Personale
\ No newline at end of file
+PaymentMethodType.description.PERSONAL_CHECK=Assegno Personale
+
+GlAccountType.description.ACCOUNTS_RECEIVABLE=Crediti a Breve
+GlAccountType.description.ACCOUNTS_PAYABLE=Conti Pagamenti
+GlAccountType.description.BALANCE_ACCOUNT=Bilancio
+GlAccountType.description.BANK_STLMNT_ACCOUNT=Estratto Conto Bancario
+GlAccountType.description.MRCH_STLMNT_ACCOUNT=Estratto Conto Commerciante
+GlAccountType.description.CURRENT_ASSET=Bene Attuale
+GlAccountType.description.FIXED_ASSET=Cespite
+GlAccountType.description.OTHER_ASSET=Altro Bene
+GlAccountType.description.CREDIT_CARD=Carta di Credito
+GlAccountType.description.CURRENT_LIABILITY=Responsabilità Attuale
+GlAccountType.description.LONG_TERM_LIABILITY=Responsabilità Lungo Termine
+GlAccountType.description.CUSTOMER_ACCOUNT=Cliente
+GlAccountType.description.SUPPLIER_ACCOUNT=Fornitore
+GlAccountType.description.PRODUCT_ACCOUNT=Prodotto
+GlAccountType.description.INVENTORY_ACCOUNT=Inventario
+GlAccountType.description.INV_ADJ_AVG_COST=Inventario Aggiustamenti dai Costi Medi
+GlAccountType.description.RAWMAT_INVENTORY=Inventario Materie Prime
+GlAccountType.description.WIP_INVENTORY=Inventario In Corso
+GlAccountType.description.TAX_ACCOUNT=Tassa
+GlAccountType.description.PROFIT_LOSS_ACCOUNT=Perdita Profitto
+GlAccountType.description.SALES_ACCOUNT=Vendita
+GlAccountType.description.SALES_RETURNS=Resi Cliente
+GlAccountType.description.DISCOUNTS_ACCOUNT=Sconti
+GlAccountType.description.COGS_ACCOUNT=Costo delle Merci Vendute
+GlAccountType.description.COGS_ADJ_AVG_COST=COGS - Costo Medio Aggiustamento
+GlAccountType.description.PURCHASE_ACCOUNT=Acquisto
+GlAccountType.description.INV_CHANGE_ACCOUNT=Cambio Inventario
+GlAccountType.description.OPERATING_EXPENSE=Spese Operative
+GlAccountType.description.OTHER_EXPENSE=Altre Spese
+GlAccountType.description.OWNERS_EQUITY=Azioni Proprietarie
+GlAccountType.description.RETAINED_EARNINGS=Guadagni Mantenuti
+GlAccountType.description.CUSTOMER_DEPOSIT=Depositi Cliente
+GlAccountType.description.CUSTOMER_CREDIT=Crediti Cliente
+GlAccountType.description.CUSTOMER_GC_DEPOSIT=Bilanci Certificato Omaggio Cliente
+GlAccountType.description.UNINVOICED_SHIP_RCPT=Ricevute Spedizioni Non Fatturate
+GlAccountType.description.PURCHASE_PRICE_VAR=Varianza Prezzo Acquisto
+GlAccountType.description.PREPAID_EXPENSES=Spese Prepagate
+GlAccountType.description.INVENTORY_XFER_OUT=Ricevibile dai Trasferimento di Inventario Out
+GlAccountType.description.INVENTORY_XFER_IN=Pagabile dai Trasferimento di Inventario In
+
+FixedAssetProductType.description.FAPT_USE=Uso Cespite
+FixedAssetProductType.description.FAPT_SALE=Vendita Cespite
+
+GlAccountType.description.ACCOUNTS_RECEIVABLE=Crediti a Breve
+GlAccountType.description.ACCOUNTS_PAYABLE=Conti Pagamenti
+GlAccountType.description.BALANCE_ACCOUNT=Bilancio
+GlAccountType.description.BANK_STLMNT_ACCOUNT=Estratto Conto Bancario
+GlAccountType.description.MRCH_STLMNT_ACCOUNT=Estratto Conto Commerciante
+GlAccountType.description.CURRENT_ASSET=Bene Attuale
+GlAccountType.description.FIXED_ASSET=Cespite
+GlAccountType.description.OTHER_ASSET=Altro Bene
+GlAccountType.description.CREDIT_CARD=Carta di Credito
+GlAccountType.description.CURRENT_LIABILITY=Responsabilità Attuale
+GlAccountType.description.LONG_TERM_LIABILITY=Responsabilità Lungo Termine
+GlAccountType.description.CUSTOMER_ACCOUNT=Cliente
+GlAccountType.description.SUPPLIER_ACCOUNT=Fornitore
+GlAccountType.description.PRODUCT_ACCOUNT=Prodotto
+GlAccountType.description.INVENTORY_ACCOUNT=Inventario
+GlAccountType.description.INV_ADJ_AVG_COST=Inventario Aggiustamenti dai Costi Medi
+GlAccountType.description.RAWMAT_INVENTORY=Inventario Materie Prime
+GlAccountType.description.WIP_INVENTORY=Inventario In Corso
+GlAccountType.description.TAX_ACCOUNT=Tassa
+GlAccountType.description.PROFIT_LOSS_ACCOUNT=Perdita Profitto
+GlAccountType.description.SALES_ACCOUNT=Vendita
+GlAccountType.description.SALES_RETURNS=Resi Cliente
+GlAccountType.description.DISCOUNTS_ACCOUNT=Sconti
+GlAccountType.description.COGS_ACCOUNT=Costo delle Merci Vendute
+GlAccountType.description.COGS_ADJ_AVG_COST=COGS - Costo Medio Aggiustamento
+GlAccountType.description.PURCHASE_ACCOUNT=Acquisto
+GlAccountType.description.INV_CHANGE_ACCOUNT=Cambio Inventario
+GlAccountType.description.OPERATING_EXPENSE=Spese Operative
+GlAccountType.description.OTHER_EXPENSE=Altre Spese
+GlAccountType.description.OWNERS_EQUITY=Azioni Proprietarie
+GlAccountType.description.RETAINED_EARNINGS=Guadagni Mantenuti
+GlAccountType.description.CUSTOMER_DEPOSIT=Depositi Cliente
+GlAccountType.description.CUSTOMER_CREDIT=Crediti Cliente
+GlAccountType.description.CUSTOMER_GC_DEPOSIT=Bilanci Certificato Omaggio Cliente
+GlAccountType.description.UNINVOICED_SHIP_RCPT=Ricevute Spedizioni Non Fatturate
+GlAccountType.description.PURCHASE_PRICE_VAR=Varianza Prezzo Acquisto
+GlAccountType.description.PREPAID_EXPENSES=Spese Prepagate
+GlAccountType.description.INVENTORY_XFER_OUT=Ricevibile dai Trasferimento di Inventario Out
+GlAccountType.description.INVENTORY_XFER_IN=Pagabile dai Trasferimento di Inventario In
+
+FixedAssetProductType.description.FAPT_USE=Uso Cespite
+FixedAssetProductType.description.FAPT_SALE=Vendita Cespite
Modified: trunk/applications/content/webapp/content/includes/appheader.ftl
===================================================================
--- trunk/applications/content/webapp/content/includes/appheader.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/content/webapp/content/includes/appheader.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -23,35 +23,35 @@
*@version $Rev$
*@since 2.1
-->
-
+<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<#assign unselectedLeftClassName = "headerButtonLeft">
<#assign unselectedRightClassName = "headerButtonRight">
<#assign selectedLeftClassMap = {page.headerItem?default("void") : "headerButtonLeftSelected"}>
<#assign selectedRightClassMap = {page.headerItem?default("void") : "headerButtonRightSelected"}>
-<div class="apptitle"> Content Manager Application </div>
+<div class="apptitle"> ${uiLabelMap.ContentContentManagerApplication} </div>
<div class="row">
- <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">Main</a></div>
- <div class="col"><a href="<@ofbizUrl>FindWebSite</@ofbizUrl>" class="${selectedLeftClassMap.WebSite?default(unselectedLeftClassName)}">WebSites</a></div>
- <div class="col"><a href="<@ofbizUrl>FindSurvey</@ofbizUrl>" class="${selectedLeftClassMap.Survey?default(unselectedLeftClassName)}">Surveys</a></div>
- <div class="col"><a href="<@ofbizUrl>ContentMenu</@ofbizUrl>" class="${selectedLeftClassMap.Content?default(unselectedLeftClassName)}">Content</a></div>
- <div class="col"><a href="<@ofbizUrl>FindDataResource</@ofbizUrl>" class="${selectedLeftClassMap.DataResource?default(unselectedLeftClassName)}">DataResource</a></div>
+ <div class="col"><a href="<@ofbizUrl>main</@ofbizUrl>" class="${selectedLeftClassMap.main?default(unselectedLeftClassName)}">${uiLabelMap.ContentMain}</a></div>
+ <div class="col"><a href="<@ofbizUrl>FindWebSite</@ofbizUrl>" class="${selectedLeftClassMap.WebSite?default(unselectedLeftClassName)}">${uiLabelMap.ContentWebSites}</a></div>
+ <div class="col"><a href="<@ofbizUrl>FindSurvey</@ofbizUrl>" class="${selectedLeftClassMap.Survey?default(unselectedLeftClassName)}">${uiLabelMap.ContentSurvey}</a></div>
+ <div class="col"><a href="<@ofbizUrl>ContentMenu</@ofbizUrl>" class="${selectedLeftClassMap.Content?default(unselectedLeftClassName)}">${uiLabelMap.ContentContent}</a></div>
+ <div class="col"><a href="<@ofbizUrl>FindDataResource</@ofbizUrl>" class="${selectedLeftClassMap.DataResource?default(unselectedLeftClassName)}">${uiLabelMap.ContentDataResource}</a></div>
- <div class="col"><a href="<@ofbizUrl>ContentSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.ContentSetupMenu?default(unselectedLeftClassName)}">Content Setup</a></div>
- <div class="col"><a href="<@ofbizUrl>DataSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.DataResourceSetupMenu?default(unselectedLeftClassName)}">DataResource Setup</a></div>
+ <div class="col"><a href="<@ofbizUrl>ContentSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.ContentSetupMenu?default(unselectedLeftClassName)}">${uiLabelMap.ContentContentSetup}</a></div>
+ <div class="col"><a href="<@ofbizUrl>DataSetupMenu</@ofbizUrl>" class="${selectedLeftClassMap.DataResourceSetupMenu?default(unselectedLeftClassName)}">${uiLabelMap.ContentDataSetup}</a></div>
- <div class="col"><a href="<@ofbizUrl>LayoutMenu</@ofbizUrl>" class="${selectedLeftClassMap.Layout?default(unselectedLeftClassName)}">Template</a></div>
+ <div class="col"><a href="<@ofbizUrl>LayoutMenu</@ofbizUrl>" class="${selectedLeftClassMap.Layout?default(unselectedLeftClassName)}">${uiLabelMap.ContentTemplate}</a></div>
<#assign cmsTarget="CMSContentFind"/>
<#if menuContext?has_content && menuContext.cmsRequestName?has_content>
<#assign cmsTarget=menuContext.cms.cmsRequestName/>
</#if>
- <div class="col"><a href="<@ofbizUrl>${cmsTarget}</@ofbizUrl>" class="${selectedLeftClassMap.CMS?default(unselectedLeftClassName)}">CMS</a></div>
- <div class="col"><a href="<@ofbizUrl>FindCompDoc</@ofbizUrl>" class="${selectedLeftClassMap.CompDoc?default(unselectedLeftClassName)}">CompDoc</a></div>
+ <div class="col"><a href="<@ofbizUrl>${cmsTarget}</@ofbizUrl>" class="${selectedLeftClassMap.CMS?default(unselectedLeftClassName)}">${uiLabelMap.ContentCMS}</a></div>
+ <div class="col"><a href="<@ofbizUrl>FindCompDoc</@ofbizUrl>" class="${selectedLeftClassMap.CompDoc?default(unselectedLeftClassName)}">${uiLabelMap.ContentCompDoc}</a></div>
<#if requestAttributes.userLogin?has_content>
- <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.login?default(unselectedRightClassName)}">Logout</a></div>
+ <div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.login?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
<#else>
- <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>Login</a></div>
+ <div class="col-right"><a href='<@ofbizUrl>${checkLoginUrl?if_exists}</@ofbizUrl>' class='${selectedRightClassMap.login?default(unselectedRightClassName)}'>${uiLabelMap.CommonLogin}</a></div>
</#if>
<div class="col-fill"> </div>
</div>
Modified: trunk/applications/content/widget/content/ContentScreens.xml
===================================================================
--- trunk/applications/content/widget/content/ContentScreens.xml 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/content/widget/content/ContentScreens.xml 2006-06-10 08:31:55 UTC (rev 7764)
@@ -28,6 +28,9 @@
<actions>
<set field="headerItem" value="Content"/>
<set field="title" value="PageTitleFindContent"/>
+ <set field="titleProperty" value="PageTitleFindContent"/>
+ <set field="entityName" value="Content"/>
+ <set field="queryString" from-field="result.queryString"/>
<set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="30"/>
</actions>
@@ -262,7 +265,8 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set field="title" value="Lookup Content"/>
+ <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="${uiLabelMap.PageTitleLookupContent}"/>
<set field="viewIndex" from-field="requestParameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="requestParameters.VIEW_SIZE" type="Integer" default-value="20"/>
</actions>
Modified: trunk/applications/ecommerce/config/EcommerceUiLabels.properties
===================================================================
--- trunk/applications/ecommerce/config/EcommerceUiLabels.properties 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/ecommerce/config/EcommerceUiLabels.properties 2006-06-10 08:31:55 UTC (rev 7764)
@@ -649,4 +649,5 @@
ProductSortedBy=Sorted by
ProductUsuallyShipsIn=Usually ships in
ProductYouSearchedFor=you searched for
+RequestHistory=Request History
QuoteHistory=Quote History
Modified: trunk/applications/marketing/config/MarketingEntityLabels.properties
===================================================================
--- trunk/applications/marketing/config/MarketingEntityLabels.properties 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/marketing/config/MarketingEntityLabels.properties 2006-06-10 08:31:55 UTC (rev 7764)
@@ -21,12 +21,15 @@
ContactListType.description.MARKETING=Marketing
ContactListType.description.NEWSLETTER=Newsletter
ContactListType.description.ANNOUNCEMENT=Announcement
+
StatusType.description.CONTACTLST_PARTY=Contact List Party
StatusItem.description.CLPT_PENDING=Pending Acceptance
StatusItem.description.CLPT_ACCEPTED=Accepted
StatusItem.description.CLPT_REJECTED=Rejected
+
SegmentGroupType.description.MARKET_SEGMENT=Market Segment
SegmentGroupType.description.SALES_SEGMENT=Sales Segment
+
TrackingCodeType.description.INTERNAL=Internal
TrackingCodeType.description.EXTERNAL=External
TrackingCodeType.description.PARTNER_MGD=Partner Managed
Modified: trunk/applications/order/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/order/entitydef/entitymodel.xml 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/order/entitydef/entitymodel.xml 2006-06-10 08:31:55 UTC (rev 7764)
@@ -1610,6 +1610,7 @@
</entity>
<entity entity-name="CustRequestResolution"
package-name="org.ofbiz.order.request"
+ default-resource-name="OrderEntityLabels"
title="Customer Request Resolution Entity">
<field name="custRequestResolutionId" type="id-ne"></field>
<field name="custRequestTypeId" type="id"></field>
@@ -2261,6 +2262,7 @@
</entity>
<entity entity-name="ReturnReason"
package-name="org.ofbiz.order.return"
+ default-resource-name="OrderEntityLabels"
title="Return Reason Entity">
<field name="returnReasonId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -2289,6 +2291,7 @@
</entity>
<entity entity-name="ReturnType"
package-name="org.ofbiz.order.return"
+ default-resource-name="OrderEntityLabels"
title="Return Type Entity">
<field name="returnTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -2474,6 +2477,7 @@
</entity>
<entity entity-name="ShoppingListType"
package-name="org.ofbiz.order.shoppinglist"
+ default-resource-name="OrderEntityLabels"
title="Shopping List Type Entity">
<field name="shoppingListTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
Modified: trunk/applications/product/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel.xml 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/entitydef/entitymodel.xml 2006-06-10 08:31:55 UTC (rev 7764)
@@ -1365,6 +1365,7 @@
</view-entity>
<entity entity-name="VarianceReason"
package-name="org.ofbiz.product.inventory"
+ default-resource-name="ProductEntityLabels"
title="Variance Reason Entity">
<field name="varianceReasonId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -2931,6 +2932,7 @@
</entity>
<entity entity-name="FacilityGroupType"
package-name="org.ofbiz.product.storage"
+ default-resource-name="ProductEntityLabels"
title="Facility Group Type Entity">
<field name="facilityGroupTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -2977,6 +2979,7 @@
</entity>
<entity entity-name="FacilityType"
package-name="org.ofbiz.product.storage"
+ default-resource-name="ProductEntityLabels"
title="Facility Type Entity">
<field name="facilityTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
Modified: trunk/applications/product/entitydef/entitymodel_shipment.xml
===================================================================
--- trunk/applications/product/entitydef/entitymodel_shipment.xml 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/entitydef/entitymodel_shipment.xml 2006-06-10 08:31:55 UTC (rev 7764)
@@ -300,6 +300,7 @@
<entity entity-name="RejectionReason"
package-name="org.ofbiz.shipment.receipt"
+ default-resource-name="ProductEntityLabels"
title="Rejection Reason Entity">
<field name="rejectionId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -1195,6 +1196,7 @@
</entity>
<entity entity-name="ShipmentType"
package-name="org.ofbiz.shipment.shipment"
+ default-resource-name="ProductEntityLabels"
title="Shipment Type Entity">
<field name="shipmentTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
Modified: trunk/applications/product/webapp/facility/facility/EditContactMech.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditContactMech.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditContactMech.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -47,7 +47,7 @@
<td width="74%">
<select name="preContactMechTypeId" class="selectBox">
<#list mechMap.contactMechTypes as contactMechType>
- <option value='${contactMechType.contactMechTypeId}'>${contactMechType.description}</option>
+ <option value='${contactMechType.contactMechTypeId}'>${contactMechType.get("description",locale)}</option>
</#list>
</select> <a href="javascript:document.createcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonCreate}]</a>
</td>
@@ -63,7 +63,7 @@
<a href='<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>' class="buttontext">[${uiLabelMap.CommonGoBack}]</a>
<a href="javascript:document.editcontactmechform.submit()" class="buttontext">[${uiLabelMap.CommonSave}]</a>
<#if contactMechPurposeType?exists>
- <div>(${uiLabelMap.PartyMsgContactHavePurpose}<b>"${contactMechPurposeType.description?if_exists}"</b>)</div>
+ <div>(${uiLabelMap.PartyMsgContactHavePurpose}<b>"${contactMechPurposeType.get("description",locale)?if_exists}"</b>)</div>
</#if>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<form method="get" action='<@ofbizUrl>${mechMap.requestName}</@ofbizUrl>' name="editcontactmechform">
@@ -92,7 +92,7 @@
<td bgcolor='white'>
<div class="tabletext">
<#if contactMechPurposeType?has_content>
- <b>${contactMechPurposeType.description}</b>
+ <b>${contactMechPurposeType.get("description",locale)}</b>
<#else>
<b>${uiLabelMap.PartyMechPurposeTypeNotFound}: "${facilityContactMechPurpose.contactMechPurposeTypeId}"</b>
</#if>
@@ -112,7 +112,7 @@
<select name='contactMechPurposeTypeId' class="selectBox">
<option></option>
<#list mechMap.purposeTypes as contactMechPurposeType>
- <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.description}</option>
+ <option value='${contactMechPurposeType.contactMechPurposeTypeId}'>${contactMechPurposeType.get("description",locale)}</option>
</#list>
</select>
</td>
@@ -220,7 +220,7 @@
</tr>
<#else>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.description}</div></td>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${mechMap.contactMechType.get("description",locale)}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="60" maxlength="255" name="infoString" value="${(mechMap.contactMech.infoString)?if_exists}">
Modified: trunk/applications/product/webapp/facility/facility/EditFacility.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacility.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditFacility.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -56,10 +56,10 @@
<td> </td>
<td width="74%">
<select name="facilityTypeId" size="1" class='selectBox'>
- <option selected value='${facilityType.facilityTypeId?if_exists}'>${facilityType.description?if_exists}</option>
+ <option selected value='${facilityType.facilityTypeId?if_exists}'>${facilityType.get("description",locale)?if_exists}</option>
<option value='${facilityType.facilityTypeId?if_exists}'>----</option>
<#list facilityTypes as nextFacilityType>
- <option value='${nextFacilityType.facilityTypeId?if_exists}'>${nextFacilityType.description?if_exists}</option>
+ <option value='${nextFacilityType.facilityTypeId?if_exists}'>${nextFacilityType.get("description",locale)?if_exists}</option>
</#list>
</select>
</td>
@@ -90,7 +90,7 @@
<#if (facility.defaultWeightUomId?has_content) && (uom.uomId == facility.defaultWeightUomId)>
SELECTED
</#if>
- >${uom.description?default(uom.uomId)}</option>
+ >${uom.get("description",locale)?default(uom.uomId)}</option>
</#list>
</select>
</td>
@@ -105,7 +105,7 @@
<#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
SELECTED
</#if>
- >${nextInventoryItemType.description?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+ >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditFacilityGroups.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -91,7 +91,7 @@
<input type="text" size="25" name="thruDate" value="${(facilityGroupMember.thruDate)?if_exists}" class="inputBox" <#if hasExpired>style="color: red;</#if>">
<a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(facilityGroupMember.thruDate)?default(nowTimestampString)}');"><img src="/images/cal.gif" width="16" height="16" border="0" alt="Calendar"></a>
<input type="text" size="5" name="sequenceNum" value="${(facilityGroupMember.sequenceNum)?if_exists}" class="inputBox">
- <INPUT type="submit" value="Update" style="font-size: x-small;">
+ <INPUT type="submit" value="${uiLabelMap.CommonUpdate}" style="font-size: x-small;">
</FORM>
</td>
<td align="center">
Modified: trunk/applications/product/webapp/facility/facility/EditFacilityInventoryItems.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacilityInventoryItems.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditFacilityInventoryItems.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -78,12 +78,12 @@
<#if (inventoryItem.quantityOnHandTotal)?exists && (!(inventoryItem.serialNumber)?exists || (inventoryItem.serialNumber.length() == 0))><#assign isQuantity=true></#if>
<tr valign="middle">
<td><div class="tabletext"> <a href="<@ofbizUrl>EditInventoryItem?inventoryItemId=${(inventoryItem.inventoryItemId)?if_exists}&facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${(inventoryItem.inventoryItemId)?if_exists}</a></div></td>
- <td><div class="tabletext"> ${(curInventoryItemType.description)?if_exists}</div></td>
+ <td><div class="tabletext"> ${(curInventoryItemType.get("description",locale))?if_exists}</div></td>
<td><div class="tabletext"> ${(inventoryItem.statusId)?if_exists}</div></td>
<td><div class="tabletext"> ${(inventoryItem.datetimeReceived)?if_exists}</div></td>
<td><div class="tabletext"> ${(inventoryItem.expireDate)?if_exists}</div></td>
<td><a href="/catalog/control/EditProduct?productId=${(inventoryItem.productId)?if_exists}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">${(inventoryItem.productId)?if_exists}</a></td>
- <td><div class="tabletext"> <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content>(${facilityLocationTypeEnum.description})</#if>[${(inventoryItem.locationSeqId)?if_exists}]</a></div></td>
+ <td><div class="tabletext"> <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(inventoryItem.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?has_content>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${(inventoryItem.locationSeqId)?if_exists}]</a></div></td>
<td><div class="tabletext"> ${(inventoryItem.lotId)?if_exists}</div></td>
<td><div class="tabletext"> ${(inventoryItem.binNumber)?if_exists}</div></td>
<#if (inventoryItem.inventoryItemTypeId)?exists && (inventoryItem.inventoryItemTypeId.equals("NON_SERIAL_INV_ITEM"))>
Modified: trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -68,11 +68,11 @@
<select name="locationTypeEnumId">
<#if (facilityLocation.locationTypeEnumId)?has_content>
<#assign locationTypeEnum = facilityLocation.getRelatedOneCache("TypeEnumeration")?if_exists>
- <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.description)?default(facilityLocation.locationTypeEnumId)}</option>
+ <option value="${facilityLocation.locationTypeEnumId}">${(locationTypeEnum.get("description",locale))?default(facilityLocation.locationTypeEnumId)}</option>
<option value="${facilityLocation.locationTypeEnumId}">----</option>
</#if>
<#list locationTypeEnums as locationTypeEnum>
- <option value="${locationTypeEnum.enumId}">${locationTypeEnum.description}</option>
+ <option value="${locationTypeEnum.enumId}">${locationTypeEnum.get("description",locale)}</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/EditFacilityRoles.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -42,7 +42,7 @@
<#assign roleType = facilityRole.getRelatedOne("RoleType")>
<tr valign="middle">
<td><a href="/partymgr/control/viewprofile?party_id=${(facilityRole.partyId)?if_exists}" class="buttontext">${(facilityRole.partyId)?if_exists}</a></td>
- <td><div class="tabletext">${(roleType.description)?if_exists}</div></td>
+ <td><div class="tabletext">${(roleType.get("description",locale))?if_exists}</div></td>
<td align="center">
<a href="<@ofbizUrl>removePartyFromFacility?facilityId=${(facilityRole.facilityId)?if_exists}&partyId=${(facilityRole.partyId)?if_exists}&roleTypeId=${(facilityRole.roleTypeId)?if_exists}</@ofbizUrl>" class="buttontext">
[${uiLabelMap.CommonDelete}]</a>
@@ -60,7 +60,7 @@
${uiLabelMap.PartyRoleType}:
<select name="roleTypeId" class="selectBox"><option></option>
<#list roles as role>
- <option value="${(role.roleTypeId)?if_exists}">${(role.description)?if_exists}</option>
+ <option value="${(role.roleTypeId)?if_exists}">${(role.get("description",locale))?if_exists}</option>
</#list>
</select>
<input type="submit" value="${uiLabelMap.CommonAdd}">
Modified: trunk/applications/product/webapp/facility/facility/FindFacility.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/FindFacility.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/FindFacility.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -44,7 +44,7 @@
<#assign facilityType = facility.getRelatedOne("FacilityType")?if_exists>
<tr valign="middle">
<td><div class='tabletext'> ${facility.facilityName?if_exists} <a href='<@ofbizUrl>EditFacility?facilityId=${facility.facilityId?if_exists}</@ofbizUrl>' class="buttontext">${facility.facilityId?if_exists}</a></div></td>
- <td><div class='tabletext'> ${facilityType.description?if_exists}</div></td>
+ <td><div class='tabletext'> ${facilityType.get("description",locale)?if_exists}</div></td>
<td><div class='tabletext'> ${facility.ownerPartyId?if_exists}</div></td>
<td><div class='tabletext'> ${facility.squareFootage?if_exists}</div></td>
<td><div class='tabletext'> ${facility.description?if_exists}</div></td>
Modified: trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -103,7 +103,7 @@
<tr>
<td><div class="tabletext"><a href="<@ofbizUrl>EditFacility?facilityId=${(location.facilityId)?if_exists}</@ofbizUrl>" class="buttontext"> ${(location.facilityId)?if_exists}</a></div></td>
<td><div class="tabletext"> <a href="<@ofbizUrl>EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${(location.locationSeqId)?if_exists}</@ofbizUrl>" class="buttontext">${(location.locationSeqId)?if_exists}</a></div></td>
- <td><div class="tabletext"> ${(locationTypeEnum.description)?default(location.locationTypeEnumId?if_exists)}</div></td>
+ <td><div class="tabletext"> ${(locationTypeEnum.get("description",locale))?default(location.locationTypeEnumId?if_exists)}</div></td>
<td><div class="tabletext"> ${(location.areaId)?if_exists}</div></td>
<td><div class="tabletext"> ${(location.aisleId)?if_exists}</div></td>
<td><div class="tabletext"> ${(location.sectionId)?if_exists}</div></td>
Modified: trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/FindFacilityTransfers.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -61,7 +61,7 @@
<td>
<#if (transfer.statusId)?exists>
<#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
- <div class="tabletext"> ${(transferStatus.description)?if_exists}</div>
+ <div class="tabletext"> ${(transferStatus.get("description",locale))?if_exists}</div>
</#if>
</td>
<td align="center"><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div></td>
@@ -95,7 +95,7 @@
<td>
<#if (transfer.statusId)?exists>
<#assign transferStatus = delegator.findByPrimaryKey("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", transfer.statusId))>
- <div class="tabletext"> ${(transferStatus.description)?if_exists}</div>
+ <div class="tabletext"> ${(transferStatus.get("description",locale))?if_exists}</div>
</#if>
</td>
<td align="center"><div class="tabletext"><a href="<@ofbizUrl>TransferInventoryItem?inventoryTransferId=${(transfer.inventoryTransferId)?if_exists}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a></div></td>
Modified: trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/PickMoveStock.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -62,8 +62,8 @@
<#assign totalQuantity = moveByOisgirInfo.totalQuantity>
<tr>
<td><div class="tabletext">${product.internalName?if_exists} [${product.productId}]</div></td>
- <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
- <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
+ <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.get("description",locale)})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
+ <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.get("description",locale)})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
<td><div class="tabletext">${totalQuantity?string.number}</div></td>
<td align="right">
<input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
@@ -87,8 +87,8 @@
<#assign totalQuantity = moveByPflInfo.totalQuantity>
<tr>
<td><div class="tabletext">${product.internalName?if_exists} [${product.productId}]</div></td>
- <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.description})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
- <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.description})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
+ <td><div class="tabletext">${facilityLocationFrom.areaId?if_exists}:${facilityLocationFrom.aisleId?if_exists}:${facilityLocationFrom.sectionId?if_exists}:${facilityLocationFrom.levelId?if_exists}:${facilityLocationFrom.positionId?if_exists}<#if facilityLocationTypeEnumFrom?has_content>(${facilityLocationTypeEnumFrom.get("description",locale)})</#if>[${facilityLocationFrom.locationSeqId}]</div></td>
+ <td><div class="tabletext">${facilityLocationTo.areaId?if_exists}:${facilityLocationTo.aisleId?if_exists}:${facilityLocationTo.sectionId?if_exists}:${facilityLocationTo.levelId?if_exists}:${facilityLocationTo.positionId?if_exists}<#if facilityLocationTypeEnumTo?has_content>(${facilityLocationTypeEnumTo.get("description",locale)})</#if>[${facilityLocationTo.locationSeqId}]</div></td>
<td><div class="tabletext">${totalQuantity?string.number}</div></td>
<td align="right">
<input type="hidden" name="productId_o_${rowCount}" value="${product.productId?if_exists}">
Modified: trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl
===================================================================
--- trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -50,7 +50,7 @@
<tr><td colspan="7"><hr class='sepbar'></td></tr>
<tr>
<td align="right" valign="top" width="10%">
- <div class="tabletext"> <b>${contactMechMap.contactMechType.description}</b></div>
+ <div class="tabletext"> <b>${contactMechMap.contactMechType.get("description",locale)}</b></div>
</td>
<td width="5"> </td>
<td align="left" valign="top" width="80%">
@@ -58,7 +58,7 @@
<#assign contactMechPurposeType = facilityContactMechPurpose.getRelatedOneCache("ContactMechPurposeType")>
<div class="tabletext">
<#if contactMechPurposeType?has_content>
- <b>${contactMechPurposeType.description}</b>
+ <b>${contactMechPurposeType.get("description",locale)}</b>
<#else>
<b>${uiLabelMap.ProductPurposeTypeNotFoundWithId}: "${facilityContactMechPurpose.contactMechPurposeTypeId}"</b>
</#if>
Modified: trunk/applications/product/webapp/facility/group/EditFacilityGroup.ftl
===================================================================
--- trunk/applications/product/webapp/facility/group/EditFacilityGroup.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/group/EditFacilityGroup.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -55,9 +55,9 @@
<td> </td>
<td width="74%">
<select name="facilityGroupTypeId" size="1" class="selectBox">
- <option selected value="${(facilityGroupType.facilityGroupTypeId)?if_exists}">${(facilityGroupType.description)?if_exists}</option>
+ <option selected value="${(facilityGroupType.facilityGroupTypeId)?if_exists}">${(facilityGroupType.get("description",locale))?if_exists}</option>
<#list facilityGroupTypes as nextFacilityGroupType>
- <option value="${(nextFacilityGroupType.facilityGroupTypeId)?if_exists}">${(nextFacilityGroupType.description)?if_exists}</option>
+ <option value="${(nextFacilityGroupType.facilityGroupTypeId)?if_exists}">${(nextFacilityGroupType.get("description",locale))?if_exists}</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl
===================================================================
--- trunk/applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/group/EditFacilityGroupMembers.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -26,7 +26,7 @@
*@since 2.2
-->
- <div class="head1">${uiLabelMap.ProductFacilities} <span class="head2">for <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]</span></div>
+ <div class="head1">${uiLabelMap.ProductFacilities} <span class="head2">${uiLabelMap.CommonFor} <#if facilityGroup?exists>${(facilityGroup.facilityGroupName)?if_exists}</#if> [${uiLabelMap.CommonId}:${facilityGroupId?if_exists}]</span></div>
<a href="<@ofbizUrl>EditFacilityGroup</@ofbizUrl>" class="buttontext">[${uiLabelMap.ProductNewGroup}]</a>
<#if (activeOnly) >
<a href="<@ofbizUrl>EditFacilityGroupMembers?facilityGroupId=${facilityGroupId}&activeOnly=false</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonActiveInactive}]</a>
Modified: trunk/applications/product/webapp/facility/group/EditFacilityGroupRoles.ftl
===================================================================
--- trunk/applications/product/webapp/facility/group/EditFacilityGroupRoles.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/group/EditFacilityGroupRoles.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -42,7 +42,7 @@
<#assign roleType = facilityGroupRole.getRelatedOne("RoleType")?if_exists>
<tr valign="middle">
<td><a href="/partymgr/control/viewprofile?party_id=${facilityGroupRole.partyId}" class="buttontext">${facilityGroupRole.partyId}</a></td>
- <td><div class="tabletext">${roleType.description}</div></td>
+ <td><div class="tabletext">${roleType.get("description",locale)}</div></td>
<td align="center">
<a href="<@ofbizUrl>removePartyFromFacilityGroup?facilityGroupId=${facilityGroupRole.facilityGroupId}&partyId=${facilityGroupRole.partyId}&roleTypeId=${facilityGroupRole.roleTypeId}</@ofbizUrl>" class="buttontext">
[${uiLabelMap.CommonDelete}]</a>
@@ -60,7 +60,7 @@
${uiLabelMap.PartyRoleType} :
<select name="roleTypeId" class="selectBox"><option></option>
<#list roles as role>
- <option value="${role.roleTypeId}">${role.description}</option>
+ <option value="${role.roleTypeId}">${role.get("description",locale)}</option>
</#list>
</select>
<input type="submit" value="${uiLabelMap.CommonAdd}">
Modified: trunk/applications/product/webapp/facility/group/FindFacilityGroup.ftl
===================================================================
--- trunk/applications/product/webapp/facility/group/FindFacilityGroup.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/group/FindFacilityGroup.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -41,7 +41,7 @@
<#assign facilityGroupType = facilityGroup.getRelatedOne("FacilityGroupType")?if_exists>
<tr valign="middle">
<td><div class='tabletext'> <a href='<@ofbizUrl>EditFacilityGroup?facilityGroupId=${facilityGroup.facilityGroupId?if_exists}</@ofbizUrl>' class="buttontext">${facilityGroup.facilityGroupName?if_exists} [${facilityGroup.facilityGroupId?if_exists}]</a></div></td>
- <td><div class='tabletext'> ${facilityGroupType.description?if_exists}</div></td>
+ <td><div class='tabletext'> ${facilityGroupType.get("description",locale)?if_exists}</div></td>
<td><div class='tabletext'> ${facilityGroup.description?if_exists}</div></td>
<td>
<a href='<@ofbizUrl>EditFacilityGroup?facilityGroupId=${facilityGroup.facilityGroupId?if_exists}</@ofbizUrl>' class="buttontext">
Modified: trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/inventory/EditInventoryItem.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -58,11 +58,11 @@
<td>
<select name="inventoryItemTypeId" size="1" class="selectBox">
<#if inventoryItemType?exists>
- <option selected value="${inventoryItemType.inventoryItemTypeId}">${inventoryItemType.description}</option>
+ <option selected value="${inventoryItemType.inventoryItemTypeId}">${inventoryItemType.get("description",locale)}</option>
<option value="${inventoryItemType.inventoryItemTypeId}">----</option>
</#if>
<#list inventoryItemTypes as nextInventoryItemType>
- <option value="${nextInventoryItemType.inventoryItemTypeId}">${nextInventoryItemType.description}</option>
+ <option value="${nextInventoryItemType.inventoryItemTypeId}">${nextInventoryItemType.get("description",locale)}</option>
</#list>
</select>
</td>
@@ -73,7 +73,7 @@
<td>
<input type="text" name="productId" value="${inventoryItemData.productId?if_exists}" size="20" maxlength="20" class="inputBox">
<#if (inventoryItem.productId)?has_content>
- <a href="/catalog/control/EditProduct?productId=${inventoryItem.productId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">[Edit Product ${inventoryItem.productId}]</a>
+ <a href="/catalog/control/EditProduct?productId=${inventoryItem.productId}&externalLoginKey=${externalLoginKey?if_exists}" class="buttontext">[${uiLabelMap.CommonEdit} ${uiLabelMap.ProductProduct} ${inventoryItem.productId}]</a>
</#if>
</td>
</tr>
@@ -89,7 +89,7 @@
<td>
<select name="statusId" class="selectBox">
<#if (inventoryItem.statusId)?has_content>
- <option value="${inventoryItem.statusId}">${(curStatusItem.description)?default("[" + inventoryItem.statusId + "]")}</option>
+ <option value="${inventoryItem.statusId}">${(curStatusItem.get("description",locale))?default("[" + inventoryItem.statusId + "]")}</option>
<option value="${inventoryItem.statusId}">----</option>
</#if>
<#if !tryEntity && requestParameters.statusId?has_content>
Modified: trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -81,7 +81,7 @@
<td width="6%"> </td>
<td width="74%">
<#if inventoryItemType?exists>
- <div class="tabletext">${(inventoryItemType.description)?if_exists}</div>
+ <div class="tabletext">${(inventoryItemType.get("description",locale))?if_exists}</div>
</#if>
</td>
</tr>
@@ -101,7 +101,7 @@
<td width="6%"> </td>
<td width="74%">
<#if inventoryStatus?exists>
- <div class="tabletext">${(inventoryStatus.description)?if_exists}</div>
+ <div class="tabletext">${(inventoryStatus.get("description",locale))?if_exists}</div>
<#else>
<div class="tabletext">--</div>
</#if>
@@ -148,7 +148,7 @@
<select name="statusId" class="selectBox">
<#if (inventoryTransfer.statusId)?exists>
<#assign curStatusItem = inventoryTransfer.getRelatedOneCache("StatusItem")>
- <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.description)?if_exists}</option>
+ <option value="${(inventoryTransfer.statusId)?if_exists}">${(curStatusItem.get("description",locale))?if_exists}</option>
</#if>
<#list statusItems as statusItem>
<option value="${(statusItem.statusId)?if_exists}">${(statusItem.get("description",locale))?if_exists}</option>
Modified: trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
===================================================================
--- trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -147,7 +147,7 @@
<#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
SELECTED
</#if>
- >${nextInventoryItemType.description?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+ >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
</td>
@@ -178,7 +178,7 @@
<#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
<#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
<#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
- <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.description})</#if>[${productFacilityLocation.locationSeqId}]</option>
+ <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
@@ -195,7 +195,7 @@
<select name="rejectionId_o_0" size="1" class="selectBox">
<option></option>
<#list rejectReasons as nextRejection>
- <option value="${nextRejection.rejectionId}">${nextRejection.description?default(nextRejection.rejectionId)}</option>
+ <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option>
</#list>
</select>
</td>
@@ -262,7 +262,7 @@
<tr>
<td width="5%" nowrap><input type="radio" name="shipmentId" value="${shipment.shipmentId}"></td>
<td width="5%" nowrap><div class="tabletext">${shipment.shipmentId}</div></td>
- <td><div class="tabletext">${shipmentType.description?default(shipmentType.shipmentTypeId?default(""))}</div></td>
+ <td><div class="tabletext">${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</div></td>
<td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
<td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td>
<td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td>
@@ -356,7 +356,7 @@
<#else>
<td width="45%">
<div class="tabletext">
- <b>${orderItemType.description}</b> : ${orderItem.itemDescription?if_exists}
+ <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" class="inputBox" size="12" name="productId_o_${rowCount}"/>
<a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</div>
@@ -374,7 +374,7 @@
<#assign facility = productFacilityLocation.getRelatedOneCache("Facility")/>
<#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists/>
<#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists/>
- <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.description})</#if>[${productFacilityLocation.locationSeqId}]</option>
+ <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
@@ -398,7 +398,7 @@
<#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
SELECTED
</#if>
- >${nextInventoryItemType.description?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+ >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
</td>
@@ -409,7 +409,7 @@
<select name="rejectionId_o_${rowCount}" size="1" class="selectBox">
<option></option>
<#list rejectReasons as nextRejection>
- <option value="${nextRejection.rejectionId}">${nextRejection.description?default(nextRejection.rejectionId)}</option>
+ <option value="${nextRejection.rejectionId}">${nextRejection.get("description",locale)?default(nextRejection.rejectionId)}</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
===================================================================
--- trunk/applications/product/webapp/facility/returns/receiveReturn.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/returns/receiveReturn.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -121,7 +121,7 @@
<#elseif orderItem?has_content>
<td width="45%">
<div class="tabletext">
- ${returnItem.returnItemSeqId}: <b>${orderItemType.description}</b> : ${orderItem.itemDescription?if_exists}
+ ${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" class="inputBox" size="12" name="productId_o_${rowCount}">
<a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</div>
@@ -129,7 +129,7 @@
<#else>
<td width="45%">
<div class="tabletext">
- ${returnItem.returnItemSeqId}: ${returnItem.description?if_exists}
+ ${returnItem.returnItemSeqId}: ${returnItem.get("description",locale)?if_exists}
</div>
</td>
</#if>
@@ -147,7 +147,7 @@
<#assign facility = productFacilityLocation.getRelatedOneCache("Facility")>
<#assign facilityLocation = productFacilityLocation.getRelatedOne("FacilityLocation")?if_exists>
<#assign facilityLocationTypeEnum = (facilityLocation.getRelatedOneCache("TypeEnumeration"))?if_exists>
- <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.description})</#if>[${productFacilityLocation.locationSeqId}]</option>
+ <option value="${productFacilityLocation.locationSeqId}"><#if facilityLocation?exists>${facilityLocation.areaId?if_exists}:${facilityLocation.aisleId?if_exists}:${facilityLocation.sectionId?if_exists}:${facilityLocation.levelId?if_exists}:${facilityLocation.positionId?if_exists}</#if><#if facilityLocationTypeEnum?exists>(${facilityLocationTypeEnum.get("description",locale)})</#if>[${productFacilityLocation.locationSeqId}]</option>
</#list>
<option value="">${uiLabelMap.ProductNoLocation}</option>
</select>
@@ -171,7 +171,7 @@
<#if (facility.defaultInventoryItemTypeId?has_content) && (nextInventoryItemType.inventoryItemTypeId == facility.defaultInventoryItemTypeId)>
SELECTED
</#if>
- >${nextInventoryItemType.description?default(nextInventoryItemType.inventoryItemTypeId)}</option>
+ >${nextInventoryItemType.get("description",locale)?default(nextInventoryItemType.inventoryItemTypeId)}</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -36,7 +36,7 @@
</a>
</span>
${uiLabelMap.ProductOrderShipGroupId} : <input type="text" class='inputBox' size="20" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/>
- <input type="submit" value="Select" class="smallSubmit"/>
+ <input type="submit" value="${uiLabelMap.CommonSelect}" class="smallSubmit"/>
</div>
</form>
@@ -46,11 +46,11 @@
</#if>
<#if orderHeader?exists>
<#if orderHeader.orderTypeId == "SALES_ORDER" && shipment.shipmentTypeId?if_exists != "SALES_SHIPMENT">
- <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.description)?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</div>
+ <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotSalesShipment}.</div>
<#elseif orderHeader.orderTypeId == "PURCHASE_ORDER" && shipment.shipmentTypeId?if_exists != "PURCHASE_SHIPMENT">
- <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.description)?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</div>
+ <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}, ${uiLabelMap.ProductNotPurchaseShipment}.</div>
<#else>
- <div class="head3">${uiLabelMap.ProductNoteOrderType} ${(orderType.description)?default(orderHeader.orderTypeId?if_exists)}.</div>
+ <div class="head3">${uiLabelMap.ProductNoteOrderType} ${(orderType.get("description",locale))?default(orderHeader.orderTypeId?if_exists)}.</div>
</#if>
<#if shipment.shipmentTypeId?if_exists == "SALES_SHIPMENT">
<div class="head3">${uiLabelMap.ProductOriginFacilityIs}: <#if originFacility?exists>${originFacility.facilityName?if_exists} [${originFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></div>
@@ -58,11 +58,11 @@
<div class="head3">${uiLabelMap.ProductDestinationFacilityIs}: <#if destinationFacility?exists>${destinationFacility.facilityName?if_exists} [${destinationFacility.facilityId}]<#else><span style="color: red;">${uiLabelMap.ProductNotSet}</span></#if></div>
</#if>
<#if "ORDER_APPROVED" == orderHeader.statusId || "ORDER_BACKORDERED" == orderHeader.statusId>
- <div class="head3">${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.description)?default(orderHeader.statusId?if_exists)}.</div>
+ <div class="head3">${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}.</div>
<#elseif "ORDER_COMPLETED" == orderHeader.statusId>
- <div class="head3">${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.description)?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.</div>
+ <div class="head3">${uiLabelMap.ProductNoteOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}, ${uiLabelMap.ProductNoItemsLeft}.</div>
<#else>
- <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.description)?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</div>
+ <div class="head3" style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</div>
</#if>
</#if>
<#if orderItemDatas?exists>
@@ -76,7 +76,7 @@
<input type="hidden" name="_useRowSubmit" value="Y">
<table width="100%" cellpadding="2" cellspacing="0" border="1">
<tr>
- <td><div class="tableheadtext">${uiLabelMap.ProductOrderId}/Ship Group/${uiLabelMap.ProductOrderItem}</div></td>
+ <td><div class="tableheadtext">${uiLabelMap.ProductOrderId}/${uiLabelMap.ProductOrderShipGroupId}/${uiLabelMap.ProductOrderItem}</div></td>
<td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td>
<#if isSalesOrder>
<td><div class="tableheadtext">${uiLabelMap.ProductItemsIssuedReserved}</div></td>
Modified: trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -50,13 +50,13 @@
<td><span class="tabletext">${uiLabelMap.ProductWeightUnit}:</span>
<select name="weightUomId" class="selectBox">
<#if weightUom?has_content>
- <option value="${weightUom.uomId}">${weightUom.description}</option>
+ <option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option>
<option value="${weightUom.uomId}">---</option>
<#else>
<option value=""> </option>
</#if>
<#list weightUoms as weightUomOption>
- <option value="${weightUomOption.uomId}">${weightUomOption.description} [${weightUomOption.abbreviation}]</option>
+ <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option>
</#list>
</select>
</td>
@@ -142,7 +142,7 @@
<td><span class="tabletext">${uiLabelMap.ProductWeightUnit} :</span>
<select name="weightUomId" class="selectBox">
<#list weightUoms as weightUomOption>
- <option value="${weightUomOption.uomId}">${weightUomOption.description} [${weightUomOption.abbreviation}]</option>
+ <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/EditShipmentPlan.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -23,7 +23,7 @@
*
-->
<#if shipment?exists>
- <div class="head1">Shipment Plan</div>
+ <div class="head1">${uiLabelMap.ProductShipmentPlan}</div>
${findOrderItemsForm.renderFormString(context)}
<br/>
<#if addToShipmentPlanRows?has_content>
@@ -50,8 +50,8 @@
<br/>
</#if>
${listShipmentPlanForm.renderFormString(context)}
- <div class="head2">Total weight: ${totWeight}</div>
- <div class="head2">Total volume: ${totVolume}</div>
+ <div class="head2">${uiLabelMap.ProductShipmentTotalWeight}: ${totWeight}</div>
+ <div class="head2">${uiLabelMap.ProductShipmentTotalVolume}: ${totVolume}</div>
${shipmentPlanToOrderItemsForm.renderFormString(context)}
<#else>
<h3>${uiLabelMap.ProductShipmentNotFoundId} : [${shipmentId?if_exists}]</h3>
Modified: trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -86,13 +86,13 @@
</select>
<select name="shipmentMethodTypeId" class="selectBox">
<#if shipmentMethodType?has_content>
- <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.description}</option>
+ <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option>
<option value="${shipmentMethodType.shipmentMethodTypeId}">---</option>
<#else>
<option value=""> </option>
</#if>
<#list shipmentMethodTypes as shipmentMethodTypeOption>
- <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.description}</option>
+ <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option>
</#list>
</select>
<br/>
@@ -181,25 +181,25 @@
<input type="text" size="5" name="billingWeight" value="${shipmentRouteSegment.billingWeight?if_exists}" class="inputBox"/>
<select name="billingWeightUomId" class="selectBox">
<#if billingWeightUom?has_content>
- <option value="${billingWeightUom.uomId}">${billingWeightUom.description} [${billingWeightUom.abbreviation}]</option>
+ <option value="${billingWeightUom.uomId}">${billingWeightUom.get("description",locale)} [${billingWeightUom.abbreviation}]</option>
<option value="${billingWeightUom.uomId}">---</option>
<#else>
<option value=""> </option>
</#if>
<#list weightUoms as weightUom>
- <option value="${weightUom.uomId}">${weightUom.description} [${weightUom.abbreviation}]</option>
+ <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option>
</#list>
</select>
<br/>
<select name="currencyUomId" class="selectBox">
<#if currencyUom?has_content>
- <option value="${currencyUom.uomId}">${currencyUom.description} [${currencyUom.uomId}]</option>
+ <option value="${currencyUom.uomId}">${currencyUom.get("description",locale)} [${currencyUom.uomId}]</option>
<option value="${currencyUom.uomId}">---</option>
<#else>
<option value=""> </option>
</#if>
<#list currencyUoms as altCurrencyUom>
- <option value="${altCurrencyUom.uomId}">${altCurrencyUom.description} [${altCurrencyUom.uomId}]</option>
+ <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option>
</#list>
</select>
<br/>
@@ -273,7 +273,7 @@
</select>
<select name="shipmentMethodTypeId" class="selectBox">
<#list shipmentMethodTypes as shipmentMethodTypeOption>
- <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.description}</option>
+ <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option>
</#list>
</select>
<br/>
@@ -317,14 +317,14 @@
<select name="billingWeightUomId" class="selectBox">
<option value=""> </option>
<#list weightUoms as weightUom>
- <option value="${weightUom.uomId}">${weightUom.description} [${weightUom.abbreviation}]</option>
+ <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option>
</#list>
</select>
<br/>
<select name="currencyUomId" class="selectBox">
<option value=""> </option>
<#list currencyUoms as altCurrencyUom>
- <option value="${altCurrencyUom.uomId}">${altCurrencyUom.description} [${altCurrencyUom.uomId}]</option>
+ <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option>
</#list>
</select>
<br/>
Modified: trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/FindShipment.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/FindShipment.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -71,12 +71,12 @@
<td>
<select name="shipmentTypeId" class="selectBox">
<#if currentShipmentType?has_content>
- <option value="${currentShipmentType.shipmentTypeId}">${currentShipmentType.description}</option>
+ <option value="${currentShipmentType.shipmentTypeId}">${currentShipmentType.get("description",locale)}</option>
<option value="${currentShipmentType.shipmentTypeId}">---</option>
</#if>
<option value="">${uiLabelMap.ProductAnyShipmentType}</option>
<#list shipmentTypes as shipmentType>
- <option value="${shipmentType.shipmentTypeId}">${shipmentType.description}</option>
+ <option value="${shipmentType.shipmentTypeId}">${shipmentType.get("description",locale)}</option>
</#list>
</select>
</td>
@@ -119,17 +119,17 @@
<td>
<select name="statusId" class="selectBox">
<#if currentStatus?has_content>
- <option value="${currentStatus.statusId}">${currentStatus.description}</option>
+ <option value="${currentStatus.statusId}">${currentStatus.get("description",locale)}</option>
<option value="${currentStatus.statusId}">---</option>
</#if>
<option value="">${uiLabelMap.ProductSalesShipmentStatus}</option>
<#list shipmentStatuses as shipmentStatus>
- <option value="${shipmentStatus.statusId}">${shipmentStatus.description}</option>
+ <option value="${shipmentStatus.statusId}">${shipmentStatus.get("description",locale)}</option>
</#list>
<option value="">---</option>
<option value="">${uiLabelMap.ProductPurchaseShipmentStatus}</option>
<#list purchaseShipmentStatuses as shipmentStatus>
- <option value="${shipmentStatus.statusId}">${shipmentStatus.description}</option>
+ <option value="${shipmentStatus.statusId}">${shipmentStatus.get("description",locale)}</option>
</#list>
</select>
@@ -186,7 +186,7 @@
<span class="submenutextdisabled">${uiLabelMap.CommonPrevious}</span>
</#if>
<#if (listSize > 0)>
- <span class="submenutextinfo">${lowIndex} - ${highIndex} of ${listSize}</span>
+ <span class="submenutextinfo">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if (listSize > highIndex)>
<a href="<@ofbizUrl>FindShipment?VIEW_SIZE=${viewSize}&VIEW_INDEX=${viewIndex+1}${paramList}&lookupFlag=Y</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonNext}</a>
@@ -202,7 +202,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2" class="boxbottom">
<tr>
<td width="5%" align="left"><div class="tableheadtext">${uiLabelMap.ProductShipmentId}</div></td>
- <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.ProductType}</div></td>
+ <td width="15%" align="left"><div class="tableheadtext">${uiLabelMap.ProductShipmentType}</div></td>
<td width="10%" align="left"><div class="tableheadtext">${uiLabelMap.ProductStatus}</div></td>
<td width="25%" align="left"><div class="tableheadtext">${uiLabelMap.ProductOriginFacility}</div></td>
<td width="25%" align="left"><div class="tableheadtext">${uiLabelMap.ProductDestFacility}</div></td>
@@ -221,7 +221,7 @@
<#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")?if_exists>
<tr class="${rowClass}">
<td><a href="<@ofbizUrl>ViewShipment?shipmentId=${shipment.shipmentId}</@ofbizUrl>" class="buttontext">${shipment.shipmentId}</a></td>
- <td><div class="tabletext">${shipmentType.description?default(shipmentType.shipmentTypeId?default(""))}</div></td>
+ <td><div class="tabletext">${shipmentType.get("description",locale)?default(shipmentType.shipmentTypeId?default(""))}</div></td>
<td><div class="tabletext">${statusItem.get("description",locale)?default(statusItem.statusId?default("N/A"))}</div></td>
<td><div class="tabletext">${(originFacility.facilityName)?if_exists} [${shipment.originFacilityId?if_exists}]</div></td>
<td><div class="tabletext">${(destinationFacility.facilityName)?if_exists} [${shipment.destinationFacilityId?if_exists}]</div></td>
Modified: trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/PackingSlip.fo.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -54,8 +54,8 @@
</fo:block>
<fo:block><fo:leader/></fo:block>
- <fo:block font-size="14pt">Shipment #${shipmentId}</fo:block>
- <fo:block font-size="12pt">Order #${shipment.primaryOrderId?default("N/A")} / ${shipment.primaryShipGroupSeqId?default("N/A")}</fo:block>
+ <fo:block font-size="14pt">${uiLabelMap.ProductShipmentId} #${shipmentId}</fo:block>
+ <fo:block font-size="12pt">${uiLabelMap.ProductOrderId} #${shipment.primaryOrderId?default("N/A")} / ${shipment.primaryShipGroupSeqId?default("N/A")}</fo:block>
<fo:block><fo:leader/></fo:block>
<fo:block space-after.optimum="10pt" font-size="10pt">
Modified: trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -89,13 +89,13 @@
<td width="1%" align="left" nowrap>
<select name="shipmentMethodTypeId" class="selectBox">
<#if shipmentMethodType?has_content>
- <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.description}</option>
+ <option value="${shipmentMethodType.shipmentMethodTypeId}">${shipmentMethodType.get("description",locale)}</option>
<option value="${shipmentMethodType.shipmentMethodTypeId}">---</option>
<#else>
<option value=""> </option>
</#if>
<#list shipmentMethodTypes as shipmentMethodTypeOption>
- <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.description}</option>
+ <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option>
</#list>
</select>
</td>
@@ -144,11 +144,11 @@
<input type="text" class="inputBox" name="weight">
<select name="weightUomId" class="selectBox">
<#if weightUom?has_content>
- <option value="${weightUom.uomId}">${weightUom.description}</option>
+ <option value="${weightUom.uomId}">${weightUom.get("description",locale)}</option>
<option value="${weightUom.uomId}">---</option>
</#if>
<#list weightUomList as weightUomOption>
- <option value="${weightUomOption.uomId}">${weightUomOption.description} [${weightUomOption.abbreviation}]</option>
+ <option value="${weightUomOption.uomId}">${weightUomOption.get("description",locale)} [${weightUomOption.abbreviation}]</option>
</#list>
</select>
</td>
Modified: trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml
===================================================================
--- trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/ShipmentForms.xml 2006-06-10 08:31:55 UTC (rev 7764)
@@ -31,8 +31,8 @@
<auto-fields-service service-name="updateShipment"/>
- <field use-when="shipment!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="This cannot be changed without re-creating the Shipment"><display/></field>
- <field use-when="shipment==null&&shipmentId!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="Could not find Shipment with ID [${shipmentId}]"><display description="" also-hidden="false"/></field>
+ <field use-when="shipment!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProductShipment}"><display/></field>
+ <field use-when="shipment==null&&shipmentId!=null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" tooltip="${uiLabelMap.ProductCouldNotFindProductShipmentWithId} [${shipmentId}]"><display description="" also-hidden="false"/></field>
<field use-when="shipment==null&&shipmentId==null" name="shipmentId" title="${uiLabelMap.ProductShipmentId}" ><ignored/></field>
<field name="shipmentTypeId" title="${uiLabelMap.ProductShipmentTypeId}" widget-style="selectBox">
@@ -101,10 +101,10 @@
<field name="handlingInstructions" title="${uiLabelMap.ProductHandlingInstructions}"><text/></field>
<field name="originContactMechId" title="${uiLabelMap.ProductOriginPostalAddressId}"
- tooltip="To: ${originPostalAddress.toName}, Attn: ${originPostalAddress.attnName}, ${originPostalAddress.address1}, ${originPostalAddress.address2}, ${originPostalAddress.city}, ${originPostalAddress.stateProvinceGeoId}, ${originPostalAddress.postalCode}, ${originPostalAddress.countryGeoId}" tooltip-style="tabletext">
+ tooltip="${uiLabelMap.CommonTo}: ${originPostalAddress.toName}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName}, ${originPostalAddress.address1}, ${originPostalAddress.address2}, ${originPostalAddress.city}, ${originPostalAddress.stateProvinceGeoId}, ${originPostalAddress.postalCode}, ${originPostalAddress.countryGeoId}" tooltip-style="tabletext">
</field>
<field name="destinationContactMechId" title="${uiLabelMap.ProductDestinationPostalAddressId}"
- tooltip="To: ${destinationPostalAddress.toName}, Attn: ${destinationPostalAddress.attnName}, ${destinationPostalAddress.address1}, ${destinationPostalAddress.address2}, ${destinationPostalAddress.city}, ${destinationPostalAddress.stateProvinceGeoId}, ${destinationPostalAddress.postalCode}, ${destinationPostalAddress.countryGeoId}" tooltip-style="tabletext">
+ tooltip="${uiLabelMap.CommonTo}: ${destinationPostalAddress.toName}, ${uiLabelMap.CommonAttn}: ${destinationPostalAddress.attnName}, ${destinationPostalAddress.address1}, ${destinationPostalAddress.address2}, ${destinationPostalAddress.city}, ${destinationPostalAddress.stateProvinceGeoId}, ${destinationPostalAddress.postalCode}, ${destinationPostalAddress.countryGeoId}" tooltip-style="tabletext">
</field>
<field name="originTelecomNumberId" title="${uiLabelMap.ProductOriginPhoneNumberId}"
tooltip="${originTelecomNumber.countryCode} ${originTelecomNumber.areaCode} ${originTelecomNumber.contactNumber}" tooltip-style="tabletext">
Modified: trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
===================================================================
--- trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl 2006-06-10 06:38:54 UTC (rev 7763)
+++ trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl 2006-06-10 08:31:55 UTC (rev 7764)
@@ -35,7 +35,7 @@
<tr>
<td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductShipmentType}</span></td>
<td><span class="tabletext"> </span></td>
- <td width="80%" align="left"><span class="tabletext">${(shipmentType.description)?default(shipment.shipmentTypeId?if_exists)}</span></td>
+ <td width="80%" align="left"><span class="tabletext">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</span></td>
</tr>
<tr>
<td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductStatus}</span></td>
@@ -48,7 +48,7 @@
<td width="80%" align="left"><span class="tabletext"><#if shipment.primaryOrderId?exists><a href="/ordermgr/control/orderview?orderId=${shipment.primaryOrderId}">${shipment.primaryOrderId}</a></#if></span></td>
</tr>
<tr>
- <td width="20%" align="right"><span class="tableheadtext">Primary Ship Group Seq ID</span></td>
+ <td width="20%" align="right"><span class="tableheadtext">${uiLabelMap.ProductPrimaryShipGroupSeqId}</span></td>
<td><span class="tabletext"> </span></td>
<td width="80%" align="left"><span class="tabletext">${shipment.primaryShipGroupSeqId?if_exists}</span></td>
</tr>
@@ -58,7 +58,7 @@
<td width="80%" align="left">
<span class="tabletext">
<span class="tableheadtext">${uiLabelMap.CommonReady}: </span>${(shipment.estimatedReadyDate.toString())?if_exists}
- <span class="tableheadtext">Ship: </span>${(shipment.estimatedShipDate.toString())?if_exists}
+ <span class="tableheadtext">${uiLabelMap.ProductEstimatedShipDate}: </span>${(shipment.estimatedShipDate.toString())?if_exists}
<span class="tableheadtext">${uiLabelMap.ProductArrival}: </span>${(shipment.estimatedArrivalDate.toString())?if_exists}
</span>
</td>
More information about the Svn
mailing list