svn commit: r1799328 - in /ofbiz/branches/release16.11: ./ applications/accounting/widget/FixedAssetForms.xml

Author: jleroux
Date: Tue Jun 20 09:35:33 2017
New Revision: 1799328

URL: http://svn.apache.org/viewvc?rev=1799328&view=rev
Log:
"Applied fix from trunk framework for revision: 1799327"
------------------------------------------------------------------------
r1799327 | jleroux | 2017-06-20 11:33:51 +0200 (mar. 20 juin 2017) | 5 lignes

Improved: Accounting Manager \ Fixed Assets, press button [NEW FIXED ASSET],
but action button is [Update], not [Save]
(OFBIZ-9422)

Thanks: Do Nhu Vy for report
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 20 09:35:33 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
+/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
 /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/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml?rev=1799328&r1=1799327&r2=1799328&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml (original)
+++ ofbiz/branches/release16.11/applications/accounting/widget/FixedAssetForms.xml Tue Jun 20 09:35:33 2017
@@ -122,7 +122,8 @@ under the License.
         <field name="locatedAtFacilityId"><lookup target-form-name="LookupFacility"/></field>
         <field name="locatedAtLocationSeqId"><lookup target-form-name="LookupFacilityLocation"/></field>
 
-        <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetId!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
+        <field name="submitButton" use-when="fixedAssetId==null" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field>
     </form>
 
     <form name="ListFixedAssetProducts" type="list"  list-name="fixedAssetProducts"  target="updateFixedAssetProduct"