You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/10/19 11:20:51 UTC
svn commit: r1533719 - in /ofbiz/branches/release13.07: ./
applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Author: jleroux
Date: Sat Oct 19 09:20:51 2013
New Revision: 1533719
URL: http://svn.apache.org/r1533719
Log:
"Applied fix from trunk for revision: 1526463"
------------------------------------------------------------------------
r1526463 | jleroux | 2013-09-26 14:38:04 +0200 (jeu. 26 sept. 2013) | 4 lignes
A patch from Maurice Meyer for " Materials Required By The Running Task in ProductionRunDeclaration doesn't show product names" https://issues.apache.org/jira/browse/OFBIZ-4895
When having started the task in a production run required materials and/or components are shown. However the overview only shows productIds
In ProductionRunForms.xml someone accidentally used productName instead of internalName to get the name of the product.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1526463
Modified: ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1533719&r1=1533718&r2=1533719&view=diff
==============================================================================
--- ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original)
+++ ofbiz/branches/release13.07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Sat Oct 19 09:20:51 2013
@@ -324,7 +324,7 @@ under the License.
<display description="${workEffortName} [${workEffortId}]" also-hidden="false"/>
</field>
<field name="internalName" title="${uiLabelMap.ProductProductName}">
- <display description="${productName} [${productId}]" also-hidden="false"/>
+ <display description="${internalName} [${productId}]" also-hidden="false"/>
</field>
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display also-hidden="false"/></field>
<field name="issuedQuantity" title="${uiLabelMap.ManufacturingIssuedQuantity}"><display also-hidden="false"/></field>
@@ -414,7 +414,7 @@ under the License.
<display description="${workEffortName} [${workEffortId}]"/>
</field>
<field name="internalName" title="${uiLabelMap.ProductProductName}">
- <display description="${productName} [${productId}]" also-hidden="false"/>
+ <display description="${internalName} [${productId}]" also-hidden="false"/>
</field>
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display also-hidden="false"/></field>
<field name="issuedQuantity" title="${uiLabelMap.ManufacturingIssuedQuantity}"><display also-hidden="false"/></field>
@@ -449,7 +449,7 @@ under the License.
<display description="${workEffortName} [${workEffortId}]"/>
</field>
<field name="internalName" title="${uiLabelMap.ProductProductName}">
- <display description="${productName} [${productId}]" also-hidden="false"/>
+ <display description="${internalName} [${productId}]" also-hidden="false"/>
</field>
<field name="estimatedQuantity" title="${uiLabelMap.ManufacturingQuantity}"><display also-hidden="false"/></field>
<field name="issuedQuantity" title="${uiLabelMap.ManufacturingIssuedQuantity}"><display also-hidden="false"/></field>