svn commit: r1160233 [3/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
Locked
svn commit: r1160233 [3/4] - in /ofbiz/trunk/applications: commonext/widget/ofbizsetup/ content/webapp/content/WEB-INF
 
|
Copied: ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml (from r1160221, ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml?p2=ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml&p1=ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml&r1=1160221&r2=1160233&rev=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteForms.xml (original) +++ ofbiz/trunk/applications/content/widget/website/WebSiteForms.xml Mon Aug 22 12:14:25 2011 @@ -1,294 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - - <!-- WebSite Forms --> - <form name="EditWebSite" type="single" target="updateWebSite" title="" default-map-name="webSite" - header-row-style="header-row" default-table-style="basic-table"> - <alt-target use-when="webSite==null" target="createWebSite"/> - - <auto-fields-service service-name="updateWebSite" map-name=""/> - - <field use-when="webSite!=null" name="webSiteId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="webSite==null&&webSiteId!=null" name="webSiteId" tooltip="${uiLabelMap.CommonCannotBeFound}: [${webSiteId}]"><text size="20" maxlength="20"/></field> - <!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too --> - <field use-when="webSite==null&&webSiteId==null" name="webSiteId"><text size="20" maxlength="20"/></field> - - <field name="siteName"><text size="30" maxlength="60"/></field> - <field name="enableHttps"> - <drop-down allow-empty="true"><option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/></drop-down> - </field> - - <field name="productStoreId"> - <drop-down allow-empty="true"> - <entity-options entity-name="ProductStore" description="${storeName}"> - <entity-order-by field-name="storeName"/> - </entity-options> - <sub-hyperlink use-when=""${webSite.productStoreId}".length()>0" link-style="buttontext" target-type="inter-app" target="/catalog/control/EditProductStore" description="${uiLabelMap.ContentEditProductStore}"> - <parameter param-name="productStoreId" from-field="webSite.productStoreId"/> - </sub-hyperlink> - </drop-down> - </field> - <field name="visualThemeSetId"> - <drop-down allow-empty="true"> - <entity-options entity-name="VisualThemeSet" description="${description}"> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> - </form> - <form name="ListWebSites" target="" title="" type="list" list-name="webSites" paginate-target="FindWebSite" paginate="true" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2"> - <actions> - <set field="parameters.sortField" from-field="parameters.sortField" default-value="-webSiteId"/> - <entity-condition entity-name="WebSite" list="webSites"> - <order-by field-name="${parameters.sortField}"/> - </entity-condition> - </actions> - <field name="webSiteId" title="${uiLabelMap.CommonId}" widget-style="buttontext" sort-field="true"> - <hyperlink description="${webSiteId}" target="EditWebSite" also-hidden="false"> - <parameter param-name="webSiteId"/> - </hyperlink> - </field> - <field name="siteName" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field> - <field name="httpHost" sort-field="true"><display/></field> - </form> - - <form name="FindWebSitePathAlias" target="WebSiteAliases" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="webSiteId"><hidden value="${webSiteId}"/></field> - <field name="pathAlias"><text-find ignore-case="true"/></field> - <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> - </form> - - <form name="ListWebSitePathAlias" target="" title="" list-name="listIt" type="list" paginate-target="WebSiteAliases" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <actions> - <service service-name="performFind" result-map="result" result-map-list="listIt"> - <field-map field-name="inputFields" from-field="parameters"/> - <field-map field-name="entityName" value="WebSitePathAlias"/> - <field-map field-name="orderBy" from-field="parameters.sortField"/> - <field-map field-name="viewIndex" from-field="viewIndex"/> - <field-map field-name="viewSize" from-field="viewSize"/> - </service> - </actions> - <field name="pathAlias" sort-field="true"><display/></field> - <field name="pathAliasTo" sort-field="true"><display/></field> - <field name="mapKey" sort-field="true"><display/></field> - <field name="contentId" sort-field="true"> - <display-entity entity-name="Content" description="${contentName}"> - <sub-hyperlink target="EditContent" description=" [${contentId}]"> - <parameter param-name="contentId"/> - </sub-hyperlink> - </display-entity> - </field> - <on-event-update-area event-type="paginate" area-id="search-results" area-target="WebSiteAliasesSearchResults"/> - </form> - - <!-- WebSite Content Forms --> - <form name="ListWebSiteContent" type="list" list-name="webSiteContent" target="UpdateWebSiteContent" - paginate-target="ListWebSiteContent" paginate="true" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <auto-fields-service service-name="updateWebSiteRole"/> - <field name="sequenceNum"><hidden/></field> - <field name="roleTypeId"><hidden/></field> - <field name="partyId"><hidden/></field> - - <field name="webSiteId"><display also-hidden="true"/></field> - <!-- - <field name="contentId" title="Content ID" widget-style="linktext"> - <hyperlink description="${contentId}" target="EditContent" also-hidden="true"> - <parameter param-name="contentId"/> - </hyperlink> - </field> - --> - <field name="contentId"> - <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId"> - <sub-hyperlink target="EditContent" description=" [${contentId}]" link-style="linktext"> - <parameter param-name="contentId"/> - </sub-hyperlink> - </display-entity> - - </field> - <field name="webSiteContentTypeId"> - <display-entity entity-name="WebSiteContentType"/> - </field> - <field name="fromDate"><display/></field> - - <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="RemoveWebSiteContent" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="webSiteId"/> - <parameter param-name="contentId"/> - <parameter param-name="webSiteContentTypeId"/> - <parameter param-name="fromDate"/> - </hyperlink> - </field> - <sort-order> - <sort-field name="webSiteId"/> - <sort-field name="contentId"/> - <sort-field name="webSiteContentTypeId"/> - <sort-field name="fromDate"/> - <sort-field name="thruDate"/> - <sort-field name="submitButton"/> - <sort-field name="deleteLink"/> - </sort-order> - </form> - <form name="CreateWebSiteContent" type="single" target="CreateWebSiteContent" title="" default-map-name="webSite" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createWebSiteContent"/> - <field name="webSiteId" map-name="webSite"><display also-hidden="true"/></field> - <field name="contentId"><lookup target-form-name="LookupContent"/></field> - <field name="webSiteContentTypeId"> - <drop-down allow-empty="false"> - <entity-options entity-name="WebSiteContentType" description="${description}"> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - - <!-- WebSite Role Forms --> - <form name="CreateWebSiteRole" type="single" target="createWebSiteRole" title="" - header-row-style="header-row" default-table-style="basic-table"> - <auto-fields-service service-name="createWebSiteRole"/> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="webSiteId" map-name="webSite"><hidden/></field> - <field name="roleTypeId"> - <drop-down no-current-selected-key="_NA_"> - <entity-options entity-name="RoleType" description="${description}"> - <entity-order-by field-name="description"/> - </entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - <form name="UpdateWebSiteRole" type="list" target="updateWebSiteRole" title="" list-name="webSiteRoleDatas" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> - <auto-fields-service service-name="updateWebSiteRole" map-name="webSiteRole"/> - <field name="webSiteId"><hidden/></field> - <!-- three possibilities for the Party: person, partyGroup, neither... just print everything and if it's empty, no biggie --> - <field name="partyId" widget-style="buttontext"> - <hyperlink target-type="inter-app" target="/partymgr/control/viewprofile" description="${person.personalTitle} ${person.firstName} ${person.middleName} ${person.lastName} ${person.suffix} ${partyGroup.groupName} [${webSiteRole.partyId}]"> - <parameter param-name="partyId" from-field="webSiteRole.partyId"/> - </hyperlink> - </field> - <field name="roleTypeId"> - <display description="${roleType.description}"/> - </field> - <field name="fromDate" widget-style="tabletext"><display/></field> - <field name="thruDate"></field> - <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeWebSiteRole" description="${uiLabelMap.CommonDelete}" also-hidden="false"> - <parameter param-name="webSiteId" from-field="webSiteRole.webSiteId"/> - <parameter param-name="partyId" from-field="webSiteRole.partyId"/> - <parameter param-name="roleTypeId" from-field="webSiteRole.roleTypeId"/> - <parameter param-name="fromDate" from-field="webSiteRole.fromDate"/> - </hyperlink> - </field> - </form> - <form name="AutoCreateWebsiteContent" type="single" target="autoCreateWebSiteContent" title="" - header-row-style="header-row" default-table-style="basic-table"> - <field name="webSiteId"><hidden/></field> - <field name="webSiteContentTypeId"> - <check all-checked="false"> - <entity-options entity-name="WebSiteContentType" description="${description}"> - <entity-order-by field-name="description"/> - </entity-options> - </check> - </field> - <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> - </form> - - <!-- WebSite SEO Form --> - <form name="CreateWebsiteSEO" type="single" target="generateMissingSeoUrlForWebsite" title="" - header-row-style="header-row" default-table-style="basic-table"> - <field name="webSiteId"><hidden/></field> - <field name="prodCatalogId" title="${uiLabelMap.Catalog}"> - <drop-down> - <option key="all" description="All"/> - <entity-options description="${prodCatalogId}" entity-name="ProductStoreCatalog"> - <entity-constraint name="productStoreId" value="${webSite.productStoreId}"/> - </entity-options> - </drop-down> - </field> - <field name="typeGenerate" title="Generate Type"> - <check all-checked="false"> - <option key="category" description="Category"/> - <option key="product" description="Product"/> - <option key="content" description="Content"/> - </check> - </field> - <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> - </form> - <form name="CreateWebSiteContactList" type="single" target="createWebSiteContactList" - default-map-name="webSite" title="" header-row-style="header-row" default-table-style="basic-table"> - <actions> - <set field="fromDate" value="${groovy: import org.ofbiz.base.util.UtilDateTime; return UtilDateTime.nowTimestamp();}" type="Timestamp"/> - </actions> - <field name="webSiteId"><display/></field> - <field name="siteName"><display/></field> - <field name="fromDate"><hidden value="${fromDate}"/></field> - <field name="contactListId"> - <drop-down allow-empty="true"> - <entity-options description="${contactListName} [${contactListId}]" entity-name="ContactList" key-field-name="contactListId"></entity-options> - </drop-down> - </field> - <field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit/></field> - </form> - <form name="ViewWebSiteContactList" type="list" target="updateWebSiteContactList" list-name="webSiteContactLists" title="" - header-row-style="header-row" default-table-style="basic-table"> - <actions> - <entity-one entity-name="ContactList" value-field="contactList"> - <field-map field-name="contactListId" from-field="contactListId"/> - </entity-one> - </actions> - <row-actions> - <entity-one entity-name="ContactList" value-field="contactList"> - <field-map field-name="contactListId" from-field="contactListId"/> - </entity-one> - <set field="contactListName" from-field="contactList.contactListName"/> - <set field="description" from-field="contactList.description"/> - </row-actions> - <field name="contactListId"><hidden/></field> - <field name="webSiteId"><hidden/></field> - <field name="contactListName"> - <display-entity entity-name="ContactList" description="${contactListName}" key-field-name="contactListId"> - <sub-hyperlink target="/marketing/control/EditContactList" target-type="inter-app" link-style="linktext" description="[${contactListId}]"> - <parameter param-name="contactListId"/> - </sub-hyperlink> - </display-entity> - </field> - <field name="fromDate"><display type="date-time"/></field> - <field name="thruDate"><date-time/></field> - <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit/></field> - <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"> - <hyperlink target="deleteWebSiteContactList" description="${uiLabelMap.CommonDelete}"> - <parameter param-name="webSiteId"/> - <parameter param-name="contactListId"/> - <parameter param-name="fromDate"/> - </hyperlink> - </field> - </form> -</forms> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunActualComponents.groovy Mon Aug 22 12:14:25 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("InventoryItemDetail", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskActualComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunComponents.groovy Mon Aug 22 12:14:25 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = delegator.findByAnd("WorkEffortGoodStandard", [workEffortId : task.workEffortId]); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskComponents", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.groovy Mon Aug 22 12:14:25 2011 @@ -25,14 +25,14 @@ taskCosts = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : task.workEffortId])); - HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); + HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : task ,costsForm : taskCostsForm]); } // get the costs directly associated to the production run (e.g. overhead costs) productionRun = delegator.findOne("WorkEffort", [workEffortId: productionRunId], true); costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", [workEffortId : productionRunId])); -HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); +HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add([task : productionRun ,costsForm : taskCostsForm]); 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=1160233&r1=1160232&r2=1160233&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 Mon Aug 22 12:14:25 2011 @@ -98,7 +98,7 @@ if (productionRunId) { Map routingTaskData = routingTask.getAllFields(); routingTaskData.estimatedSetupMillis = routingTask.getDouble("estimatedSetupMillis"); routingTaskData.estimatedMilliSeconds = routingTask.getDouble("estimatedMilliSeconds"); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); routingTaskData.partyId = userLogin.partyId; @@ -116,14 +116,14 @@ if (productionRunId) { if (templateTask) { delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", [workEffortGoodStdTypeId : "PRUNT_PROD_DELIV"])); } - HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); + HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); createRoutingTaskDelivProductForm.putInContext("formData", [productionRunId : productionRunId, workEffortId : routingTaskId]); context.createRoutingTaskDelivProductForm = createRoutingTaskDelivProductForm; context.delivProducts = delivProducts; // Get the list of delivered products, i.e. inventory items prunInventoryProduced = delegator.findByAnd("WorkEffortAndInventoryProduced", [workEffortId : routingTaskId]); context.prunInventoryProduced = prunInventoryProduced; - HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); + HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); prunInventoryProducedForm.putInContext("prunInventoryProduced", prunInventoryProduced); context.prunInventoryProducedForm = prunInventoryProducedForm; } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunFixedAssets.groovy Mon Aug 22 12:14:25 2011 @@ -25,7 +25,7 @@ taskInfos = []; tasks = delegator.findByAnd("WorkEffort", [workEffortParentId : productionRunId, workEffortTypeId : "PROD_ORDER_TASK"], ["workEffortId"]); tasks.each { task -> records = task.getRelated("WorkEffortFixedAssetAssign"); - HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); + HtmlFormWrapper taskForm = new HtmlFormWrapper("component://manufacturing/widget/manufacturing/ProductionRunForms.xml", "ProductionRunTaskFixedAssets", request, response); taskForm.putInContext("records", records); taskInfos.add([task : task, taskForm : taskForm]); } Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml?rev=1160233&r1=1160232&r2=1160233&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/JobshopScreens.xml Mon Aug 22 12:14:25 2011 @@ -66,7 +66,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingCreateProductionRun}"> - <include-form name="CreateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="CreateProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -108,7 +108,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction"> <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/> - <include-form name="UpdateProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="UpdateProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -116,7 +116,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -126,24 +126,24 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> - <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ViewListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingMaterials}"> - <include-form name="ListProductionRunComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunNotes}"> - <include-form name="ListProductionRunNotes" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunNotes" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -187,7 +187,7 @@ under the License. <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunId} ${productionRunId}" navigation-menu-name="ProductionRunStatusAction"> <include-menu name="ProductionRunStatusTabBar" location="component://manufacturing/widget/manufacturing/ManufacturingMenus.xml"/> - <include-form name="ShowProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ShowProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -195,7 +195,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingProductionRunProduce}"> - <include-form name="ProductionRunProduce" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ProductionRunProduce" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -205,13 +205,13 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclareAndProduce}"> - <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ProductionRunDeclareAndProduceTop" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + <include-form name="ProductionRunDeclareAndProduceBottom" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingInventoryItemsProduced}"> - <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunInventoryItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -219,7 +219,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -229,15 +229,15 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> <screenlet title="${uiLabelMap.ManufacturingOrderItems}"> - <include-form name="ListProductionRunOrderItems" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunOrderItems" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> - <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunDeclRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> <platform-specific> @@ -245,13 +245,13 @@ under the License. </platform-specific> </screenlet> <screenlet title="${uiLabelMap.ManufacturingMaterialsRequiredByRunningTask}"> - <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListIssueProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingReturnMaterials}"> - <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListReturnProductionRunDeclComponents" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingListOfProductionRunFixedAssets}"> - <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunTaskFixedAssets" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -311,10 +311,10 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingMandatoryWorkEfforts}"> - <include-form name="mandatoryWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="mandatoryWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.ManufacturingDependentWorkEfforts}"> - <include-form name="dependentWorkEfforts" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="dependentWorkEfforts" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </decorator-section> </decorator-screen> @@ -344,9 +344,9 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet id="EditProductionRunRoutingTaskPanel" title="${uiLabelMap.ManufacturingProductionRunTasks}" collapsible="true"> - <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="EditProductionRunRoutingTask" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> - <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunRoutingTasks" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -371,7 +371,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingProductionRunComponents}"> - <include-form name="AddProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="AddProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <widgets> @@ -404,7 +404,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingActualMaterials}"> - <include-form name="IssueProductionRunComponent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="IssueProductionRunComponent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <platform-specific> <html><html-template location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl"/></html> @@ -433,7 +433,7 @@ under the License. <decorator-screen name="CommonJobshopDecorator" location="${parameters.commonJobshopDecorator}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingTaskFixedAssets}"> - <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="AddProductionRunTaskFixedAsset" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <widgets> @@ -493,10 +493,10 @@ under the License. <decorator-section name="body"> <section> <widgets> - <include-form name="ListProductionRunContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="ListProductionRunContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> <screenlet title="Import Content From Product ${delivProductId}"> - <include-form name="FindDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> - <include-form name="ListDelivProductContent" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="FindDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> + <include-form name="ListDelivProductContent" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> </widgets> </section> @@ -525,10 +525,10 @@ under the License. </container> </decorator-section> <decorator-section name="search-options"> - <include-form name="findProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="findProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> <decorator-section name="search-results"> - <include-form name="listFindProductionRun" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listFindProductionRun" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </decorator-section> </decorator-screen> </widgets> @@ -559,7 +559,7 @@ under the License. <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.ManufacturingWorkWithShipmentPlans}"> - <include-form name="listShipmentPlans" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listShipmentPlans" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> @@ -567,7 +567,7 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.FormFieldTitle_shipmentId} ${shipment.shipmentId}"> - <include-form name="listShipmentPlan" location="component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml"/> + <include-form name="listShipmentPlan" location="component://manufacturing/widget/manufacturing/ProductionRunForms.xml"/> </screenlet> <section> <condition> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |