Author: deepak
Date: Sun Jul 9 09:34:09 2017
New Revision: 1801361
URL:
http://svn.apache.org/viewvc?rev=1801361&view=revLog:
Applied fix from trunk for revision: 1801359
===
Added missing file those of part of 1801320, also updated the path in screens. (OFBIZ-6774)
Added:
ofbiz/branches/release16.11/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy
- copied unchanged from r1801359, ofbiz/ofbiz-framework/trunk/applications/accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy
ofbiz/branches/release16.11/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl
- copied unchanged from r1801359, ofbiz/ofbiz-framework/trunk/applications/accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl
Modified:
ofbiz/branches/release16.11/ (props changed)
ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml
Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 9 09:34:09 2017
@@ -10,5 +10,5 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801274,1801336
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801274,1801336,1801359
/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520
Modified: ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml?rev=1801361&r1=1801360&r2=1801361&view=diff==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/widget/PaymentScreens.xml Sun Jul 9 09:34:09 2017
@@ -498,11 +498,11 @@ under the License.
<actions>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
- <script location="component://accounting/webapp/accounting/WEB-INF/actions/reports/InvoiceAcctgTransEntryParameters.groovy"/>
+ <script location="component://accounting/groovyScripts/reports/InvoiceAcctgTransEntryParameters.groovy"/>
</actions>
<widgets>
<platform-specific>
- <xsl-fo><html-template location="component://accounting/webapp/accounting/payment/InvoiceAcctgTransEntry.fo.ftl"/></xsl-fo>
+ <xsl-fo><html-template location="component://accounting/template/reports/InvoiceAcctgTransEntry.fo.ftl"/></xsl-fo>
</platform-specific>
</widgets>
</section>
Locked
