Author: surajk
Date: Sat Jan 12 05:34:42 2019
New Revision: 1851132
URL: http://svn.apache.org/viewvc?rev=1851132&view=rev
Log:
Applied fix from trunk for revision: 1851130
===
Fixed:Invoice date is not displayed on findInvoice screen.
(OFBIZ-10620)
When an invoice is created, current date is set as invoice date which can be
viewed on FindInvoice screen, it was not rendering due to incorrect xml tag
used.
Thanks Arpit Mor for reporting and Deepak Nigam for providing the patch.
Modified:
ofbiz/ofbiz-framework/branches/release17.12/ (props changed)
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/InvoiceForms.xml
Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 12 05:34:42 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006,1851068,1851074
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826780,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850918,1850948,1850953,1851006,1851068,1851074,1851130
Modified:
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/InvoiceForms.xml?rev=1851132&r1=1851131&r2=1851132&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/InvoiceForms.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release17.12/applications/accounting/widget/InvoiceForms.xml
Sat Jan 12 05:34:42 2019
@@ -81,7 +81,7 @@ under the License.
</hyperlink>
</field>
<field name="invoiceTypeId" sort-field="true"><display-entity
entity-name="InvoiceType"/></field>
- <field name="invoiceDate" sort-field="true"><display
description="${date:dateTimeString(invoiceDate, timeZone, locale)}"/></field>
+ <field name="invoiceDate" sort-field="true"><display
type="date"/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}"
sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="description" sort-field="true"><display/></field>
<field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}"
sort-field="true">
