You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/12/15 07:41:50 UTC
svn commit: r890670 - in /ofbiz/trunk: applications/accounting/config/
applications/accounting/widget/ applications/marketing/widget/
applications/party/config/ applications/product/config/
applications/product/webapp/catalog/product/ applications/prod...
Author: jleroux
Date: Tue Dec 15 06:41:50 2009
New Revision: 890670
URL: http://svn.apache.org/viewvc?rev=890670&view=rev
Log:
Replace other status labels by CommonStatus
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/marketing/widget/ReportForms.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
ofbiz/trunk/framework/common/config/CommonUiLabels.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Dec 15 06:41:50 2009
@@ -5209,20 +5209,6 @@
<property key="AccountingInvoicesDueSoon">
<value xml:lang="en">Invoices Due Soon</value>
</property>
- <property key="AccountingInvoiceStatus">
- <value xml:lang="ar">اÙÙضعÙات</value>
- <value xml:lang="de">Status</value>
- <value xml:lang="en">Status</value>
- <value xml:lang="es">Status</value>
- <value xml:lang="fr">Statut</value>
- <value xml:lang="hi_IN">सà¥à¤¥à¤¿à¤¤à¤¿</value>
- <value xml:lang="it">Stato</value>
- <value xml:lang="nl">Status</value>
- <value xml:lang="ro">Stadiu</value>
- <value xml:lang="ru">СÑаÑÑÑ</value>
- <value xml:lang="th">สà¸à¸²à¸à¸°</value>
- <value xml:lang="zh">ç¶æ</value>
- </property>
<property key="AccountingInvoiceStatusHistory">
<value xml:lang="ar">سÙاب٠اÙÙضعÙات</value>
<value xml:lang="de">Statusverlauf</value>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Tue Dec 15 06:41:50 2009
@@ -212,7 +212,7 @@
<include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<container style="lefthalf">
- <screenlet title="${uiLabelMap.AccountingInvoiceStatus}" navigation-form-name="ListInvoiceStatus">
+ <screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus">
<include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
@@ -266,7 +266,7 @@
<include-form name="invoiceHeader" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<container style="lefthalf">
- <screenlet title="${uiLabelMap.AccountingInvoiceStatus}" navigation-form-name="ListInvoiceStatus">
+ <screenlet title="${uiLabelMap.CommonStatus}" navigation-form-name="ListInvoiceStatus">
<include-form name="ListInvoiceStatus" location="component://accounting/widget/InvoiceForms.xml"/>
</screenlet>
<screenlet title="${uiLabelMap.AccountingAppliedPayments} ${appliedAmount?currency(${invoice.currencyUomId})} ${uiLabelMap.AccountingOpenPayments} ${notAppliedAmount?currency(${invoice.currencyUomId})}"
Modified: ofbiz/trunk/applications/marketing/widget/ReportForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Tue Dec 15 06:41:50 2009
@@ -79,7 +79,7 @@
<field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}">
<lookup target-form-name="LookupPartyName"/>
</field>
- <field name="statusId" title="${uiLabelMap.PartyStatus}">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
@@ -87,7 +87,7 @@
</entity-options>
</drop-down>
</field>
- <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.PartyStatus}">
+ <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
@@ -105,7 +105,7 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}>=)">
<date-time type="timestamp"/>
</field>
- <field name="statusDate" title="${uiLabelMap.PartyStatus} (${uiLabelMap.CommonDate}>=)">
+ <field name="statusDate" title="${uiLabelMap.CommonStatus} (${uiLabelMap.CommonDate}>=)">
<date-time type="timestamp"/>
</field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate} (${uiLabelMap.CommonDate}<)">
@@ -118,7 +118,7 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" title="${uiLabelMap.PartyStatus}">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<option key="" description="- ${uiLabelMap.CommonSelectAny} -"/>
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
@@ -160,11 +160,11 @@
</row-actions>
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><display/></field>
<field name="communicationEventTypeId" title="${uiLabelMap.MarketingContactListCommEventTypeId}"><display description="${communicationEventType.description}"/></field>
- <field name="statusId" title="${uiLabelMap.PartyStatus}">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<display-entity entity-name="StatusItem" description="${description}"/>
</field>
<field name="partyIdTo" title="${uiLabelMap.FormFieldTitle_toPartyId}"><display/></field>
- <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.PartyStatus}">
+ <field name="roleStatusId" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole} ${uiLabelMap.CommonStatus}">
<display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
</field>
<field name="partyIdFrom" title="${uiLabelMap.FormFieldTitle_fromPartyId}"><display/></field>
@@ -180,7 +180,7 @@
<field name="contactListId" title="${uiLabelMap.MarketingContactList}"><display/></field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
- <field name="statusDate" title="${uiLabelMap.PartyStatus} ${uiLabelMap.CommonDate}"><display/></field>
- <field name="statusId" title="${uiLabelMap.PartyStatus}"><display description="${statusItem.description}"/></field>
+ <field name="statusDate" title="${uiLabelMap.CommonStatus} ${uiLabelMap.CommonDate}"><display/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display description="${statusItem.description}"/></field>
</form>
</forms>
\ No newline at end of file
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Tue Dec 15 06:41:50 2009
@@ -9858,21 +9858,6 @@
<value xml:lang="pt_BR">Estado está em branco</value>
<value xml:lang="zh">缺å°ç</value>
</property>
- <property key="PartyStatus">
- <value xml:lang="de">Status</value>
- <value xml:lang="en">Status</value>
- <value xml:lang="es">Estado</value>
- <value xml:lang="fr">Statut</value>
- <value xml:lang="hi_IN">सà¥à¤¥à¤¿à¤¤à¤¿</value>
- <value xml:lang="it">Stati</value>
- <value xml:lang="nl">Status</value>
- <value xml:lang="pt_BR">Estado</value>
- <value xml:lang="pt_PT">Estado</value>
- <value xml:lang="ro">State</value>
- <value xml:lang="ru">СÑаÑÑÑ</value>
- <value xml:lang="th">สà¸à¸²à¸à¸°</value>
- <value xml:lang="zh">ç¶æ</value>
- </property>
<property key="PartyStillActive">
<value xml:lang="de">Immer noch aktiv</value>
<value xml:lang="en">Still Active</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Dec 15 06:41:50 2009
@@ -19474,17 +19474,6 @@
<value xml:lang="th">รัà¸</value>
<value xml:lang="zh">å·</value>
</property>
- <property key="ProductStatus">
- <value xml:lang="de">Status</value>
- <value xml:lang="en">Status</value>
- <value xml:lang="es">Estado</value>
- <value xml:lang="fr">Statut</value>
- <value xml:lang="it">Stati</value>
- <value xml:lang="ro">Stari</value>
- <value xml:lang="ru">СÑаÑÑÑ</value>
- <value xml:lang="th">สà¸à¸²à¸à¸°</value>
- <value xml:lang="zh">ç¶æ</value>
- </property>
<property key="ProductStatusId">
<value xml:lang="de">Status ID</value>
<value xml:lang="en">Status Id</value>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Tue Dec 15 06:41:50 2009
@@ -37,7 +37,7 @@
<tr class="header-row">
<td><b>${uiLabelMap.ProductItemId}</b></td>
<td><b>${uiLabelMap.ProductItemType}</b></td>
- <td><b>${uiLabelMap.ProductStatus}</b></td>
+ <td><b>${uiLabelMap.CommonStatus}</b></td>
<td><b>${uiLabelMap.CommonReceived}</b></td>
<td><b>${uiLabelMap.CommonExpire}</b></td>
<td><b>${uiLabelMap.ProductFacilityContainerId}</b></td>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Tue Dec 15 06:41:50 2009
@@ -81,7 +81,7 @@
</tr>
<tr>
<td width="14%"> </td>
- <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.ProductStatus}</span></td>
+ <td width="6%" align="right" nowrap><span class="label">${uiLabelMap.CommonStatus}</span></td>
<td width="6%"> </td>
<td width="74%">${(inventoryStatus.get("description",locale))?default("--")}</td>
</tr>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/FindShipment.ftl Tue Dec 15 06:41:50 2009
@@ -99,7 +99,7 @@
</td>
</tr>
<tr>
- <td width="25%" align="right" class="label">${uiLabelMap.ProductStatus}</td>
+ <td width="25%" align="right" class="label">${uiLabelMap.CommonStatus}</td>
<td width="5%"> </td>
<td>
<select name="statusId">
@@ -171,7 +171,7 @@
<tr class="header-row">
<td width="5%">${uiLabelMap.ProductShipmentId}</td>
<td width="15%">${uiLabelMap.ProductShipmentType}</td>
- <td width="10%">${uiLabelMap.ProductStatus}</td>
+ <td width="10%">${uiLabelMap.CommonStatus}</td>
<td width="25%">${uiLabelMap.ProductOriginFacility}</td>
<td width="25%">${uiLabelMap.ProductDestFacility}</td>
<td width="15%">${uiLabelMap.ProductShipDate}</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentInfo.ftl Tue Dec 15 06:41:50 2009
@@ -35,7 +35,7 @@
<td width="80%">${(shipmentType.get("description",locale))?default(shipment.shipmentTypeId?if_exists)}</td>
</tr>
<tr>
- <td width="20%" align="right" class="label">${uiLabelMap.ProductStatus}</td>
+ <td width="20%" align="right" class="label">${uiLabelMap.CommonStatus}</td>
<td width="80%">${(statusItem.get("description",locale))?default(shipment.statusId?if_exists)}</td>
</tr>
<tr>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Tue Dec 15 06:41:50 2009
@@ -1998,7 +1998,7 @@
<field name="subject"><display/></field>
<field name="communicationEventTypeId"><display-entity description="${description}" entity-name="CommunicationEventType" key-field-name="communicationEventTypeId"/></field>
<field name="contactMechTypeId"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field>
- <field name="statusId" title="${uiLabelMap.ProductStatus}">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<display-entity description="${description}" entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="lastUpdatedStampCE" title="Email Sent On"><display/></field>
Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=890670&r1=890669&r2=890670&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Tue Dec 15 06:41:50 2009
@@ -6846,7 +6846,7 @@
<value xml:lang="zh_CN">ç»è®¡</value>
</property>
<property key="CommonStatus">
- <value xml:lang="ar">ÙضعÙØ©</value>
+ <value xml:lang="ar">ÙضعÙØ©</value><!-- was in accounting <value xml:lang="ar">اÙÙضعÙات</value> -->
<value xml:lang="cs">Status</value>
<value xml:lang="de">Status</value>
<value xml:lang="en">Status</value>