svn commit: r1050933 - in /ofbiz/trunk/applications/order: config/ script/org/ofbiz/order/order/ script/org/ofbiz/order/quote/ script/org/ofbiz/order/request/ script/org/ofbiz/order/requirement/

[mrisaliti]

Author: mrisaliti
Date: Sun Dec 19 19:02:54 2010
New Revision: 1050933

URL: http://svn.apache.org/viewvc?rev=1050933&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/order/OrderReturnServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/quote/QuoteServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
    ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml

Modified: ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml?rev=1050933&r1=1050932&r2=1050933&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderErrorUiLabels.xml Sun Dec 19 19:02:54 2010
@@ -661,6 +661,10 @@
         <value xml:lang="zh">错误：无法修改订单状态 (</value>
         <value xml:lang="zh_TW">錯誤：無法修改訂單狀態 (</value>
     </property>
+    <property key="OrderErrorCouldNotChangeOrderStatusFromTo">
+        <value xml:lang="en">Status is not a valid change: from ${custRequest.statusId} to ${parameters.statusId}</value>
+        <value xml:lang="it">Cambio di stato non è valido: da ${custRequest.statusId} a ${parameters.statusId}</value>
+    </property>
     <property key="OrderErrorCouldNotChangeOrderStatusOrderCannotBeFound">
         <value xml:lang="en">ERROR : Could not change order status; order cannot be found.</value>
         <value xml:lang="es">ERROR: No puede cambiar el estado del pedido; el pedido no se encuentra.</value>
@@ -767,6 +771,18 @@
         <value xml:lang="zh">错误：无法获得订单信息 (</value>
         <value xml:lang="zh_TW">錯誤：無法獲得訂單資訊 (</value>
     </property>
+    <property key="OrderErrorCreatePermissionError">
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission</value>
+        <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_CREATE o ORDERMGR_ADMIN</value>
+    </property>
+    <property key="OrderErrorUpdatePermissionError">
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the ORDERMGR_UPDATE or ORDERMGR_ADMIN permission</value>
+        <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_UPDATE o ORDERMGR_ADMIN</value>
+    </property>
+    <property key="OrderErrorDeletePermissionError">
+        <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the ORDERMGR_DELETE or ORDERMGR_ADMIN permission</value>
+        <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso ORDERMGR_DELETE o ORDERMGR_ADMIN</value>
+    </property>
     <property key="OrderErrorCustRequestWithIdDoesntExist">
         <value xml:lang="en">Error : CustRequest with id [ ${custRequestId} ] doesn't exist. </value>
         <value xml:lang="es">ERROR: La petición de cliente con código [ ${custRequestId} ] no existe.</value>
@@ -779,6 +795,10 @@
         <value xml:lang="zh">错误：不存在标识为 [ ${custRequestId} ] 的客户请求。 </value>
         <value xml:lang="zh_TW">錯誤：不存在ID為 [ ${custRequestId} ] 的客戶要求。 </value>
     </property>
+    <property key="OrderErrorCustRequestNotFound">
+        <value xml:lang="en">CustRequest not found, statusId Id: ${custRequest.statusId}</value>
+        <value xml:lang="it">Richiesta non trovata, lo stato è : ${custRequest.statusId}</value>
+    </property>
     <property key="OrderErrorGettingNextOrderIdWhileCreatingOrder">
         <value xml:lang="en">Error getting next order Id while creating order </value>
         <value xml:lang="fr">Erreur lors de l'acquisition de la prochaine réf. de commande durant sa création </value>

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=1050933&r1=1050932&r2=1050933&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 Sun Dec 19 19:02:54 2010
@@ -474,7 +474,9 @@ under the License.
                 <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not>
             </condition>
             <then>
-                <add-error><fail-message message="Security error to run createReturnAdjustment"/></add-error>
+                <add-error>
+                    <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
+                </add-error>
             </then>
         </if>
         <check-errors/>
@@ -488,7 +490,9 @@ under the License.
         <field-to-result field="responseMessage" result-name="successMessage"/>
     </simple-method>
     <simple-method method-name="removeReturnAdjustment" short-description="Remove Return Adjustment">
-        <check-permission permission="ORDERMGR" action="_DELETE"><fail-message message="Order security ErrorToRunUpdateReturnAdjustment"/></check-permission>
+        <check-permission permission="ORDERMGR" action="_DELETE">
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorDeletePermissionError"/>
+        </check-permission>
         <check-errors/>
 
         <set from-field="parameters.returnAdjustmentId" field="lookupPKMap.returnAdjustmentId"/>

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=1050933&r1=1050932&r2=1050933&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 Sun Dec 19 19:02:54 2010
@@ -261,7 +261,7 @@ under the License.
     <!-- create a new QuoteRole -->
     <simple-method method-name="createQuoteRole" short-description="Create a QuoteRole">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-message message="Security Error: to run createQuoteRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
         </check-permission>
         <check-errors/>
         <set from-field="parameters.partyId" field="lookupPKMap.partyId"/>
@@ -282,7 +282,7 @@ under the License.
     <!-- remove an existing QuoteRole -->
     <simple-method method-name="removeQuoteRole" short-description="Remove an existing QuoteRole">
         <check-permission permission="ORDERMGR" action="_DELETE">
-            <fail-message message="Security Error: to run removeQuoteRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorDeletePermissionError"/>
         </check-permission>
         <check-errors/>
         <entity-one entity-name="QuoteRole" value-field="quoteRole" auto-field-map="true"/>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml?rev=1050933&r1=1050932&r2=1050933&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestEvents.xml Sun Dec 19 19:02:54 2010
@@ -38,7 +38,7 @@
             </condition>
             <then>
                 <add-error>
-                    <fail-message message="Content Id or Upload file is missing."/>
+                    <fail-property resource="ContentUiLabels" property="ContentContentIdOrUploadFileIsMissing"/>
                 </add-error>
             </then>
         </if>
@@ -67,7 +67,7 @@
                     </then>
                     <else>
                         <add-error>
-                            <fail-message message="Upload file type not match your selected."/>
+                            <fail-property resource="ContentUiLabels" property="ContentUploadFileTypeNotMatch"/>
                         </add-error>
                     </else>
                 </if>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml?rev=1050933&r1=1050932&r2=1050933&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/request/CustRequestServices.xml Sun Dec 19 19:02:54 2010
@@ -186,7 +186,9 @@ under the License.
     <simple-method method-name="checkStatusCustRequest" short-description="Check StatusId CustRequest">
         <entity-one entity-name="CustRequest" value-field="custRequest"></entity-one>
         <if-empty field="custRequest">
-            <add-error><fail-message message="CustRequest not found, statusId Id: ${custRequest.statusId}"/></add-error>
+            <add-error>
+                <fail-property resource="OrderErrorUiLabels" property="OrderErrorCustRequestNotFound"/>
+            </add-error>
             <log level="info" message="CustRequest not found, statusId Id: ${custRequest.statusId}"/>
             <check-errors/>
             </if-empty>
@@ -462,8 +464,10 @@ under the License.
                 </entity-one>
                 <if-empty field="statusChange">
                     <set field="msg" value="Status is not a valid change: from ${custRequest.statusId} to ${parameters.statusId}"/>
-                    <add-error><fail-message message="${msg}"/></add-error>
                     <log level="error" message="${msg}"/>
+                    <add-error>
+                        <fail-property resource="OrderErrorUiLabels" property="OrderErrorCouldNotChangeOrderStatusFromTo"/>
+                    </add-error>
                 </if-empty>
             </if-compare-field>
         </if-not-empty>

Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml?rev=1050933&r1=1050932&r2=1050933&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml (original)
+++ ofbiz/trunk/applications/order/script/org/ofbiz/order/requirement/RequirementServices.xml Sun Dec 19 19:02:54 2010
@@ -100,7 +100,7 @@ under the License.
     <!-- create a new RequirementRole -->
     <simple-method method-name="createRequirementRole" short-description="Create a RequirementRole">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-message message="Security Error: to run createRequirementRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
         </check-permission>
         <check-errors/>
         <set from-field="parameters.partyId" field="lookupPKMap.partyId"/>
@@ -125,8 +125,7 @@ under the License.
     <!-- update an existing RequirementRole -->
     <simple-method method-name="updateRequirementRole" short-description="Update an existing RequirementRole">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-message message="Security Error: to run updateRequirementRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
-        </check-permission>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/></check-permission>
         <check-errors/>
         <entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/>
         <check-errors/>
@@ -138,7 +137,7 @@ under the License.
     <!-- remove an existing RequirementRole -->
     <simple-method method-name="removeRequirementRole" short-description="Remove an existing RequirementRole">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-message message="Security Error: to run removeRequirementRole you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
         </check-permission>
         <check-errors/>
         <entity-one entity-name="RequirementRole" value-field="requirementRole" auto-field-map="true"/>
@@ -149,7 +148,7 @@ under the License.
 
     <simple-method method-name="createTransferFromRequirement" short-description="Create the inventory transfers required to fulfill the requirement.">
         <check-permission permission="ORDERMGR" action="_CREATE">
-            <fail-message message="Security Error: to run createTransferFromRequirement you must have the ORDERMGR_CREATE or ORDERMGR_ADMIN permission"/>
+            <fail-property resource="OrderErrorUiLabels" property="OrderErrorCreatePermissionError"/>
         </check-permission>
         <check-errors/>
         <entity-one entity-name="Requirement" value-field="requirement" auto-field-map="true"/>