svn commit: r1744938 - in /ofbiz/branches/release15.12/applications: manufacturing/widget/manufacturing/ProductionRunForms.xml product/config/ProductUiLabels.xml

[ashish-18]

Author: ashish
Date: Sat May 21 13:19:30 2016
New Revision: 1744938

URL: http://svn.apache.org/viewvc?rev=1744938&view=rev
Log:
Applied fix from trunk revision - 1744937.
=======================================================
Applied patch from jira issue - OFBIZ-5289 - Show quantityUom in production runs.
Thanks Pierre for creating the issue and Thanks Akshay and Yashwant for the patch.
=======================================================

Modified:
    ofbiz/branches/release15.12/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
    ofbiz/branches/release15.12/applications/product/config/ProductUiLabels.xml

Modified: ofbiz/branches/release15.12/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1744938&r1=1744937&r2=1744938&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original)
+++ ofbiz/branches/release15.12/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Sat May 21 13:19:30 2016
@@ -100,6 +100,12 @@ under the License.
                 <field-map field-name="orderBy" value="estimatedStartDate"/>
             </service>
         </actions>
+        <row-actions>
+            <entity-one value-field="product" entity-name="Product"/>
+            <entity-one value-field="uom" entity-name="Uom">
+                <field-map field-name="uomId" from-field="product.quantityUomId"/>
+            </entity-one>
+        </row-actions>
         <field name="workEffortId" title=" " widget-style="buttontext">
             <hyperlink target="ShowProductionRun" description="${workEffortId}" also-hidden="false">
                 <parameter param-name="productionRunId" from-field="workEffortId"/>
@@ -108,6 +114,7 @@ under the License.
         <field name="workEffortName" title="${uiLabelMap.ManufacturingProductionRunName}"><display/></field>
         <field name="productId" title="${uiLabelMap.ProductProductId}"><display/></field>
         <field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display/></field>
+        <field name="QuantityUom" title="${uiLabelMap.ProductQuantityUom}"><display description="${uom.abbreviation}"></display></field>
         <field name="currentStatusId" title="${uiLabelMap.CommonStatus}">
             <display-entity entity-name="StatusItem" key-field-name="statusId"/>
         </field>

Modified: ofbiz/branches/release15.12/applications/product/config/ProductUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/product/config/ProductUiLabels.xml?rev=1744938&r1=1744937&r2=1744938&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/branches/release15.12/applications/product/config/ProductUiLabels.xml Sat May 21 13:19:30 2016
@@ -26561,6 +26561,9 @@
         <value xml:lang="zh">要转运的数量</value>
         <value xml:lang="zh-TW">要轉運的數量</value>
     </property>
+    <property key="ProductQuantityUom">
+        <value xml:lang="en">Quantity Uom</value>
+    </property>
     <property key="ProductQuantityUomId">
         <value xml:lang="de">Menge Einheit ID</value>
         <value xml:lang="en">Quantity UomId</value>