You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2010/12/22 20:19:58 UTC
svn commit: r1052036 - in /ofbiz/trunk/applications: party/config/
product/config/ product/script/org/ofbiz/product/inventory/
product/script/org/ofbiz/product/storage/
product/script/org/ofbiz/product/store/
product/script/org/ofbiz/shipment/issuance/...
Author: mrisaliti
Date: Wed Dec 22 19:19:57 2010
New Revision: 1052036
URL: http://svn.apache.org/viewvc?rev=1052036&view=rev
Log:
Replace some fail-message to fail-property tag in product/securityext component (OFBIZ-1874)
Modified:
ofbiz/trunk/applications/party/config/PartyUiLabels.xml
ofbiz/trunk/applications/product/config/ProductUiLabels.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechMapProcs.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Wed Dec 22 19:19:57 2010
@@ -4268,6 +4268,10 @@
<value xml:lang="zh">Cookie</value>
<value xml:lang="zh_TW">Cookie</value>
</property>
+ <property key="PartyCouldNotCreateNewPurpose">
+ <value xml:lang="en">Could not create new purpose, a purpose with that type already exists</value>
+ <value xml:lang="it">Non è possibile creare una nuova funzione, una funzione con quel tipo esiste già </value>
+ </property>
<property key="PartyCountry">
<value xml:lang="cs">ZemÄ</value>
<value xml:lang="de">Land</value>
@@ -9588,6 +9592,18 @@
<value xml:lang="zh">å®å
¨ç»</value>
<value xml:lang="zh_TW">å®å
¨ç¾¤çµ</value>
</property>
+ <property key="PartySecurityGroupCreatePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the SECURITY_CREATE or SECURITY_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso SECURITY_CREATE o SECURITY_ADMIN</value>
+ </property>
+ <property key="PartySecurityGroupDeletePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the SECURITY_DELETE or SECURITY_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso SECURITY_DELETE o SECURITY_ADMIN</value>
+ </property>
+ <property key="PartySecurityGroupUpdatePermissionError">
+ <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the SECURITY_UPDATE or SECURITY_ADMIN permission</value>
+ <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} tu devi avere il permesso SECURITY_UPDATE o SECURITY_ADMIN</value>
+ </property>
<property key="PartySegmentGroupId">
<value xml:lang="de">Segmentgruppe ID</value>
<value xml:lang="en">Segment Group Id</value>
@@ -10552,6 +10568,10 @@
<value xml:lang="zh">ä¼åç±»åæ è¯</value>
<value xml:lang="zh_TW">æå¡é¡åID</value>
</property>
+ <property key="PartyUnableToLocatePurpose">
+ <value xml:lang="en">Unable to locate purpose; cannot delete</value>
+ <value xml:lang="it">Non è possibile localizzare la funzione; non può essere cancellata</value>
+ </property>
<property key="PartyURI">
<value xml:lang="de">URI</value>
<value xml:lang="en">URI</value>
Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Wed Dec 22 19:19:57 2010
@@ -100,6 +100,10 @@
<value xml:lang="zh">ç»å称</value>
<value xml:lang="zh_TW">çµå稱</value>
</property>
+ <property key="FacilityReturnHeaderTypeNotSupported">
+ <value xml:lang="en">${returnHeader.returnHeaderTypeId} is not supported</value>
+ <value xml:lang="it">${returnHeader.returnHeaderTypeId} non è supportata</value>
+ </property>
<property key="FacilityHoldShipment">
<value xml:lang="en">Hold Shipment</value>
<value xml:lang="it">Congela spedizione</value>
@@ -118,7 +122,31 @@
<value xml:lang="zh_CN">åºå</value>
<value xml:lang="zh_TW">庫å</value>
</property>
- <property key="FacilityInventoryHistoryReport">
+ <property key="FacilityInventoryItemsMissingCurrencyId">
+ <value xml:lang="en">Error: you cannot create inventory items with no currencyUomId; you can set a default currency in the PartyAcctgPreference for the party ${inventoryItem.ownerPartyId}, or in the general.properties file under the key currency.uom.id.default.</value>
+ <value xml:lang="it">Errore: tu non puoi creare una riga di inventario senza indicare la valuta; puoi imposta la valuta di default attraverso le preferenze del soggetto proprietario ${inventoryItem.ownerPartyId}, o nel file general.properties alla chiave currency.uom.id.default.</value>
+ </property>
+ <property key="FacilityInventoryItemsMissingFacilityId">
+ <value xml:lang="en">Error: you cannot create inventory items with no facility id.</value>
+ <value xml:lang="it">Errore: tu non puoi creare una riga di inventario senza il codice stabilimento.</value>
+ </property>
+ <property key="FacilityInventoryItemsMissingOwnerPartyId">
+ <value xml:lang="en">Error: you cannot create inventory items with no ownerPartyId.</value>
+ <value xml:lang="it">Errore: tu non puoi creare una riga di inventario senza il soggetto proprietario.</value>
+ </property>
+ <property key="FacilityInventoryItemsMissingUnitCost">
+ <value xml:lang="en">Error: you cannot create inventory items with no unitCost.</value>
+ <value xml:lang="it">Errore: tu non puoi creare una riga di inventario senza nessun costo unitario.</value>
+ </property>
+ <property key="FacilityInventoryItemsNegativeUnitCost">
+ <value xml:lang="en">Error: you cannot create inventory items with a negative unitCost.</value>
+ <value xml:lang="it">Errore: tu non puoi creare una riga di inventario con un costo unitario negativo.</value>
+ </property>
+ <property key="FacilityInventoryItemsUnitCostCannotBeNegative">
+ <value xml:lang="en">Unit cost for inventory item ${lookupPKMap.inventoryItemId} cannot be negative.</value>
+ <value xml:lang="it">Costo unitario per la riga di inventario ${lookupPKMap.inventoryItemId} non può essere negativo.</value>
+ </property>
+ </property key="FacilityInventoryHistoryReport">
<value xml:lang="en">Inventory History Report</value>
</property>
<property key="FacilityMultipleLocations">
@@ -139,6 +167,14 @@
<value xml:lang="zh_CN">ä»å¨è®¾æ½</value>
<value xml:lang="zh_TW">æ²æå ´æ</value>
</property>
+ <property key="FacilityNoItemsAvailableToShip">
+ <value xml:lang="en">No items available to ship</value>
+ <value xml:lang="it">Nessun prodotto disponibile da spedire</value>
+ </property>
+ <property key="FacilityNoAssociatedWithProcuctStore">
+ <value xml:lang="en">Facility with id ${parameters.facilityId} is not associated to ProductStore with id ${parameters.productStoreId}, not reserving inventory.</value>
+ <value xml:lang="it">Stabilimento con id ${parameters.facilityId} non è associato al negozio con id ${parameters.productStoreId}, nessun inventario verrà riservato.</value>
+ </property>
<property key="FacilityNoGrouping">
<value xml:lang="en">No Grouping</value>
<value xml:lang="it">Nessun raggruppamento</value>
@@ -173,6 +209,22 @@
<value xml:lang="zh">æç»å¤§äºçäº3</value>
<value xml:lang="zh_TW">é
ç®æ¸é大æ¼3</value>
</property>
+ <property key="FacilityNoQuickShip">
+ <value xml:lang="en">No ProductStore associated with order; cannot use Quick Ship</value>
+ <value xml:lang="it">Nessun negozio associato con l'ordine; non puoi usare spedizione veloce</value>
+ </property>
+ <property key="FacilityNoQuickShipForNotInventoryFacility">
+ <value xml:lang="en">No inventory facility associated with ProductStore ${productStore.productStoreId}; cannot use Quick Ship</value>
+ <value xml:lang="it">Nessun inventario magazzino associato con il negozio ${productStore.productStoreId}; non puoi usare spedizione veloce</value>
+ </property>
+ <property key="FacilityNoQuickShipForNotReserveInventory">
+ <value xml:lang="en">ProductStore ${productStore.productStoreId} does not reserve inventory; cannot use Quick Ship</value>
+ <value xml:lang="it">Negozio ${productStore.productStoreId} non è possibile riservare inventario; non puoi usare spedizione veloce</value>
+ </property>
+ <property key="FacilityNoQuickShipForMultipleFacilities">
+ <value xml:lang="en">ProductStore ${productStore.productStoreId} allows multiple facilities; cannot use Quick Ship</value>
+ <value xml:lang="it">Negozio ${productStore.productStoreId} permette stabilimenti multipli; non puoi usare spedizione veloce</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>
@@ -442,12 +494,12 @@
<value xml:lang="it">Attenzione: nessuna spedizione creata; non â® possibile trovare niente di pronto da spedire.</value>
</property>
<property key="FacilityShipmentNotCreatedForNotReserveInventory">
- <value xml:lang="en">ProductStore {0} does not reserve inventory; cannot use Quick Ship for Multiple Facilities</value>
- <value xml:lang="it">Negozio {0} non riserva inventario; non â® possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
+ <value xml:lang="en">ProductStore ${productStore.productStoreId} does not reserve inventory; cannot use Quick Ship for Multiple Facilities</value>
+ <value xml:lang="it">Negozio ${productStore.productStoreId} non riserva inventario; non è possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
</property>
<property key="FacilityShipmentNotCreatedForExplodesOrderItems">
- <value xml:lang="en">ProductStore {0} explodes order items; cannot use Quick Ship for Multiple Facilities</value>
- <value xml:lang="it">Negozio {0} esplosione righe ordine; non â® possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
+ <value xml:lang="en">ProductStore ${productStore.productStoreId} explodes order items; cannot use Quick Ship for Multiple Facilities</value>
+ <value xml:lang="it">Negozio ${productStore.productStoreId} esplosione righe ordine; non è possibile utilizzare la spedizione veloce per stabilimenti multipli</value>
</property>
<property key="FacilityShipmentNoItemsAvailableToShip">
<value xml:lang="en">No items available to ship at this time for ship group ID {0}</value>
@@ -15557,6 +15609,42 @@
<value xml:lang="zh">没æå¯ç¨çåºåé¢è®¢ä¿¡æ¯</value>
<value xml:lang="zh_TW">æ²æå¯ç¨ç庫åé è¨è³è¨</value>
</property>
+ <property key="ProductNotIssueOrderForNotSalesOrders">
+ <value xml:lang="en">Not canceling ItemIssuance because the order is not a Sales Order</value>
+ <value xml:lang="it">Non è possibile cancellare la consegna perchè l'ordine non è di tipo ordine di vendita</value>
+ </property>
+ <property key="ProductNotIssueOrderQuantityCancelLess">
+ <value xml:lang="en">Not cancelling ItemIssuance ${parameters.itemIssuanceId} because the quantity to cancel ${toCancelQuantity} is less than 0</value>
+ <value xml:lang="it">Non è possibile cancellare la consegna ${parameters.itemIssuanceId} perchè la quantità da cancellare ${toCancelQuantity} è minore di zero</value>
+ </property>
+ <property key="ProductNotIssueOrderQuantityCancelGreater">
+ <value xml:lang="en">Not cancelling ItemIssuance because the quantity to cancel ${toCancelQuantity} is greater than the quantity left ${qtyIssuedLeft} for ItemIssuance ${parameters.itemIssuanceId}</value>
+ <value xml:lang="it">Non è possibile cancellare la consegna perchè la quantità da cancellare ${toCancelQuantity} è maggiore della quantità rimasta ${qtyIssuedLeft} per la consegna ${parameters.itemIssuanceId}</value>
+ </property>
+ <property key="ProductNotIssueOrderToShipment">
+ <value xml:lang="en">Not issuing Order Item Ship Group Inventory Reservation to shipment ${parameters.shipmentId} because the quantity to issue is empty for order ${orderItemShipGrpInvRes.orderId} order item ${orderItemShipGrpInvRes.orderItemSeqId} inventoryItem ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla spedizione ${parameters.shipmentId} perchè la quantità da consegnare è vuota per l'ordine ${orderItemShipGrpInvRes.orderId} riga ordine ${orderItemShipGrpInvRes.orderItemSeqId} riga inventario ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ </property>
+ <property key="ProductNotIssueOrderToShipmentQuantityLess">
+ <value xml:lang="en">Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue ${parameters.quantity} is less than or equal to 0 for order ${orderItemShipGrpInvRes.orderId} order item ${orderItemShipGrpInvRes.orderItemSeqId} inventoryItem ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla spedizione ${parameters.shipmentId} perchè la quantità da consegnare ${parameters.quantity} è minore o uguale a zero per l'ordine ${orderItemShipGrpInvRes.orderId} riga ordine ${orderItemShipGrpInvRes.orderItemSeqId} riga inventario ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ </property>
+ <property key="ProductNotIssueOrderToShipmentQuantityGreater">
+ <value xml:lang="en">Not issuing Order Item Ship Group Inventory Reservation to shipment ${parameters.shipmentId} because the quantity to issue ${parameters.quantity} is greater than the quantity left to issue ${orderItemShipGrpInvRes.quantity} for order ${orderItemShipGrpInvRes.orderId} order item ${orderItemShipGrpInvRes.orderItemSeqId} inventoryItem ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla spedizione ${parameters.shipmentId} perchè la quantità da consegnare ${parameters.quantity} è maggiore di quella rimasta da consegnare ${orderItemShipGrpInvRes.quantity} per l'ordine ${orderItemShipGrpInvRes.orderId} riga ordine ${orderItemShipGrpInvRes.orderItemSeqId} riga inventario ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ </property>
+ <property key="ProductNotIssueOrderToShipmentQuantityReturnGreater">
+ <value xml:lang="en">Not issuing Order Item Ship Group Inventory Reservation to shipment ${parameters.shipmentId} because the quantity to issue ${parameters.quantity} is greater than the quantity left to return ${orderItemShipGrpInvRes.quantity} for order ${orderItemShipGrpInvRes.orderId} order item ${orderItemShipGrpInvRes.orderItemSeqId} inventoryItem ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla spedizione ${parameters.shipmentId} perchè la quantità da consegnare ${parameters.quantity} è maggiore di quella rimasta da restituire ${orderItemShipGrpInvRes.quantity} per l'ordine ${orderItemShipGrpInvRes.orderId} riga ordine ${orderItemShipGrpInvRes.orderItemSeqId} riga inventario ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ </property>
+ <property key="ProductNotIssueToFixedAssetMaintQuantityLess">
+ <value xml:lang="en">Not issuing InventoryItem to FixedAssetMaint ${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId} because the quantity to issue ${parameters.quantity} is less than or equal to 0 for inventoryItem ${inventoryItem.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla manutenzione cespite ${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId} perchè la quantità da consegnare ${parameters.quantity} è minore o uguale a zero per la riga inventario ${inventoryItem.inventoryItemId}</value>
+ </property>
+ <property key="ProductNotIssueToFixedAssetMaintQuantityGreater">
+ <value xml:lang="en">Not issuing InventoryItem to FixedAssetMaint ${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId} because the quantity to issue ${parameters.quantity} is greater than the quantity left to issue (ie the ATP or Available To Promise) ${intentoryItem.availableToPromiseTotal} for inventoryItem ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ <value xml:lang="it">Non consegnabile inventario alla manutenzione cespite ${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId} perchè la quantità da consegnare ${parameters.quantity} è maggiore della quantità rimasta da consegnare ${intentoryItem.availableToPromiseTotal} per la riga inventario ${orderItemShipGrpInvRes.inventoryItemId}</value>
+ </property>
<property key="ProductNoItemsLeft">
<value xml:lang="de">es sollten keine Positionen mehr übrig sein zur Ausgabe für diesen Auftrag</value>
<value xml:lang="en">there should be no items left to issue from this order</value>
@@ -18119,17 +18207,29 @@
<value xml:lang="zh">产ååºéºç»æ è¯</value>
<value xml:lang="zh_TW">ç¢åååºç¾¤çµID</value>
</property>
- <property key="ProductProductStoreKeywordOverrideSettings">
- <value xml:lang="de">Laden Schlüsselwörter Ãbersteuerung Einstellungen</value>
- <value xml:lang="en">Product Store Keyword Override Settings</value>
- <value xml:lang="es">Configuración de reemplazo de palabras clave para la tienda</value>
- <value xml:lang="fr">Configuration des mots-clés du centre de profit</value>
- <value xml:lang="it">Configurazione Sovrapposizione Chiave Negozio</value>
- <value xml:lang="ro">Configurare Suprapunere Cheie Magazin </value>
- <value xml:lang="ru">ÐаÑÑÑойки клÑÑевÑÑ
Ñлов ÑоÑг.ÑоÑек пÑодÑкÑа</value>
- <value xml:lang="th">à¸à¸±à¹à¸à¸à¹à¸²à¸à¸²à¸£à¸¢à¸à¹à¸¥à¸´à¸à¸à¸µà¸¢à¹à¹à¸§à¸´à¸£à¹à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
- <value xml:lang="zh">产ååºéº å
³é®åæ¿ä»£è®¾ç½®</value>
- <value xml:lang="zh_TW">ç¢åååº ééµåæ¿ä»£è¨ç½®</value>
+ <property key="ProductProductStoreGroupId">
+ <value xml:lang="de">Ladengruppe ID</value>
+ <value xml:lang="en">Product Store Group Id</value>
+ <value xml:lang="es">Código del grupo de tiendas de productos</value>
+ <value xml:lang="fr">Réf. Groupe de centres de profit</value>
+ <value xml:lang="it">Gruppo Negozio</value>
+ <value xml:lang="ro">Grup Magazin id</value>
+ <value xml:lang="ru">Ðод гÑÑÐ¿Ð¿Ñ ÑоÑг.ÑоÑек пÑодÑкÑа</value>
+ <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
+ <value xml:lang="zh">产ååºéºç»æ è¯</value>
+ <value xml:lang="zh_TW">ç¢åååºç¾¤çµID</value>
+ </property>
+ <property key="ProductProductStoreNotFound">
+ <value xml:lang="en">No ProductStore found with id ${parameters.productStoreId}, not reserving inventory.</value>
+ <value xml:lang="it">Nessun negozio trovato con id ${parameters.productStoreId}, nessun inventario verrà riservato.</value>
+ </property>
+ <property key="ProductProductStoreNoSpecifiedInventoryFacility">
+ <value xml:lang="en">ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not reserving inventory.</value>
+ <value xml:lang="it">Negozio con id ${productStoreId} ha impostato il flag oneInventoryFacility ad Y ma inventoryFacilityId è vuoto, nessun inventario verrà riservato.</value>
+ </property>
+ <property key="ProductProductStoreNotCheckAvailability">
+ <value xml:lang="en">ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not checking available inventory.</value>
+ <value xml:lang="it">Negozio con id ${productStoreId} ha impostato il flag oneInventoryFacility ad Y ma inventoryFacilityId è vuoto, nessun controllo di disponibilità di inventario verrà effettuato.</value>
</property>
<property key="ProductProductStoreList">
<value xml:lang="de">Ladenliste</value>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml Wed Dec 22 19:19:57 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -82,7 +82,9 @@ under the License.
<if-empty field="mainAction">
<set field="mainAction" from-field="parameters.mainAction"/>
<if-empty field="mainAction">
- <add-error><fail-property resource="CommonUiLabels" property="CommonPermissionMainActionAttributeMissing"/></add-error>
+ <add-error>
+ <fail-property resource="CommonUiLabels" property="CommonPermissionMainActionAttributeMissing"/>
+ </add-error>
</if-empty>
</if-empty>
<check-errors/>
@@ -159,7 +161,7 @@ under the License.
</if>
<if-empty field="inventoryItem.facilityId">
<add-error>
- <fail-message message="Error: you cannot create inventory items with no facility id."/>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsMissingFacilityId"/>
</add-error>
<check-errors/>
</if-empty>
@@ -170,7 +172,7 @@ under the License.
<!-- if inventoryItem's ownerPartyId is still empty, return an error message -->
<if-empty field="inventoryItem.ownerPartyId">
<add-error>
- <fail-message message="Error: you cannot create inventory items with no ownerPartyId."/>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsMissingOwnerPartyId"/>
</add-error>
<check-errors/>
</if-empty>
@@ -189,7 +191,7 @@ under the License.
<!-- if inventoryItem's currencyUomId is still empty, return an error message -->
<if-empty field="inventoryItem.currencyUomId">
<add-error>
- <fail-message message="Error: you cannot create inventory items with no currencyUomId; you can set a default currency in the PartyAcctgPreference for the party [${inventoryItem.ownerPartyId}], or in the general.properties file under the key [currency.uom.id.default]."/>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsMissingCurrencyId"/>
</add-error>
<check-errors/>
</if-empty>
@@ -208,7 +210,7 @@ under the License.
<!-- TODO/WARNING: getProductCost returns 0 even if no std costs are found -->
<if-empty field="inventoryItem.unitCost">
<add-error>
- <fail-message message="Error: you cannot create inventory items with no unitCost."/>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsMissingUnitCost"/>
</add-error>
</if-empty>
<check-errors/>
@@ -217,7 +219,7 @@ under the License.
-->
<if-compare field="inventoryItem.unitCost" operator="less" value="0" type="BigDecimal">
<add-error>
- <fail-message message="Error: you cannot create inventory items with a negative unitCost."/>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsNegativeUnitCost"/>
</add-error>
</if-compare>
<check-errors/>
@@ -240,7 +242,9 @@ under the License.
<!-- special handling for the unitCost -->
<if-not-empty field="parameters.unitCost">
<if-compare field="parameters.unitCost" operator="less" value="0.0" type="BigDecimal">
- <add-error><fail-message message="Unit cost for inventory item [${lookupPKMap.inventoryItemId}] cannot be negative."/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityInventoryItemsUnitCostCannotBeNegative"/>
+ </add-error>
<check-errors/>
</if-compare>
</if-not-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechMapProcs.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechMapProcs.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechMapProcs.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechMapProcs.xml Wed Dec 22 19:19:57 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -22,19 +22,19 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- ContactMech map procs -->
<simple-map-processor name="facilityContactMech">
- <process field="contactMechTypeId"><copy/><not-empty><fail-message message="Contact Mech Type ID is missing"/></not-empty></process>
+ <process field="contactMechTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechTypeIdMissing"/></not-empty></process>
<process field="infoString"><copy/></process>
<process field="facilityId"><copy/></process>
<process field="extension"><copy/></process>
</simple-map-processor>
<simple-map-processor name="updateFacilityContactMech">
- <process field="contactMechId"><copy/><not-empty><fail-message message="Contact Mechanism ID is missing"/></not-empty></process>
+ <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process>
<process field="infoString"><copy/></process>
<process field="facilityId"><copy/></process>
<process field="extension"><copy/></process>
</simple-map-processor>
<simple-map-processor name="deleteFacilityContactMech">
- <process field="contactMechId"><copy/><not-empty><fail-message message="Contact Mechanism ID is missing"/></not-empty></process>
+ <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process>
<process field="facilityId"><copy/></process>
</simple-map-processor>
@@ -42,12 +42,12 @@ under the License.
<process field="facilityId"><copy/></process>
<process field="toName"><copy/></process>
<process field="attnName"><copy/></process>
- <process field="address1"><copy/><not-empty><fail-message message="Address Line 1 is missing"/></not-empty></process>
+ <process field="address1"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyAddressLine1Missing"/></not-empty></process>
<process field="address2"><copy/></process>
<process field="directions"><copy/></process>
- <process field="city"><copy/><not-empty><fail-message message="City is missing"/></not-empty></process>
+ <process field="city"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyCityMissing"/></not-empty></process>
<process field="stateProvinceGeoId"><copy/></process>
- <process field="postalCode"><copy/><not-empty><fail-message message="Zip/Postal Code is missing"/></not-empty></process>
+ <process field="postalCode"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPostalCodeMissing"/></not-empty></process>
<process field="countryGeoId"><copy/></process>
<process field="postalCodeGeoId"><copy/></process>
<process field="allowSolicitation"><copy/></process>
@@ -57,7 +57,7 @@ under the License.
<process field="facilityId"><copy/></process>
<process field="countryCode"><copy/></process>
<process field="areaCode"><copy/></process>
- <process field="contactNumber"><copy/><not-empty><fail-message message="Contact Number is missing"/></not-empty></process>
+ <process field="contactNumber"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactNumberMissing"/></not-empty></process>
<process field="extension"><copy/></process>
<process field="allowSolicitation"><copy/></process>
</simple-map-processor>
@@ -67,24 +67,24 @@ under the License.
<process field="facilityId"><copy/></process>
<process field="emailAddress">
<copy to-field="infoString"/>
- <not-empty><fail-message message="Email Address is missing"/></not-empty>
- <validate-method method="isEmail"><fail-message message="Email Address is not formatted correctly, must be like foo@bar.com"/></validate-method>
+ <not-empty><fail-property resource="PartyUiLabels" property="PartyEmailAddressMissing"/></not-empty>
+ <validate-method method="isEmail"><fail-property resource="PartyUiLabels" property="PartyEmailAddressNotFormattedCorrectly"/></validate-method>
</process>
</simple-map-processor>
<!-- FacilityContactMechPurpose map procs -->
<simple-map-processor name="createFacilityContactMechPurpose">
<process field="facilityId"><copy/></process>
- <process field="contactMechId"><copy/><not-empty><fail-message message="Contact Mech ID is missing"/></not-empty></process>
- <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-message message="Purpose type not specified, cannot add purpose to contact mechanism"/></not-empty></process>
+ <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process>
+ <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPurposeTypeMissingCannotAdd"/></not-empty></process>
</simple-map-processor>
<simple-map-processor name="deleteFacilityContactMechPurpose">
<process field="facilityId"><copy/></process>
- <process field="contactMechId"><copy/><not-empty><fail-message message="Contact Mech ID is missing"/></not-empty></process>
- <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-message message="Purpose type not specified, cannot remove purpose from contact mechanism"/></not-empty></process>
+ <process field="contactMechId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyContactMechIdMissing"/></not-empty></process>
+ <process field="contactMechPurposeTypeId"><copy/><not-empty><fail-property resource="PartyUiLabels" property="PartyPurposeTypeMissingCannotRemove"/></not-empty></process>
<process field="fromDate">
- <not-empty><fail-message message="From Date is missing"/></not-empty>
- <convert type="Timestamp"><fail-message message="From Date is not a valid Date-Time."/></convert>
+ <not-empty><fail-property resource="CommonUiLabels" property="CommonFromDateMissing"/></not-empty>
+ <convert type="Timestamp"><fail-property resource="CommonUiLabels" property="CommonFromDateNotValidDateTime"/></convert>
</process>
</simple-map-processor>
</simple-map-processors>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/storage/FacilityContactMechServices.xml Wed Dec 22 19:19:57 2010
@@ -76,7 +76,7 @@ under the License.
<first-from-list entry="facilityContactMech" list="facilityContactMechs"/>
<if-empty field="facilityContactMech">
<add-error>
- <fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified facility; query map was: ${facilityContactMechMap}"/>
+ <fail-property resource="PartyUiLabels" property="PartyCannotUpdateContactBecauseNotWithSpecifiedParty"/>
</add-error>
</if-empty>
<check-errors/>
@@ -328,7 +328,7 @@ under the License.
<if-not-empty field="purposeList">
<add-error>
- <fail-message message="Could not create new purpose, a purpose with that type already exists"/>
+ <fail-property resource="PartyUiLabels" property="PartyCouldNotCreateNewPurpose"/>
</add-error>
<check-errors/>
</if-not-empty>
@@ -358,7 +358,7 @@ under the License.
<if-empty field="purposeEntity">
<add-error>
- <fail-message message="Unable to locate purpose; cannot delete"/>
+ <fail-property resource="PartyUiLabels" property="PartyUnableToLocatePurpose"/>
</add-error>
<check-errors/>
</if-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/store/ProductStoreServices.xml Wed Dec 22 19:19:57 2010
@@ -458,7 +458,7 @@ under the License.
<entity-one entity-name="ProductStore" value-field="productStore" use-cache="true"/>
<if-empty field="productStore">
<add-error>
- <fail-message message="No ProductStore found with id ${parameters.productStoreId}, not reserving inventory."/>
+ <fail-property resource="ProductUiLabels" property="ProductProductStoreNotFound"/>
</add-error>
<check-errors/>
</if-empty>
@@ -478,7 +478,7 @@ under the License.
<if-compare value="Y" field="productStore.oneInventoryFacility" operator="equals">
<if-empty field="productStore.inventoryFacilityId">
<add-error>
- <fail-message message="ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not reserving inventory."/>
+ <fail-property resource="ProductUiLabels" property="ProductProductStoreNoSpecifiedInventoryFacility"/>
</add-error>
<check-errors/>
</if-empty>
@@ -549,7 +549,7 @@ under the License.
</iterate>
<if-empty field="facilityFound">
<add-error>
- <fail-message message="Facility with id ${parameters.facilityId} is not associated to ProductStore with id ${parameters.productStoreId}, not reserving inventory."/>
+ <fail-property resource="ProductUiLabels" property="FacilityNoAssociatedWithProcuctStore"/>
</add-error>
<check-errors/>
</if-empty>
@@ -642,7 +642,7 @@ under the License.
<if-compare value="Y" operator="equals" field="productStore.oneInventoryFacility">
<if-empty field="productStore.inventoryFacilityId">
<add-error>
- <fail-message message="ProductStore with id ${productStoreId} has Y for oneInventoryFacility but inventoryFacilityId is empty, not checking available inventory."/>
+ <fail-property resource="ProductUiLabels" property="ProductProductStoreNotCheckAvailability"/>
</add-error>
<check-errors/>
</if-empty>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/issuance/IssuanceServices.xml Wed Dec 22 19:19:57 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -134,7 +134,9 @@ under the License.
<!-- make sure specified quantity is not empty -->
<if-empty field="parameters.quantity">
- <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue is empty for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipment"/>
+ </add-error>
</if-empty>
<if-empty field="orderItemShipGrpInvRes.quantity">
<log level="info" message="Order item reservation amount is null! PK lookup: ${OrderItemShipGrpInvResLookupPk}"/>
@@ -142,11 +144,15 @@ under the License.
<!-- make sure specified quantity is not less than or equal to 0 -->
<if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
- <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipmentQuantityLess"/>
+ </add-error>
</if-compare>
<!-- make sure specified quantity is not greater than reserved quantity left to be issued, ie orderItemShipGrpInvRes.quantity -->
<if-compare-field field="parameters.quantity" to-field="orderItemShipGrpInvRes.quantity" operator="greater" type="BigDecimal">
- <add-error><fail-message message="Not issuing Order Item Ship Group Inventory Reservation to shipment [${parameters.shipmentId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue [${orderItemShipGrpInvRes.quantity}] for order [${orderItemShipGrpInvRes.orderId}] order item [${orderItemShipGrpInvRes.orderItemSeqId}] inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipmentQuantityGreater"/>
+ </add-error>
</if-compare-field>
<check-errors/>
@@ -372,11 +378,15 @@ under the License.
<!-- make sure specified quantity is not less than or equal to 0 -->
<if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
- <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for inventoryItem [${inventoryItem.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueToFixedAssetMaintQuantityLess"/>
+ </add-error>
</if-compare>
<!-- make sure specified quantity is not greater than available quantity left to be issued, ie intentoryItem.availableToPromiseTotal -->
<if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal">
- <add-error><fail-message message="Not issuing InventoryItem to FixedAssetMaint [${fixedAssetMaint.fixedAssetId:fixedAssetMaint.maintHistSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue (ie the ATP or Available To Promise) [${intentoryItem.availableToPromiseTotal}] for inventoryItem [${orderItemShipGrpInvRes.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueToFixedAssetMaintQuantityGreater"/>
+ </add-error>
</if-compare-field>
<check-errors/>
@@ -446,7 +456,9 @@ under the License.
<!-- make sure the order is of orderTypeId: SALES_ORDER -->
<if-compare field="orderHeader.orderTypeId" operator="not-equals" value="SALES_ORDER">
- <add-error><fail-message message="Not canceling ItemIssuance because the order is not a Sales Order"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderForNotSalesOrders"/>
+ </add-error>
</if-compare>
<!-- get the quantity that can be cancelled ItemIssuance -->
@@ -464,7 +476,9 @@ under the License.
<!-- make sure specified cancel Quantity is not less than or equal to 0 -->
<if-compare field="toCancelQuantity" operator="less" value="0" type="BigDecimal">
- <add-error><fail-message message="Not cancelling ItemIssuance [${parameters.itemIssuanceId}] because the quantity to cancel [${toCancelQuantity}] is less than 0 "/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderQuantityCancelLess"/>
+ </add-error>
</if-compare>
<if-compare field="toCancelQuantity" operator="equals" value="0" type="BigDecimal">
@@ -473,7 +487,9 @@ under the License.
<!-- make sure specified quantity is not greater than issued quantity left -->
<if-compare-field field="toCancelQuantity" to-field="qtyIssuedLeft" operator="greater" type="BigDecimal">
- <add-error><fail-message message="Not cancelling ItemIssuance because the quantity to cancel [${toCancelQuantity}] is greater than the quantity left [${qtyIssuedLeft}] for ItemIssuance [${parameters.itemIssuanceId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderQuantityCancelGreater"/>
+ </add-error>
</if-compare-field>
<check-errors/>
@@ -535,15 +551,21 @@ under the License.
</calculate>
<!-- make sure specified quantity is not less than or equal to 0 -->
<if-compare field="parameters.quantity" operator="less-equals" value="0" type="BigDecimal">
- <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:$${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is less than or equal to 0 for inventoryItem [${inventoryItem.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipmentQuantityLess"/>
+ </add-error>
</if-compare>
<!-- make sure specified quantity is not greater than available quantity left to be issued, i.e. intentoryItem.availableToPromiseTotal -->
<if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="BigDecimal">
- <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to issue (ie the ATP or Available To Promise) [${intentoryItem.availableToPromiseTotal}] for inventoryItem [${parameters.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipmentQuantityGreater"/>
+ </add-error>
</if-compare-field>
<!-- make sure specified quantity is not greater than total return quantity -->
<if-compare-field field="parameters.quantity" to-field="quantityNotIssued" operator="greater" type="BigDecimal">
- <add-error><fail-message message="Not issuing InventoryItem to Shipment [${parameters.shipmentId}:${parameters.shipmentItemSeqId}] because the quantity to issue [${parameters.quantity}] is greater than the quantity left to return for inventoryItem [${parameters.inventoryItemId}]"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="ProductNotIssueOrderToShipmentQuantityReturnGreater"/>
+ </add-error>
</if-compare-field>
<check-errors/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Wed Dec 22 19:19:57 2010
@@ -320,7 +320,7 @@ under the License.
</else-if>
<else>
<add-error>
- <fail-message message="${returnHeader.returnHeaderTypeId} is not supported"/>
+ <fail-property resource="ProductUiLabels" property="FacilityReturnHeaderTypeNotSupported"/>
</add-error>
<check-errors/>
</else>
@@ -1272,7 +1272,9 @@ under the License.
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
- <add-error><fail-property resource="ProductUiLabels" property="FacilityShipmentMissingProductStore"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityShipmentMissingProductStore"/>
+ </add-error>
<check-errors/>
</if-empty>
@@ -1283,15 +1285,15 @@ under the License.
<if-compare field="productStore.reserveInventory" operator="not-equals" value="Y">
<!-- no reservations; no shipment; cannot use quick ship -->
- <set field="argListNames[]" from-field="productStore.productStoreId"/>
- <property-to-field property="FacilityShipmentNotCreatedForNotReserveInventory" resource="ProductUiLabels" field="errMsg" arg-list-name="argListNames"/>
- <add-error><fail-message message="${errMsg}"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityShipmentNotCreatedForNotReserveInventory"/>
+ </add-error>
</if-compare>
<if-compare field="productStore.explodeOrderItems" operator="equals" value="Y">
<!-- can't insert duplicate rows in shipmentPackageContent -->
- <set field="argListNames[]" from-field="productStore.productStoreId"/>
- <property-to-field property="FacilityShipmentNotCreatedForExplodesOrderItems" resource="ProductUiLabels" field="errMsg" arg-list-name="argListNames"/>
- <add-error><fail-message message="${errMsg}"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityShipmentNotCreatedForExplodesOrderItems"/>
+ </add-error>
</if-compare>
<check-errors/>
@@ -1328,7 +1330,9 @@ under the License.
<field-to-result field="successMessageList"/>
<if-empty field="shipmentShipGroupFacilityList">
- <add-error><fail-property resource="ProductUiLabels" property="FacilityShipmentNotCreated"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityShipmentNotCreated"/>
+ </add-error>
</if-empty>
<check-errors/>
</simple-method>
@@ -1402,7 +1406,9 @@ under the License.
<!-- make sure we have something to ship -->
<if-empty field="orderItemAndShipGroupAssocList">
- <add-error><fail-message message="No items available to ship at this time"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoItemsAvailableToShip"/>
+ </add-error>
<check-errors/>
</if-empty>
@@ -1575,7 +1581,9 @@ under the License.
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
- <add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoQuickShip"/>
+ </add-error>
<check-errors/>
</if-empty>
@@ -1725,7 +1733,9 @@ under the License.
<if-empty field="parameters.originFacilityId">
<if-empty field="orderHeader.productStoreId">
<!-- no store cannot use quick ship; throw error -->
- <add-error><fail-message message="No ProductStore associated with order; cannot use Quick Ship"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoQuickShip"/>
+ </add-error>
<check-errors/>
</if-empty>
<if-not-empty field="orderHeader.productStoreId">
@@ -1736,15 +1746,21 @@ under the License.
<if-compare field="productStore.reserveInventory" operator="not-equals" value="Y">
<!-- no reservations; no shipment; cannot use quick ship -->
- <add-error><fail-message message="ProductStore [${productStore.productStoreId}] does not reserve inventory; cannot use Quick Ship"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoQuickShipForNotReserveInventory"/>
+ </add-error>
</if-compare>
<if-compare field="productStore.oneInventoryFacility" operator="not-equals" value="Y">
<!-- if we allow multiple facilities we cannot use quick ship; throw error -->
- <add-error><fail-message message="ProductStore [${productStore.productStoreId}] allows multiple facilities; cannot use Quick Ship"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoQuickShipForMultipleFacilities"/>
+ </add-error>
</if-compare>
<if-empty field="productStore.inventoryFacilityId">
<!-- if no inventoryFacility is defined we cannot use quick ship; throw error -->
- <add-error><fail-message message="No inventory facility associated with ProductStore [${productStore.productStoreId}]; cannot use Quick Ship"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoQuickShipForNotInventoryFacility"/>
+ </add-error>
</if-empty>
<check-errors/>
</if-not-empty>
@@ -1752,7 +1768,9 @@ under the License.
<!-- make sure we have items to issue -->
<if-empty field="parameters.itemShipList">
- <add-error><fail-message message="No items available to ship at this time"/></add-error>
+ <add-error>
+ <fail-property resource="ProductUiLabels" property="FacilityNoItemsAvailableToShip"/>
+ </add-error>
<check-errors/>
</if-empty>
Modified: ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml?rev=1052036&r1=1052035&r2=1052036&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml (original)
+++ ofbiz/trunk/applications/securityext/script/org/ofbiz/securityext/securitygroup/SecurityGroupServices.xml Wed Dec 22 19:19:57 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -22,7 +22,9 @@ under the License.
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<!-- SecurityGroup methods -->
<simple-method method-name="createSecurityGroup" short-description="Create an SecurityGroup">
- <check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run createSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value value-field="newEntity" entity-name="SecurityGroup"/>
@@ -32,7 +34,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSecurityGroup" short-description="Update an SecurityGroup">
- <check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_UPDATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SecurityGroup" value-field="lookupPKMap"/>
@@ -44,7 +48,9 @@ under the License.
<!-- SecurityPermission methods -->
<simple-method method-name="createSecurityPermission" short-description="Create an SecurityPermission">
- <check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run createSecurityPermission you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value value-field="newEntity" entity-name="SecurityPermission"/>
@@ -54,7 +60,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateSecurityPermission" short-description="Update an SecurityPermission">
- <check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateSecurityPermission you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_UPDATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SecurityPermission" value-field="lookupPKMap"/>
@@ -66,7 +74,9 @@ under the License.
<!-- SecurityPermission to SecurityGroup methods -->
<simple-method method-name="addSecurityPermissionToSecurityGroup" short-description="Add SecurityPermission To SecurityGroup">
- <check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addSecurityPermissionToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value value-field="newEntity" entity-name="SecurityGroupPermission"/>
@@ -75,7 +85,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="removeSecurityPermissionFromSecurityGroup" short-description="Remove SecurityPermission From SecurityGroup">
- <check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeSecurityPermissionFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_DELETE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="SecurityGroupPermission" value-field="lookupPKMap"/>
@@ -86,7 +98,9 @@ under the License.
<!-- UserLogin to SecurityGroup methods -->
<simple-method method-name="addUserLoginToSecurityGroup" short-description="Add UserLogin To SecurityGroup">
- <check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addUserLoginToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value value-field="newEntity" entity-name="UserLoginSecurityGroup"/>
@@ -101,7 +115,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateUserLoginToSecurityGroup" short-description="Update UserLogin to SecurityGroup">
- <check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateUserLoginToSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_UPDATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
@@ -111,7 +127,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeUserLoginFromSecurityGroup" short-description="Remove UserLogin From SecurityGroup">
- <check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeUserLoginFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_DELETE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="UserLoginSecurityGroup" value-field="lookupPKMap"/>
@@ -122,7 +140,9 @@ under the License.
<!-- ProtectedView to SecurityGroup methods -->
<simple-method method-name="addProtectedViewToSecurityGroup" short-description="Add ProtectedView To SecurityGroup">
- <check-permission permission="SECURITY" action="_CREATE"><fail-message message="Security Error: to run addProtectedViewToSecurityGroup you must have the SECURITY_CREATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_CREATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupCreatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value value-field="newEntity" entity-name="ProtectedView"/>
@@ -132,7 +152,9 @@ under the License.
<create-value value-field="newEntity"/>
</simple-method>
<simple-method method-name="updateProtectedViewToSecurityGroup" short-description="Update ProtectedView to SecurityGroup">
- <check-permission permission="SECURITY" action="_UPDATE"><fail-message message="Security Error: to run updateProtectedViewToSecurityGroup you must have the SECURITY_UPDATE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_UPDATE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupUpdatePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="ProtectedView" value-field="lookupPKMap"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
@@ -141,7 +163,9 @@ under the License.
<store-value value-field="lookedUpValue"/>
</simple-method>
<simple-method method-name="removeProtectedViewFromSecurityGroup" short-description="Remove ProtectedView From SecurityGroup">
- <check-permission permission="SECURITY" action="_DELETE"><fail-message message="Security Error: to run removeProtectedViewFromSecurityGroup you must have the SECURITY_DELETE or SECURITY_ADMIN permission"/></check-permission>
+ <check-permission permission="SECURITY" action="_DELETE">
+ <fail-property resource="PartyUiLabels" property="PartySecurityGroupDeletePermissionError"/>
+ </check-permission>
<check-errors/>
<make-value entity-name="ProtectedView" value-field="lookupPKMap"/>