svn commit: r1742366 - in /ofbiz/branches/release15.12: ./ applications/accounting/widget/InvoiceForms.xml

Author: jleroux
Date: Thu May  5 07:44:26 2016
New Revision: 1742366

URL: http://svn.apache.org/viewvc?rev=1742366&view=rev
Log:
"Applied fix from trunk for revision: 1742103"
------------------------------------------------------------------------
r1742103 | jleroux | 2016-05-03 13:38:42 +0200 (mar. 03 mai 2016) | 3 lignes

A patch from Pierre Smits for "Adding Uom descriptor for selection and display in invoice forms" https://issues.apache.org/jira/browse/OFBIZ-7032

Currently there is no Uom selector in the terms form. And the display field in the terms list form only shows the uomId.
------------------------------------------------------------------------


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

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  5 07:44:26 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
+/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

Modified: ofbiz/branches/release15.12/applications/accounting/widget/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/widget/InvoiceForms.xml?rev=1742366&r1=1742365&r2=1742366&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/widget/InvoiceForms.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/widget/InvoiceForms.xml Thu May  5 07:44:26 2016
@@ -449,6 +449,9 @@ under the License.
         <field name="termDays" widget-area-style="align-right" title-area-style="align-right">
             <display/>
         </field>
+        <field name="uomId" title="${uiLabelMap.Uom}">
+            <display-entity entity-name="Uom"/>
+        </field>
     </form>
     
     <form name="EditInvoiceTerm" type="single" target="createInvoiceTerm" title=""
@@ -463,6 +466,13 @@ under the License.
             </drop-down>
         </field>
         <field name="description"><textarea/></field>
+        <field name="uomId" title="${uiLabelMap.Uom}">
+            <drop-down allow-empty="true">
+                <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom">
+                    <entity-order-by field-name="description"/>
+                </entity-options>
+            </drop-down>
+        </field>
         <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>