Author: mrisaliti
Date: Tue Dec 21 18:42:10 2010
New Revision: 1051606
URL: http://svn.apache.org/viewvc?rev=1051606&view=rev
Log:
Replace some fail-message to fail-property tag in ordermgr component
(OFBIZ-1874)
Modified:
ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=1051606&r1=1051605&r2=1051606&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Tue Dec 21
18:42:10 2010
@@ -1613,6 +1613,14 @@
<value xml:lang="zh">å建订å失败ï¼è¯·éç¥å®¢æ·æå¡ã
</value>
<value xml:lang="zh_TW">åµå»ºè¨å®å¤±æï¼è«éç¥å®¢æ¶æåã
</value>
</property>
+ <property key="OrderOrderIdDoesNotExists">
+ <value xml:lang="en">Order with id ${parameters.orderId} doesn't
exist.</value>
+ <value xml:lang="it">Ordine ${parameters.orderId} non esiste.</value>
+ </property>
+ <property key="OrderOrderItemIdDoesNotExists">
+ <value xml:lang="en">The Orders Item with id
${orderItem.orderItemSeqId} doesn't exist.</value>
+ <value xml:lang="it">Riga ordine ${orderItem.orderItemSeqId} non
esiste.</value>
+ </property>
<property key="OrderOrderItemTypeNotExist">
<value xml:lang="en">Order item type not exist</value>
<value xml:lang="es">Tipo de Ãtem del pedido inexistente</value>
@@ -2194,6 +2202,22 @@
<value xml:lang="zh">询价ç¾åæ¯</value>
<value xml:lang="zh_TW">è©¢å¹ç¾åæ¯</value>
</property>
+ <property key="OrderQuoteStatusChangeIsNotValid">
+ <value xml:lang="en">The status change from ${quote.statusId} to
${parameters.statusId} is not a valid change</value>
+ <value xml:lang="it">Il cambio di stato da ${quote.statusId} a
${parameters.statusId} non è consentito</value>
+ </property>
+ <property key="OrderQuoteNotARequest">
+ <value xml:lang="en">ERROR: CustRequest ${custRequest.custRequestId}
is not a request for quote.</value>
+ <value xml:lang="it">ERRORE: Richiesta ${custRequest.custRequestId}
non è richiesta di preventivo.</value>
+ </property>
+ <property key="OrderQuoteNotAWorkEffort">
+ <value xml:lang="en">ERROR: QuoteWorkEffort ${parameters.quoteId}
${parameters.workEffortId} already exists.</value>
+ <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId}
${parameters.workEffortId} non è preventivo di impegno di lavoro.</value>
+ </property>
+ <property key="OrderQuoteWorkEffortDoesNotExists">
+ <value xml:lang="en">ERROR: QuoteWorkEffort ${parameters.quoteId}
${parameters.workEffortId} does not exist.</value>
+ <value xml:lang="it">ERRORE: Impegno di lavoro ${parameters.quoteId}
${parameters.workEffortId} non esiste.</value>
+ </property>
<property key="OrderReceivedNullForOrderItemRecordsOrderId">
<value xml:lang="en">Received NULL for OrderItem records orderId :
${orderId}</value>
<value xml:lang="es">Se recibió nulo para los registros de Ãtems del
pedido con código: ${orderId}</value>
@@ -2256,6 +2280,14 @@
<value xml:lang="zh">é¢å®é¿åº¦åºè¯¥æ¯ä¸ä¸ªæ£æ°</value>
<value xml:lang="zh_TW">é å®é·åº¦æ該æ¯ä¸åæ£æ¸</value>
</property>
+ <property key="OrderReturnItemTypeIsNotDefined">
+ <value xml:lang="en">Return Item Type is not defined for this item; or
no mapping was found.</value>
+ <value xml:lang="it">Tipo riga reso non è definita per questa
riga.</value>
+ </property>
+ <property key="OrderReturnItemTypeOrderItemNoMatching">
+ <value xml:lang="en">No matching return item type map found for order
item: ${orderItem}</value>
+ <value xml:lang="it">Nessuna corrispondenza trovata fra il tipo riga
reso e la riga ordine: ${orderItem}</value>
+ </property>
<property key="OrderReturnPaymentMethodNeededForThisTypeOfReturn">
<value xml:lang="en">A payment method must be set for this type of
return</value>
<value xml:lang="es">Hay que fijar un método de pago para este tipo
de devolución</value>
@@ -2303,6 +2335,14 @@
<value xml:lang="zh">éè´§æ°é [ ${parameters.returnQuantity} ]
ä¸è½è¶
è¿è®¢åæ°é [ ${orderItem.quantity} ]ã </value>
<value xml:lang="zh_TW">é貨æ¸é [ ${parameters.returnQuantity} ]
ä¸è½è¶
éè¨å®æ¸é [ ${orderItem.quantity} ]ã </value>
</property>
+ <property key="OrderReturnRequestPartyRoleInternalOrg">
+ <value xml:lang="en">Error: a return must be to a party in the role of
internal organization</value>
+ <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo
organizzazione interna</value>
+ </property>
+ <property key="OrderReturnRequestPartyRoleSupplier">
+ <value xml:lang="en">Error: a return must be to a party in the role of
supplier</value>
+ <value xml:lang="it">Errore: un reso deve avere un soggetto con ruolo
fornitore</value>
+ </property>
<property key="OrderReturnTotalCannotLessThanZero">
<value xml:lang="en">Return total [${returnTotalAmount}] can not less
than zero.</value>
<value xml:lang="es">Total de la devolución [${returnTotalAmount}] no
puede ser menor a cero</value>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml?rev=1051606&r1=1051605&r2=1051606&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
(original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/olap/FactServices.xml
Tue Dec 21 18:42:10 2010
@@ -24,7 +24,9 @@ under the License.
<simple-method method-name="loadSalesOrderFact" short-description="">
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader">
- <add-error><fail-message message="Order with id
[${parameters.orderId}] doesn't exist."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderOrderIdDoesNotExists"/>
+ </add-error>
</if-empty>
<check-errors/>
<if-compare field="orderHeader.orderTypeId" operator="equals"
value="SALES_ORDER">
@@ -56,10 +58,14 @@ under the License.
</entity-and>
</if-empty>
<if-empty field="orderHeader">
- <add-error><fail-message message="Order with id
[${orderHeader.orderId}] doesn't exist."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderOrderIdDoesNotExists"/>
+ </add-error>
</if-empty>
<if-empty field="orderItem">
- <add-error><fail-message message="The Orders Item with id
[${orderItem.orderItemSeqId}] doesn't exist."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderOrderItemIdDoesNotExists"/>
+ </add-error>
</if-empty>
<check-errors/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=1051606&r1=1051605&r2=1051606&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml
Tue Dec 21 18:42:10 2010
@@ -53,7 +53,9 @@ under the License.
<field-map field-name="roleTypeId"
value="INTERNAL_ORGANIZATIO"/>
</entity-one>
<if-empty field="partyRole">
- <add-error><fail-message message="Error: a return must be
to a party in the role of internal organization"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderReturnRequestPartyRoleInternalOrg"/>
+ </add-error>
</if-empty>
<else>
<entity-one entity-name="PartyRole" value-field="partyRole"
use-cache="true" auto-field-map="false">
@@ -61,7 +63,9 @@ under the License.
<field-map field-name="roleTypeId" value="SUPPLIER"/>
</entity-one>
<if-empty field="partyRole">
- <add-error><fail-message message="Error: a return must be
to a party in the role of supplier"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderReturnRequestPartyRoleSupplier"/>
+ </add-error>
</if-empty>
</else>
</if-compare>
@@ -274,7 +278,9 @@ under the License.
</if-empty>
<if-empty field="parameters.returnItemTypeId">
- <add-error><fail-message message="Return Item Type is not defined
for this item; or no mapping was found."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderReturnItemTypeIsNotDefined"/>
+ </add-error>
<check-errors/>
</if-empty>
@@ -698,7 +704,9 @@ under the License.
</if-compare>
<if-empty field="returnItemTypeMapping.returnItemTypeId">
- <add-error><fail-message message="No matching return item type
map found for order item: [${orderItem}]"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderReturnItemTypeOrderItemNoMatching"/>
+ </add-error>
<check-errors/>
<else>
<set from-field="returnItemTypeMapping.returnItemTypeId"
field="newItemCtx.returnItemTypeId"/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=1051606&r1=1051605&r2=1051606&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderServices.xml
Tue Dec 21 18:42:10 2010
@@ -589,7 +589,9 @@ under the License.
<entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<if-empty field="orderHeader">
- <add-error><fail-message message="ERROR: Cannot update specified
contact info because it does not correspond to the specified work
effort"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderOrderIdDoesNotExists"/>
+ </add-error>
</if-empty>
<check-errors/>
<set-nonpk-fields value-field="orderHeader" map="parameters"/>
@@ -917,7 +919,9 @@ under the License.
<simple-method method-name="getOrderStatus" short-description="Gets an
order status" login-required="false">
<entity-one entity-name="OrderHeader" value-field="order"/>
<if-empty field="order">
- <add-error><fail-message message="Order not found
[{parameters.orderId}]"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderOrderIdDoesNotExists"/>
+ </add-error>
<check-errors/>
</if-empty>
<field-to-result field="order.statusId" result-name="statusId"/>
Modified:
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml?rev=1051606&r1=1051605&r2=1051606&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
(original)
+++
ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
Tue Dec 21 18:42:10 2010
@@ -105,7 +105,9 @@ under the License.
</and>
</condition>
<then>
- <add-error><fail-property resource="OrderErrorUiLabels"
property="OrderSecurityErrorToRunCreateQuote"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderSecurityErrorToRunCreateQuote"/>
+ </add-error>
</then>
</if>
<check-errors/>
@@ -166,7 +168,9 @@ under the License.
</entity-and>
<if-empty field="validChange">
- <add-error><fail-message message="The status change from
${quote.statusId} to ${parameters.statusId} is not a valid change"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderQuoteStatusChangeIsNotValid"/>
+ </add-error>
<log level="error" message="The status change from
${quote.statusId} to ${parameters.statusId} is not a valid change"/>
<check-errors/>
</if-empty>
@@ -303,7 +307,9 @@ under the License.
</and>
</condition>
<then>
- <add-error><fail-property resource="OrderErrorUiLabels"
property="OrderSecurityErrorToRunCreateQuoteItem"/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderSecurityErrorToRunCreateQuoteItem"/>
+ </add-error>
</then>
</if>
@@ -837,7 +843,9 @@ under the License.
</and>
</condition>
<then>
- <add-error><fail-message message="ERROR: CustRequest
[${custRequest.custRequestId}] is not a request for quote."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderQuoteNotARequest"/>
+ </add-error>
</then>
</if>
<check-errors/>
@@ -902,7 +910,9 @@ under the License.
<set-pk-fields map="parameters" value-field="lookupMap"/>
<find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap"
value-field="quoteWorkEffort"/>
<if-not-empty field="quoteWorkEffort.quoteId">
- <add-error><fail-message message="ERROR: QuoteWorkEffort
[${parameters.quoteId}][${parameters.workEffortId}] already
exists."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderQuoteNotAWorkEffort"/>
+ </add-error>
<check-errors/>
</if-not-empty>
<set-nonpk-fields map="parameters" value-field="lookupMap"/>
@@ -915,7 +925,9 @@ under the License.
<set-pk-fields map="parameters" value-field="lookupMap"/>
<find-by-primary-key entity-name="QuoteWorkEffort" map="lookupMap"
value-field="quoteWorkEffort"/>
<if-empty field="quoteWorkEffort.quoteId">
- <add-error><fail-message message="ERROR: QuoteWorkEffort
[${parameters.quoteId}][${parameters.workEffortId}] does not
exist."/></add-error>
+ <add-error>
+ <fail-property resource="OrderErrorUiLabels"
property="OrderQuoteWorkEffortDoesNotExists"/>
+ </add-error>
<check-errors/>
</if-empty>
<if-not-empty field="quoteWorkEffort.quoteId">
