svn commit: r1526653 - in /ofbiz/trunk/applications/manufacturing: webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy widget/manufacturing/ProductionRunForms.xml

[jl...@apache.org]

Author: jleroux
Date: Thu Sep 26 19:26:50 2013
New Revision: 1526653

URL: http://svn.apache.org/r1526653
Log:
A patch from Maurice Meyer for "ProductionRunDeclaration doesn't show facilityId" https://issues.apache.org/jira/browse/OFBIZ-4894

When having created a new production run in MFG with a facility selected, the facility isn't shown when the production run is confirmed.
I added an extra field to display facilityName and facilityId when the ProductionRun is confirmed.

Modified:
    ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
    ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml

Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy?rev=1526653&r1=1526652&r2=1526653&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.groovy Thu Sep 26 19:26:50 2013
@@ -83,6 +83,7 @@ if (productionRunId) {
         productionRunData.actualStartDate = productionRun.getGenericValue().getTimestamp("actualStartDate");
         productionRunData.actualCompletionDate = productionRun.getGenericValue().getTimestamp("actualCompletionDate");
         productionRunData.currentStatusId = productionRun.getGenericValue().currentStatusId;
+    	productionRunData.facilityId = productionRun.getGenericValue().facilityId;
 
         context.productionRunData = productionRunData;
 

Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1526653&r1=1526652&r2=1526653&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original)
+++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Thu Sep 26 19:26:50 2013
@@ -281,6 +281,9 @@ under the License.
         <field name="actualCompletionDate" title="${uiLabelMap.ManufacturingActualCompletionDate}"><display/></field>
         <field name="productionRunName"  title="${uiLabelMap.ManufacturingProductionRunName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="facilityId" title="${uiLabelMap.FacilityFacility}">
+            <display-entity entity-name="Facility" description="${facilityName} [${facilityId}]"/>
+        </field>
         <field name="quantityProduced" title="${uiLabelMap.ManufacturingQuantityProduced}"><display/></field>
         <field name="quantityRejected" title="${uiLabelMap.ManufacturingQuantityRejected}"><display/></field>
     </form>