svn commit: r1745579 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/AccountingMenus.xml specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign

[pranayp]

Author: pranayp
Date: Thu May 26 08:47:11 2016
New Revision: 1745579

URL: http://svn.apache.org/viewvc?rev=1745579&view=rev
Log:
Applied fix from trunk for revision: 1745577
===

[OFBIZ-7100] Applied patch from the ticket to fix not working 'Acctg Trans Entries PDF' on payment details screen.

The issue was due to the missing 'util' package and introduced while conversion of Javolution collections (FastMap, FastList) into Java collections.

Thanks Swanil M Mane for reporting the issue and providing the patch, thanks Deepak Dixit for reviewing the issue and providing comment to avoid any duplicate effort.



Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/accounting/widget/AccountingMenus.xml
    ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 26 08:47:11 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
+/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

Modified: ofbiz/branches/release15.12/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/AccountingMenus.xml?rev=1745579&r1=1745578&r2=1745579&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/widget/AccountingMenus.xml Thu May 26 08:47:11 2016
@@ -515,7 +515,7 @@ under the License.
                     </or>
                 </and>
             </condition>
-            <link target="PaymentAcctgTransEntriesPdf">
+            <link target="PaymentAcctgTransEntriesPdf" link-type="anchor">
                 <parameter param-name="paymentId" from-field="payment.paymentId"/>
             </link>
         </menu-item>

Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1745579&r1=1745578&r2=1745579&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign Thu May 26 08:47:11 2016
@@ -21,6 +21,8 @@ under the License.
     <property name="createdBy">Eclipse BIRT Designer Version 2.6.0.v20100531 Build &lt;2.6.0.v20100609-1613></property>
     <property name="units">in</property>
     <method name="initialize"><![CDATA[
+importPackage(Packages.java.util)
+
 importPackage(Packages.org.ofbiz.base.util)
 importPackage(Packages.org.ofbiz.entity.util)
 importPackage(Packages.org.ofbiz.entity.condition)
@@ -349,7 +351,7 @@ creditTotal = 0;]]></method>
             </structure>
             <property name="dataSource">OFBiz</property>
             <method name="open"><![CDATA[// get acctg trans entries of payment
-acctgTransAndEntries = new LinkedkList();
+acctgTransAndEntries = new LinkedList();
 var orderBy = UtilMisc.toList("acctgTransId", "acctgTransEntrySeqId");
 try {
     acctgTransAndEntries = delegator.findList("AcctgTransAndEntries", EntityCondition.makeCondition("paymentId", EntityOperator.EQUALS, paymentId), null, orderBy, null, false);