You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2006/08/16 11:28:13 UTC
svn commit: r431867 - in /incubator/ofbiz/trunk/applications:
manufacturing/config/ manufacturing/servicedef/
manufacturing/webapp/manufacturing/WEB-INF/
manufacturing/webapp/manufacturing/includes/
manufacturing/webapp/manufacturing/requirement/ manuf...
Author: jacopoc
Date: Wed Aug 16 02:28:12 2006
New Revision: 431867
URL: http://svn.apache.org/viewvc?rev=431867&view=rev
Log:
The "Approve Requirements" screen has been moved from the manufacturing to the order component.
Removed:
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/requirement/
incubator/ofbiz/trunk/applications/manufacturing/widget/manufacturing/RequirementScreens.xml
Modified:
incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
incubator/ofbiz/trunk/applications/manufacturing/servicedef/services.xml
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/includes/appheader.ftl
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
incubator/ofbiz/trunk/applications/order/servicedef/services_requirement.xml
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
incubator/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels.properties Wed Aug 16 02:28:12 2006
@@ -155,7 +155,6 @@
ManufacturingQuickRunTask=Quick Run Task
ManufacturingReason=Reason
ManufacturingReturnedQuantity=Returned
-ManufacturingApproveRequirements=Approve Requirements
ManufacturingReports=Reports
ManufacturingRouting=Routing
ManufacturingRoutings=Routings
Modified: incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/config/ManufacturingUiLabels_it.properties Wed Aug 16 02:28:12 2006
@@ -155,7 +155,6 @@
ManufacturingQuickRunTask=Esecuzione Veloce Compiti
ManufacturingReason=Ragione
ManufacturingReturnedQuantity=Resi
-ManufacturingApproveRequirements=Approva Fabbisogni
ManufacturingReports=Stampe
ManufacturingRouting=Ciclo
ManufacturingRoutings=Cicli
Modified: incubator/ofbiz/trunk/applications/manufacturing/servicedef/services.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/servicedef/services.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/servicedef/services.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/servicedef/services.xml Wed Aug 16 02:28:12 2006
@@ -27,11 +27,4 @@
<description>Runs the package configurator.</description>
<attribute mode="IN" name="shipmentId" optional="false" type="String"/>
</service>
-
- <service name="approveRequirement" engine="java"
- location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="approveRequirement" auth="true">
- <description>Approves a requirement.</description>
- <attribute mode="IN" name="requirementId" optional="false" type="String"/>
- <attribute mode="IN" name="quantity" optional="true" type="Double"/>
- </service>
</services>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Wed Aug 16 02:28:12 2006
@@ -431,18 +431,6 @@
<response name="error" type="view" value="EditProductManufacturingRules"/>
</request-map>
- <!-- Requirement request mappings -->
- <request-map uri="ApproveRequirements">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ApproveRequirements"/>
- </request-map>
- <request-map uri="approveRequirements">
- <security https="true" auth="true"/>
- <event type="service-multi" invoke="approveRequirement"/>
- <response name="success" type="view" value="ApproveRequirements"/>
- <response name="error" type="view" value="ApproveRequirements"/>
- </request-map>
-
<!-- MRP request mappings -->
<request-map uri="FindInventoryEventPlan">
<security https="true" auth="true"/>
@@ -710,9 +698,6 @@
<!-- Costs view mappings -->
<view-map name="EditCostCalcs" page="component://manufacturing/widget/manufacturing/CostScreens.xml#EditCostCalcs" type="screen"/>
- <!-- MRP view mappings -->
- <view-map name="ApproveRequirements" page="component://manufacturing/widget/manufacturing/RequirementScreens.xml#ApproveRequirements" type="screen"/>
-
<!-- MRP view mappings -->
<view-map name="FindMrpPlannedEvents" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#FindMrpPlannedEvents" type="screen"/>
<view-map name="MrpExecution" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#MrpExecution" type="screen"/>
Modified: incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/includes/appheader.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/includes/appheader.ftl?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/includes/appheader.ftl (original)
+++ incubator/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/includes/appheader.ftl Wed Aug 16 02:28:12 2006
@@ -31,7 +31,6 @@
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.bom?default(unselectedLeftClassName)}">${uiLabelMap.ManufacturingBillOfMaterials}</a></div>
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.mrp?default(unselectedLeftClassName)}">${uiLabelMap.ManufacturingMrp}</a></div>
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.ShipmentPlans?default(unselectedLeftClassName)}">${uiLabelMap.ManufacturingShipmentPlans}</a></div>
- <div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.requirement?default(unselectedLeftClassName)}">${uiLabelMap.ManufacturingApproveRequirements}</a></div>
<div class="col"><a href="<@o...@ofbizUrl>" class="${selectedLeftClassMap.ManufacturingReports?default(unselectedLeftClassName)}">${uiLabelMap.ManufacturingReports}</a></div>
</#if>
<#if userLogin?has_content>
Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels.properties Wed Aug 16 02:28:12 2006
@@ -45,6 +45,7 @@
OrderAmount=Amount
OrderApproved=Approved
OrderApproveOrder = Approve Order
+OrderApproveRequirements=Approve Requirements
OrderAutoCreateQuoteAdjustments=Auto Create Adjustments
OrderAvs=AVS
OrderBackOrdered=Backordered
Modified: incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties (original)
+++ incubator/ofbiz/trunk/applications/order/config/OrderUiLabels_it.properties Wed Aug 16 02:28:12 2006
@@ -44,6 +44,7 @@
OrderAmount=Importo
OrderApproved=Approvato
OrderApproveOrder = Approva Ordine(i)
+OrderApproveRequirements=Approva Fabbisogni
OrderAutoCreateQuoteAdjustments=Creazione Automatica Aggiustamenti
OrderAvs=AVS
OrderBackOrdered=Backordered
Modified: incubator/ofbiz/trunk/applications/order/servicedef/services_requirement.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/servicedef/services_requirement.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/servicedef/services_requirement.xml (original)
+++ incubator/ofbiz/trunk/applications/order/servicedef/services_requirement.xml Wed Aug 16 02:28:12 2006
@@ -113,5 +113,12 @@
<attribute name="quantity" type="Double" mode="IN" optional="true"/>
<attribute name="requirementId" type="String" mode="OUT" optional="true"/>
</service>
+
+ <service name="approveRequirement" engine="java"
+ location="org.ofbiz.manufacturing.jobshopmgt.ProductionRunServices" invoke="approveRequirement" auth="true">
+ <description>Approves a requirement.</description>
+ <attribute mode="IN" name="requirementId" optional="false" type="String"/>
+ <attribute mode="IN" name="quantity" optional="true" type="Double"/>
+ </service>
</services>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Aug 16 02:28:12 2006
@@ -951,6 +951,17 @@
<response name="success" type="view" value="FindRequirements"/>
</request-map>
+ <request-map uri="ApproveRequirements">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="ApproveRequirements"/>
+ </request-map>
+ <request-map uri="approveRequirements">
+ <security https="true" auth="true"/>
+ <event type="service-multi" invoke="approveRequirement"/>
+ <response name="success" type="view" value="ApproveRequirements"/>
+ <response name="error" type="view" value="ApproveRequirements"/>
+ </request-map>
+
<request-map uri="RequirementsForSupplier">
<security https="true" auth="true"/>
<response name="success" type="view" value="RequirementsForSupplier"/>
@@ -1361,6 +1372,7 @@
<view-map name="EditRequirement" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirement"/>
<view-map name="ListRequirementCustRequests" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementCustRequests"/>
<view-map name="ListRequirementOrders" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementOrders"/>
+ <view-map name="ApproveRequirements" page="component://order/widget/ordermgr/RequirementScreens.xml#ApproveRequirements" type="screen"/>
<view-map name="RequirementsForSupplier" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#RequirementsForSupplier"/>
<view-map name="FindQuoteForCart" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#FindQuoteForCart"/>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/requirement/RequirementForms.xml Wed Aug 16 02:28:12 2006
@@ -47,7 +47,7 @@
</field>
</form>
<form name="ListRequirements" type="list" use-row-submit="true"
- target="approveRequirements" title="" list-name="listIt" paginate-target="FindRequirements"
+ target="" title="" list-name="listIt" paginate-target="FindRequirements"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
@@ -127,6 +127,54 @@
<auto-fields-entity entity-name="OrderRequirementCommitment" default-field-type="display"/>
<field name="orderId" widget-style="buttontext">
<hyperlink description="${orderId}" target-type="inter-app" target="/ordermgr/control/orderview?orderId=${orderId}"/>
+ </field>
+ </form>
+ <form name="FindNotApprovedRequirements" type="single"
+ target="ApproveRequirements" title=""
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <field name="hideSearch"><hidden value="Y"/></field>
+ <field name="requirementId"><text-find/></field>
+ <field name="requirementTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="RequirementType" description="${description}"/>
+ </drop-down>
+ </field>
+ <field name="productId" title="${uiLabelMap.ProductProductId}">
+ <lookup target-form-name="LookupProduct"/>
+ </field>
+ <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field>
+ <field name="requirementStartDate"><date-find type="date"/></field>
+ <field name="requiredByDate"><date-find type="date"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
+ <submit button-type="button"/>
+ </field>
+ </form>
+ <form name="ApproveRequirements" type="multi" use-row-submit="true"
+ target="approveRequirements" title="" list-name="listIt" paginate-target="ApproveRequirements"
+ default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <actions>
+ <set field="entityName" value="Requirement"/>
+ <set field="requestParameters.statusId" value="REQ_CREATED"/>
+ <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" env-name="requestParameters"/>
+ <field-map field-name="entityName" env-name="entityName"/>
+ </service>
+ </actions>
+ <field name="requirementId" widget-style="buttontext">
+ <hyperlink target-type="intra-app" also-hidden="true" description="${requirementId}" target="EditRequirement?requirementId=${requirementId}"/>
+ </field>
+ <field name="requirementTypeId">
+ <display-entity entity-name="RequirementType" also-hidden="true"/>
+ </field>
+ <field name="productId" title="${uiLabelMap.ProductProductId}">
+ <display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
+ </field>
+ <field name="requirementStartDate"><display/></field>
+ <field name="requiredByDate"><display/></field>
+ <field name="quantity" title="${uiLabelMap.CommonQuantity}"><display/></field>
+ <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><check/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit">
+ <submit/>
</field>
</form>
</forms>
Modified: incubator/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml?rev=431867&r1=431866&r2=431867&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/order/widget/ordermgr/RequirementScreens.xml Wed Aug 16 02:28:12 2006
@@ -67,9 +67,36 @@
</container>
<container>
<link target="EditRequirement" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
+ <link target="ApproveRequirements" text="${uiLabelMap.OrderApproveRequirements}" style="buttontext"/>
</container>
<include-form name="FindRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
<include-form name="ListRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
+ </widgets>
+ </section>
+ </screen>
+ <screen name="ApproveRequirements">
+ <section>
+ <actions>
+ <set field="title" value="Find Requirements"/>
+ <set field="titleProperty" value="PageTitleFindRequirements"/>
+ <set field="headerItem" value="requirement"/>
+ <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
+ <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
+ </actions>
+ <widgets>
+ <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="body">
+ <container>
+ <label style="head1">${uiLabelMap.OrderApproveRequirements}</label>
+ </container>
+ <container>
+ <link target="EditRequirement" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/>
+ <link target="FindRequirements" text="${uiLabelMap.OrderRequirements}" style="buttontext"/>
+ </container>
+ <include-form name="FindNotApprovedRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
+ <include-form name="ApproveRequirements" location="component://order/webapp/ordermgr/requirement/RequirementForms.xml"/>
</decorator-section>
</decorator-screen>
</widgets>