Author: mrisaliti
Date: Tue Dec 21 21:09:42 2010
New Revision: 1051653
URL: http://svn.apache.org/viewvc?rev=1051653&view=rev
Log:
Replace some fail-message to fail-property tag in product component (OFBIZ-1874)
Modified:
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Tue Dec 21
21:09:42 2010
@@ -143,6 +143,10 @@
<value xml:lang="en">No Grouping</value>
<value xml:lang="it">Nessun raggruppamento</value>
</property>
+ <property key="FacilityNoOrdersReadyToPick">
+ <value xml:lang="en">No orders ready to pick, not creating
picklist.</value>
+ <value xml:lang="it">Nessun ordine pronto da prelevare.</value>
+ </property>
<property key="FacilityNoOtherShippingMethods">
<value xml:lang="de">Benutze Voreinstellung: Keine anderen
Liefermethoden verfügbar</value>
<value xml:lang="en">Use Default: No other shipping methods
available.</value>
@@ -169,6 +173,10 @@
<value xml:lang="zh">æç»å¤§äºçäº3</value>
<value xml:lang="zh_TW">é
ç®æ¸é大æ¼3</value>
</property>
+ <property key="FacilityReceiveInventoryProduct">
+ <value xml:lang="en">Tried to receive a serialized inventory item with
serialNumber ${parameters.serialNumber} or inventoryItemId
${parameters.currentInventoryItemId} passed in and quantityAccepted
${parameters.quantityAccepted} was greater than 1; we don't know what to do
with that!</value>
+ <value xml:lang="it">Tentativo di ricevere una riga di inventario
serializzata con un numero seriale ${parameters.serialNumber} o riga inventario
${parameters.currentInventoryItemId} passata e quantità accettata
${parameters.quantityAccepted} è maggiore di 1; non sappiamo come
trattarlo!</value>
+ </property>
<property key="FacilitySelectOptionsToGroupBy">
<value xml:lang="en">Select Options To Group</value>
<value xml:lang="it">Selezione opzioni da raggruppare</value>
@@ -16770,6 +16778,10 @@
<value xml:lang="zh">订åç¶æ</value>
<value xml:lang="zh_TW">è¨å®çæ
</value>
</property>
+ <property key="ProductOwnerPartyIsMissing">
+ <value xml:lang="en">Owner Party is missing</value>
+ <value xml:lang="it">Soggetto proprietario è mancante</value>
+ </property>
<property key="ProductPackItem">
<value xml:lang="de">Position verpacken</value>
<value xml:lang="en">Pack Item</value>
@@ -17502,6 +17514,10 @@
<value xml:lang="fr">Ajout d'une condition</value>
<value xml:lang="zh_TW">å¢å ä¸åæ°æ¢ä»¶</value>
</property>
+ <property key="ProductPriceTaxPercentageNotFound">
+ <value xml:lang="en">Tax Authority was specified but no Tax Percentage
passed in, and could not find one in the Tax Authority Rate Product settings,
so cannot handle price with tax included.</value>
+ <value xml:lang="it">Un'autorità tasse è stata specificata ma
nessuna percentuale di tasse è stata presente, e potrebbe non trovarla nelle
impostazioni su Tax Authority Rate Product, così non è possibile trattare il
prezzo con tasse incluse.</value>
+ </property>
<property key="ProductPriceTitle1">
<value xml:lang="en">Price charge</value>
<value xml:lang="fr">Frais lié au prix</value>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/cost/CostServices.xml
Tue Dec 21 21:09:42 2010
@@ -537,7 +537,9 @@ under the License.
<get-related-one relation-name="ProductStore"
to-value-field="productStore" value-field="facility"/>
<set field="organizationPartyId"
from-field="productStore.ownerPartyId"/>
<if-empty field="organizationPartyId">
- <add-error error-list-name="error_list"><fail-message
message="Owner Party is missing, please provide any of the Inventory Owner or
Facility Owner or ProductStore Owner."/></add-error>
+ <add-error error-list-name="error_list">
+ <fail-property resource="ProductUiLabels"
property="ProductOwnerPartyIsMissing"/>
+ </add-error>
</if-empty>
<check-errors/>
</if-empty>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/olap/ProductDimensionServices.xml
Tue Dec 21 21:09:42 2010
@@ -24,7 +24,9 @@ under the License.
<simple-method method-name="prepareProductDimensionData"
short-description="">
<entity-one entity-name="Product" value-field="product"/>
<if-empty field="product">
- <add-error><fail-message message="Product with id [${productId}]
doesn't exist."/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels"
property="ProductProductNotFoundWithProduct"/>
+ </add-error>
</if-empty>
<check-errors/>
<make-value value-field="productDimension"
entity-name="ProductDimension"/>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/product/price/PriceServices.xml
Tue Dec 21 21:09:42 2010
@@ -131,7 +131,7 @@ under the License.
<if-empty field="parameters.taxPercentage">
<add-error>
- <fail-message message="Tax Authority was specified but
no Tax Percentage passed in, and could not find one in the Tax Authority Rate
Product settings, so cannot handle price with tax included."/>
+ <fail-property resource="ProductUiLabels"
property="ProductPriceTaxPercentageNotFound"/>
</add-error>
<check-errors/>
</if-empty>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/picklist/PicklistServices.xml
Tue Dec 21 21:09:42 2010
@@ -680,7 +680,7 @@ under the License.
<log level="info" message="Not Creating Picklist with ID, nothing
to process."/>
<!-- return error messages saying no orders ready to pick, not
creating picklist -->
<add-error>
- <fail-message message="No orders ready to pick, not creating
picklist."/>
+ <fail-property resource="ProductUiLabels"
property="FacilityNoOrdersReadyToPick"/>
</add-error>
<check-errors/>
</else>
Modified:
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml?rev=1051653&r1=1051652&r2=1051653&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
(original)
+++
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/receipt/ShipmentReceiptServices.xml
Tue Dec 21 21:09:42 2010
@@ -82,7 +82,9 @@ under the License.
</and>
</condition>
<then>
- <add-error><fail-message message="Tried to receive a
serialized inventory item with serialNumber [${parameters.serialNumber}] or
inventoryItemId [${parameters.currentInventoryItemId}] passed in and
quantityAccepted [${parameters.quantityAccepted}] was greater than 1; we don't
know what to do with that!"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels"
property="FacilityReceiveInventoryProduct"/>
+ </add-error>
</then>
</if>