svn commit: r1618399 - in /ofbiz/trunk/applications: accounting/config/ accounting/script/org/ofbiz/accounting/invoice/ order/script/org/ofbiz/order/order/ order/script/org/ofbiz/order/quote/

[ashish]

Author: ashish
Date: Sat Aug 16 19:00:05 2014
New Revision: 1618399

URL: http://svn.apache.org/r1618399
Log:
Applied fix from jira issue - OFBIZ-4209 - Incorrect logging for 
InvoiceServices, OrderServices and QuoteServices.
Thanks  Rene Scheibe for reporting the issue and providing the fix for the 
same. Thanks ofbiz.us team for the verification. 

Modified:
    ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml
    
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.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/accounting/config/AccountingErrorUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml?rev=1618399&r1=1618398&r2=1618399&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml 
(original)
+++ ofbiz/trunk/applications/accounting/config/AccountingErrorUiLabels.xml Sat 
Aug 16 19:00:05 2014
@@ -436,13 +436,6 @@
         <value xml:lang="pt">Ocorreu um erro ao recuperar os detalhes 
carrinho</value>
         <value xml:lang="zh">获取购物车详细信息时出错</value>
     </property>
-    <property key="AccountingPartyAcctgPreferenceNotDefine">
-        <value xml:lang="en">Acctg preference not define</value>
-        <value xml:lang="fr">Aucune configuration sur les préférences de 
gestion encore définie pour votre société</value>
-        <value 
xml:lang="ja">アカウント設定が定義されていません</value>
-        <value xml:lang="pt">Acctg não definir preferência</value>
-        <value xml:lang="zh">没有定义账户设置</value>
-    </property>
     <property key="AccountingPayPalCommunicationError">
         <value xml:lang="de">Während der Kommunikation mit PayPal ist ein 
Problem aufgetreten, bitte versuchen Sie es noch einmal oder wählen Sie eine 
andere Zahlungsmethode</value>
         <value xml:lang="en">A problem occurred while communicating with 
PayPal, please try again or select a different checkout method</value>

Modified: 
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1618399&r1=1618398&r2=1618399&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
 (original)
+++ 
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
 Sat Aug 16 19:00:05 2014
@@ -31,8 +31,7 @@ under the License.
         <if-not-empty field="partyAcctgPreference">
            <get-related-one relation-name="InvoiceCustomMethod" 
value-field="partyAcctgPreference" to-value-field="customMethod"/>
            <else>
-               <property-to-field field="errorPartyPerf" 
resource="AccountingErrorUiLabels" 
property="AccountingPartyAcctgPreferenceNotDefine"/>
-               <log level="warning" message="errorPartyPerf" />
+               <log level="warning" message="Acctg preference not defined for 
partyId [${parameters.partyId}]"/>
            </else>
         </if-not-empty>
 

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=1618399&r1=1618398&r2=1618399&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 
Sat Aug 16 19:00:05 2014
@@ -483,8 +483,7 @@ under the License.
         <if-not-empty field="partyAcctgPreference">
            <get-related-one relation-name="OrderCustomMethod" 
value-field="partyAcctgPreference" to-value-field="customMethod"/>
            <else>
-               <property-to-field field="errorPartyPerf" 
resource="AccountingErrorUiLabels" 
property="AccountingPartyAcctgPreferenceNotDefine"/>  
-               <log level="warning" message="errorPartyPerf" />
+               <log level="warning" message="Acctg preference not defined for 
partyId [${parameters.partyId}]"/>
            </else>
         </if-not-empty>
 

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=1618399&r1=1618398&r2=1618399&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 
Sat Aug 16 19:00:05 2014
@@ -33,8 +33,7 @@ under the License.
         <if-not-empty field="partyAcctgPreference">
            <get-related-one relation-name="QuoteCustomMethod" 
value-field="partyAcctgPreference" to-value-field="customMethod"/>
            <else>
-               <property-to-field field="errorPartyPerf" 
resource="AccountingErrorUiLabels" 
property="AccountingPartyAcctgPreferenceNotDefine"/>
-               <log level="warning" message="errorPartyPerf" />
+               <log level="warning" message="Acctg preference not defined for 
partyId [${parameters.partyId}]"/>
            </else>
            
         </if-not-empty>