You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@ofbiz.apache.org by ha...@apache.org on 2013/07/02 11:02:13 UTC

svn commit: r1498847 - /ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml

Author: hansbak
Date: Tue Jul  2 09:02:12 2013
New Revision: 1498847

URL: http://svn.apache.org/r1498847
Log:
correction on commit 1495294 not working for foreign purchase orders

Modified:
    ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml

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=1498847&r1=1498846&r2=1498847&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 Tue Jul  2 09:02:12 2013
@@ -1006,15 +1006,15 @@ under the License.
             <return/>
         </if-empty>
         <if-compare field="invoice.parentTypeId" operator="equals" value="PURCHASE_INVOICE">
-            <set field="pref.organizationPartyId" from-field="invoice.partyIdFrom"/>
+            <set field="pref.organizationPartyId" from-field="invoice.partyId"/>
         </if-compare>          
         <if-compare field="invoice.parentTypeId" operator="equals" value="SALES_INVOICE">
-            <set field="pref.organizationPartyId" from-field="invoice.partyId"/>
+            <set field="pref.organizationPartyId" from-field="invoice.partyIdFrom"/>
         </if-compare>          
         <call-service service-name="getPartyAccountingPreferences" in-map-name="pref">
-            <result-to-field result-name="prefResult"/>
+            <result-to-field result-name="partyAccountingPreference"/>
         </call-service>
-        <if-compare-field to-field="prefResult.partyAccountingPreference.baseCurrencyUomId" operator="equals" field="invoice.currencyUomId">
+        <if-compare-field to-field="partyAccountingPreference.baseCurrencyUomId" operator="equals" field="invoice.currencyUomId">
             <set field="isForeign" value="false" type="Boolean"/>
             <else>
                 <set field="isForeign" value="true" type="Boolean"/>