svn commit: r1745268 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/GlobalGlAccountsForms.xml

Author: jleroux
Date: Mon May 23 20:48:20 2016
New Revision: 1745268

URL: http://svn.apache.org/viewvc?rev=1745268&view=rev
Log:
"Applied fix from trunk for revision: 1745264  "  (Conflict handled by hand)
------------------------------------------------------------------------
r1745264 | jleroux | 2016-05-23 22:42:00 +0200 (lun. 23 mai 2016) | 5 lignes

A patch from Kongrath Suankaewmanee for "The number of gl account when printing/exporting chart of account pdf report in global gl setting alway show 20 items. " https://issues.apache.org/jira/browse/OFBIZ-7038

At https://localhost:8443/accounting/control/globalGLSettings
the number of GL accounts is wrong: always 20 items in PDF report list and same problem with XML export in the same screen.

------------------------------------------------------------------------

Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/accounting/widget/GlobalGlAccountsForms.xml

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 20:48:20 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
+/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

Modified: ofbiz/branches/release15.12/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=1745268&r1=1745267&r2=1745268&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/widget/GlobalGlAccountsForms.xml Mon May 23 20:48:20 2016
@@ -100,6 +100,12 @@ under the License.
         <field name="productId"><display-entity entity-name="Product"/></field>
         <field name="externalId"><display/></field>
     </form>
+    <form name="ListGlAccountPdf" extends="ListGlAccount">
+        <actions>
+            <entity-condition entity-name="GlAccount" list="listIt"/>
+        </actions>
+        <field name="accountCode" title="${uiLabelMap.CommonCode}" widget-style="buttontext"><display/></field>
+    </form>
 
     <form name="EditGlAccount" type="single" target="updateGlAccount" title="" default-map-name="glAccount"
         header-row-style="header-row" default-table-style="basic-table">