Author: pranayp
Date: Mon Jun 27 14:04:43 2016
New Revision: 1750341
URL: http://svn.apache.org/viewvc?rev=1750341&view=rev
Log:
[OFBIZ-7336] Now fromDate and thruDate can be added while adding a party to a
production run form. Also done cleanup in createProductionRunPartyAssign
service, removed unused code from it. Thanks Amardeep Singh Jhajj for the
contribution.
Modified:
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Modified:
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml?rev=1750341&r1=1750340&r2=1750341&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/minilang/jobshopmgt/ProductionRunServices.xml
Mon Jun 27 14:04:43 2016
@@ -25,27 +25,13 @@ under the License.
<simple-method method-name="createProductionRunPartyAssign"
short-description="Assign the selected party to the production run or
task">
- <set field="productionRunId" from-field="parameters.productionRunId"/>
- <set field="partyId" from-field="parameters.partyId"/>
- <set field="roleTypeId" from-field="parameters.roleTypeId"/>
- <set field="statusId" value="PRTYASGN_ASSIGNED"/>
<set field="parameters.statusId" value="PRTYASGN_ASSIGNED"/>
- <if-not-empty field="parameters.workEffortId">
- <set field="workEffortId" from-field="parameters.workEffortId"/>
- </if-not-empty>
<if-empty field="parameters.workEffortId">
- <set field="parameters.workEffortId" from-field="productionRunId"/>
- <set field="workEffortId" from-field="productionRunId"/>
+ <set field="parameters.workEffortId"
from-field="parameters.productionRunId"/>
</if-empty>
- <entity-one entity-name="WorkEffort" value-field="workEffort"/>
- <set field="fromDate" from-field="workEffort.estimatedStartDate"/>
- <set field="statusDateTime"
from-field="workEffort.estimatedStartDate"/>
- <set field="parameters.statusDateTime"
from-field="workEffort.estimatedStartDate"/>
- <set field="parameters.fromDate"
from-field="workEffort.estimatedStartDate"/>
<field-to-result field="parameters.productionRunId"
result-name="productionRunId" />
- <field-to-result field="parameters.fromDate" result-name="fromDate" />
<call-simple-method method-name="assignPartyToWorkEffort"
xml-resource="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml"
/>
Modified:
ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml?rev=1750341&r1=1750340&r2=1750341&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/servicedef/services_production_run.xml
Mon Jun 27 14:04:43 2016
@@ -48,6 +48,7 @@ under the License.
<attribute name="roleTypeId" type="String" mode="IN" optional="false"/>
<attribute name="workEffortId" mode="IN" type="String"
optional="true"/>
<attribute name="fromDate" type="java.sql.Timestamp" mode="INOUT"
optional="true"/>
+ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
</service>
<service name="createProductionRunAssoc" engine="simple"
location="component://manufacturing/minilang/jobshopmgt/ProductionRunServices.xml"
invoke="createProductionRunAssoc" auth="false">
Modified:
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1750341&r1=1750340&r2=1750341&view=diff
==============================================================================
---
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
(original)
+++
ofbiz/trunk/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml
Mon Jun 27 14:04:43 2016
@@ -40,6 +40,8 @@ under the License.
</entity-options>
</drop-down>
</field>
+ <field name="fromDate"
title="${uiLabelMap.CommonFromDate}"><date-time/></field>
+ <field name="thruDate"
title="${uiLabelMap.CommonThruDate}"><date-time/></field>
<field name="submitButton" widget-style="smallSubmit"><submit
button-type="button"/></field>
</form>
<form name="CreateProductionRun" target="createProductionRun" title=""
type="single"
