You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ar...@apache.org on 2016/06/02 05:18:40 UTC
svn commit: r1746525 - in /ofbiz/branches/release15.12: ./
applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Author: arunpatidar
Date: Thu Jun 2 05:18:40 2016
New Revision: 1746525
URL: http://svn.apache.org/viewvc?rev=1746525&view=rev
Log:
Applied fix from trunk for revision: 1746524
===
[OFBIZ-7124] Fixed issue of Incorrect fetching of Invoice while creating paymentApplication from matching invoices. Thanks Anurag Chandak for your contribution.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 2 05:18:40 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459,1746524
Modified: ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml?rev=1746525&r1=1746524&r2=1746525&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/invoice/InvoiceServices.xml Thu Jun 2 05:18:40 2016
@@ -1014,10 +1014,12 @@ under the License.
<log level="error" message="Invoice not found"/>
<return/>
</if-empty>
- <if-compare field="invoice.parentTypeId" operator="equals" value="PURCHASE_INVOICE">
+ <set field="isPurchaseInvoice" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'PURCHASE_INVOICE')}" type="Boolean"/>
+ <set field="isSalesInvoice" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'SALES_INVOICE')}" type="Boolean"/>
+ <if-compare field="isPurchaseInvoice" operator="equals" value="true" type="Boolean">
<set field="pref.organizationPartyId" from-field="invoice.partyId"/>
</if-compare>
- <if-compare field="invoice.parentTypeId" operator="equals" value="SALES_INVOICE">
+ <if-compare field="isSalesInvoice" operator="equals" value="true" type="Boolean">
<set field="pref.organizationPartyId" from-field="invoice.partyIdFrom"/>
</if-compare>
<call-service service-name="getPartyAccountingPreferences" in-map-name="pref">
Modified: ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml?rev=1746525&r1=1746524&r2=1746525&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/script/org/ofbiz/accounting/payment/PaymentServices.xml Thu Jun 2 05:18:40 2016
@@ -1110,6 +1110,16 @@ under the License.
<order-by field-name="invoiceDate"/>
</entity-condition>
<iterate entry="invoice" list="invoices">
+ <set field="isPurchaseInvoice" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'PURCHASE_INVOICE')}" type="Boolean"/>
+ <set field="isSalesInvoice" value="${groovy: org.ofbiz.entity.util.EntityTypeUtil.hasParentType(delegator, 'InvoiceType', 'invoiceTypeId', invoice.getString('invoiceTypeId'), 'parentTypeId', 'SALES_INVOICE')}" type="Boolean"/>
+ <if>
+ <condition>
+ <or>
+ <if-compare field="isPurchaseInvoice" operator="equals" value="true" type="Boolean"/>
+ <if-compare field="isSalesInvoice" operator="equals" value="true" type="Boolean"/>
+ </or>
+ </condition>
+ <then>
<call-class-method method-name="getInvoiceTotal" class-name="org.ofbiz.accounting.invoice.InvoiceWorker" ret-field="invoiceTotal">
<field field="invoice" type="GenericValue"/>
</call-class-method>
@@ -1134,6 +1144,8 @@ under the License.
</if-compare-field>
</else>
</if-compare>
+ </then>
+ </if>
</iterate>
<if-not-empty field="invoiceId">
<entity-and list="paymentAppls" entity-name="PaymentApplication">