svn commit: r1813603 - in /ofbiz/branches/release16.11: ./ applications/product/widget/facility/InventoryForms.xml

[akashjain]

Author: akashjain
Date: Sat Oct 28 10:44:26 2017
New Revision: 1813603

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

Fixed: Fixed Asset Id field is below update button on EditInventoryItem page, applied patch from jira issue with slightly change (OFBIZ-9503)

Thanks, Aditya Sharma and Dhaval Wagela for your contribution.

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/product/widget/facility/InventoryForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 28 10:44:26 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,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387
+/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,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600
 /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/product/widget/facility/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/widget/facility/InventoryForms.xml?rev=1813603&r1=1813602&r2=1813603&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/widget/facility/InventoryForms.xml (original)
+++ ofbiz/branches/release16.11/applications/product/widget/facility/InventoryForms.xml Sat Oct 28 10:44:26 2017
@@ -145,6 +145,7 @@ under the License.
             <sort-field name="activationValidThru"/>
             <sort-field name="unitCost"/>
             <sort-field name="currencyUomId"/>
+            <sort-field name="fixedAssetId"/>
             <sort-field name="totals"/>
             <sort-field name="submit"/>
         </sort-order>