svn commit: r1566542 [2/3] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1566542 [2/3] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_NL.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_NL.xml?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_NL.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_NL.xml Mon Feb 10 09:33:25 2014 @@ -21,297 +21,261 @@ <entity-engine-xml> <!-- This is the mapping for the help screens in locale NL --> <DataResource dataResourceId="HELP_MFG_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" - dataResourceName="OFBiz:MFG Overview (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> - <Content contentId="HELP_MFG_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="OFBiz:MFG (Manufacturing)" templateDataResourceId="HELP_TEMPL" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_NL_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + dataResourceName="OFBiz:MFG Overview (Nederlands)" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="HELP_MFG_NL" contentTypeId="DOCUMENT" contentName="OFBiz:MFG (Manufacturing)" templateDataResourceId="HELP_TEMPL" localeString="nl" dataResourceId="HELP_MFG_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc contentId="HELP_ROOT_NL" contentIdTo="HELP_MFG_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <ContentAssoc contentId="HELP_MFG" contentIdTo="HELP_MFG_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- the main menu --> <DataResource dataResourceId="MFG_Main_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_main_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Main (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_Main_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Main" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Main_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_main" contentId="HELP_MFG_NL" contentIdTo="MFG_Main_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_main" contentId="MFG_Main" contentIdTo="MFG_Main_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_main_NL" contentId="MFG_Main" contentIdTo="MFG_Main_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRuns_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_findProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_findProductionRun_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRuns (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRuns_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production Runs" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRuns_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindProductionRun" contentId="HELP_MFG_NL" contentIdTo="MFG_ProdRuns_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindProductionRun" contentId="MFG_ProdRuns" contentIdTo="MFG_ProdRuns_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindProductionRun_NL" contentId="MFG_ProdRuns" contentIdTo="MFG_ProdRuns_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Routes_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_FindRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindRouting_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Routes (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_Routes_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Routings" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Routes_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindRouting" contentId="HELP_MFG_NL" contentIdTo="MFG_Routes_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindRouting" contentId="MFG_Routes" contentIdTo="MFG_Routes_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindRouting_NL" contentId="MFG_Routes" contentIdTo="MFG_Routes_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTasks_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_FindRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTasks (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_RouteTasks_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Routing Tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTasks_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindRoutingTask" contentId="HELP_MFG_NL" contentIdTo="MFG_RouteTasks_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindRoutingTask" contentId="MFG_RouteTasks" contentIdTo="MFG_RouteTasks_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindRoutingTask_NL" contentId="MFG_RouteTasks" contentIdTo="MFG_RouteTasks_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Cals_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_FindCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindCalendar_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Cals (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_Cals_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Calendars" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Cals_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindCalendar" contentId="HELP_MFG_NL" contentIdTo="MFG_Cals_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindCalendar" contentId="MFG_Cals" contentIdTo="MFG_Cals_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindCalendar_NL" contentId="MFG_Cals" contentIdTo="MFG_Cals_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_CostCalcs_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditCostCalcs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_CostCalcs (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_CostCalcs_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Cost Components" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_CostCalcs_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditCostCalcs" contentId="HELP_MFG_NL" contentIdTo="MFG_CostCalcs_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditCostCalcs" contentId="MFG_CostCalcs" contentIdTo="MFG_CostCalcs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditCostCalcs_NL" contentId="MFG_CostCalcs" contentIdTo="MFG_CostCalcs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_BOMs_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_FindBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindBom_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_BOMs (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_BOMs_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Bill of Materials" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_BOMs_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindBom" contentId="HELP_MFG_NL" contentIdTo="MFG_BOMs_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindBom" contentId="MFG_BOMs" contentIdTo="MFG_BOMs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindBom_NL" contentId="MFG_BOMs" contentIdTo="MFG_BOMs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_MRPs_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_FindInventoryEventPlan.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_MRPs (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_MRPs_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Materials Resource Plans" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_MRPs_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_FindInventoryEventPlan" contentId="HELP_MFG_NL" contentIdTo="MFG_MRPs_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_FindInventoryEventPlan" contentId="MFG_MRPs" contentIdTo="MFG_MRPs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_FindInventoryEventPlan_NL" contentId="MFG_MRPs" contentIdTo="MFG_MRPs_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ShipPlans_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_WorkWithShipmentPlans.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ShipPlans (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ShipPlans_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Shipment Plans" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ShipPlans_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_WorkWithShipmentPlans" contentId="HELP_MFG_NL" contentIdTo="MFG_ShipPlans_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_WorkWithShipmentPlans" contentId="MFG_ShipPlans" contentIdTo="MFG_ShipPlans_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_WorkWithShipmentPlans_NL" contentId="MFG_ShipPlans" contentIdTo="MFG_ShipPlans_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Reports_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ManufacturingReports.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Reports (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_Reports_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Reports" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Reports_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ManufacturingReports" contentId="HELP_MFG_NL" contentIdTo="MFG_Reports_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ManufacturingReports" contentId="MFG_Reports" contentIdTo="MFG_Reports_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ManufacturingReports_NL" contentId="MFG_Reports" contentIdTo="MFG_Reports_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- Regarding Bill of Materials --> <DataResource dataResourceId="MFG_eBOM_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductBom_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eBOM (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eBOM_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit BoM" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eBOM_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductBom" contentId="MFG_BOMs_NL" contentIdTo="MFG_eBOM_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductBom" contentId="MFG_eBOM" contentIdTo="MFG_eBOM_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditProductBom_NL" contentId="MFG_eBOM" contentIdTo="MFG_eBOM_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_sBOM_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_BomSimulation.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_BomSimulation_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_sBOM (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_sBOM_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Simulate BoM" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_sBOM_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_BomSimulation" contentId="MFG_BOMs_NL" contentIdTo="MFG_sBOM_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_BomSimulation" contentId="MFG_sBOM" contentIdTo="MFG_sBOM_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_BomSimulation_NL" contentId="MFG_sBOM" contentIdTo="MFG_sBOM_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eMFGRules_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductManufacturingRules.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eMFGRules (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eMFGRules_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit manufacturing rules" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eMFGRules_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductManufacturingRules" contentId="MFG_BOMs_NL" contentIdTo="MFG_eMFGRules_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductManufacturingRules" contentId="MFG_eMFGRules" contentIdTo="MFG_eMFGRules_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditProductManufacturingRules_NL" contentId="MFG_eMFGRules" contentIdTo="MFG_eMFGRules_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- Regarding MRP --> <DataResource dataResourceId="MFG_rMRP_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_RunMRP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_RunMRP_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_rMRP (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_rMRP_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Run MRP" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_rMRP_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_RunMrp" contentId="MFG_MRPs_NL" contentIdTo="MFG_rMRP_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_RunMrp" contentId="MFG_rMRP" contentIdTo="MFG_rMRP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_RunMrp_NL" contentId="MFG_rMRP" contentIdTo="MFG_rMRP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- Regarding Routing and Routing Tasks --> <DataResource dataResourceId="MFG_eRoute_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRouting_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRoute (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRoute_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit route" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRoute_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRouting" contentId="MFG_Routes_NL" contentIdTo="MFG_eRoute_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRouting" contentId="MFG_eRoute" contentIdTo="MFG_eRoute_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRouting_NL" contentId="MFG_eRoute" contentIdTo="MFG_eRoute_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTA_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskAssoc.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTA (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRouteTA_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit route associated task(s)" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTA_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskAssoc" contentId="MFG_eRoute_NL" contentIdTo="MFG_eRouteTA_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskAssoc" contentId="MFG_eRouteTA" contentIdTo="MFG_eRouteTA_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskAssoc_NL" contentId="MFG_eRouteTA" contentIdTo="MFG_eRouteTA_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRoutePL_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingProductLink.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRoutePL (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRoutePL_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit route associated product(s)" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRoutePL_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingProductLink" contentId="MFG_eRoute_NL" contentIdTo="MFG_eRoutePL_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingProductLink" contentId="MFG_eRoutePL" contentIdTo="MFG_eRoutePL_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingProductLink_NL" contentId="MFG_eRoutePL" contentIdTo="MFG_eRoutePL_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTask_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTask (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRouteTask_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit routing task" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTask_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTask" contentId="MFG_RouteTasks_NL" contentIdTo="MFG_eRouteTask_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTask" contentId="MFG_eRouteTask" contentIdTo="MFG_eRouteTask_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingTask_NL" contentId="MFG_eRouteTask" contentIdTo="MFG_eRouteTask_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTC_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskCost.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTC (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRouteTC_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit routing task cost" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTC_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskCost" contentId="MFG_eRouteTask_NL" contentIdTo="MFG_eRouteTC_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskCost" contentId="MFG_eRouteTC" contentIdTo="MFG_eRouteTC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskCost_NL" contentId="MFG_eRouteTC" contentIdTo="MFG_eRouteTC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTaskP_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ListRoutingTaskProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTaskP (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_RouteTaskP_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="List routing task products" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTaskP_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ListRoutingTaskProducts" contentId="MFG_eRouteTask_NL" contentIdTo="MFG_RouteTaskP_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ListRoutingTaskProducts" contentId="MFG_RouteTaskP" contentIdTo="MFG_RouteTaskP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ListRoutingTaskProducts_NL" contentId="MFG_RouteTaskP" contentIdTo="MFG_RouteTaskP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTaskA_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAssets_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTaskA (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_RouteTaskA_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Routing task assets" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTaskA_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskFixedAssets" contentId="MFG_eRouteTask_NL" contentIdTo="MFG_RouteTaskA_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskFixedAssets" contentId="MFG_RouteTaskA" contentIdTo="MFG_RouteTaskA_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskFixedAssets_NL" contentId="MFG_RouteTaskA" contentIdTo="MFG_RouteTaskA_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTaskP_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditRoutingTaskProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTaskP (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eRouteTaskP_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit routing task product" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTaskP_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskProduct" contentId="MFG_RouteTaskP_NL" contentIdTo="MFG_eRouteTaskP_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskProduct" contentId="MFG_eRouteTaskP" contentIdTo="MFG_eRouteTaskP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskProduct_NL" contentId="MFG_eRouteTaskP" contentIdTo="MFG_eRouteTaskP_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- Regarding Production Runs --> <DataResource dataResourceId="MFG_sProdRun_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ShowProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_sProdRun (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_sProdRun_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Show production run" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_sProdRun_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ShowProductionRun" contentId="MFG_ProdRuns_NL" contentIdTo="MFG_sProdRun_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ShowProductionRun" contentId="MFG_sProdRun" contentIdTo="MFG_sProdRun_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ShowProductionRun_NL" contentId="MFG_sProdRun" contentIdTo="MFG_sProdRun_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eProdRun_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eProdRun (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eProdRun_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit production run" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eProdRun_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductionRun" contentId="MFG_sProdRun_NL" contentIdTo="MFG_eProdRun_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditProductionRun" contentId="MFG_eProdRun" contentIdTo="MFG_eProdRun_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditProductionRun_NL" contentId="MFG_eProdRun" contentIdTo="MFG_eProdRun_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunT (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunT_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunT_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunTasks" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunT_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunTasks" contentId="MFG_ProdRunT" contentIdTo="MFG_ProdRunT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunTasks_NL" contentId="MFG_ProdRunT" contentIdTo="MFG_ProdRunT_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunC_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunComponents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunC (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunC_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run components" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunC_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunComponents" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunComponents" contentId="MFG_ProdRunC" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunComponents_NL" contentId="MFG_ProdRunC" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunAt_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunAt (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunAt_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run fixed assets" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunAt_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunFixedAssets" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunAt_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunFixedAssets" contentId="MFG_ProdRunAt" contentIdTo="MFG_ProdRunAt_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunFixedAssets_NL" contentId="MFG_ProdRunAt" contentIdTo="MFG_ProdRunAt_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunAc_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunAssocs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunAc (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunAc_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run associations" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunAc_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunAssocs" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunAc_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunAssocs" contentId="MFG_ProdRunAc" contentIdTo="MFG_ProdRunAc_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunAssocs_NL" contentId="MFG_ProdRunAc" contentIdTo="MFG_ProdRunAc_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunC_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunC (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunC_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run content" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunC_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunContent" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunContent" contentId="MFG_ProdRunC" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunContent_NL" contentId="MFG_ProdRunC" contentIdTo="MFG_ProdRunC_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunE_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ProductionRunCosts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunE (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_ProdRunE_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Production run costs" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunE_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunCosts" contentId="MFG_sProdRun_NL" contentIdTo="MFG_ProdRunE_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ProductionRunCosts" contentId="MFG_ProdRunE" contentIdTo="MFG_ProdRunE_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ProductionRunCosts_NL" contentId="MFG_ProdRunE" contentIdTo="MFG_ProdRunE_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <!-- Regarding Calendars --> <DataResource dataResourceId="MFG_CalWks_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_ListCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_CalWks (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_CalWks_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Calendar weeks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_CalWks_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_ListCalendarWeek" contentId="MFG_Cals_NL" contentIdTo="MFG_CalWks_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_ListCalendarWeek" contentId="MFG_CalWks" contentIdTo="MFG_CalWks_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_ListCalendarWeek_NL" contentId="MFG_CalWks" contentIdTo="MFG_CalWks_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCal_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendar_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCal (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eCal_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit calendar" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCal_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendar" contentId="MFG_Cals_NL" contentIdTo="MFG_eCal_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendar" contentId="MFG_eCal" contentIdTo="MFG_eCal_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditCalendar_NL" contentId="MFG_eCal" contentIdTo="MFG_eCal_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalED_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarExceptionDay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalED (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eCalED_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit calendar exception day" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalED_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionDay" contentId="MFG_eCal_NL" contentIdTo="MFG_eCalED_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionDay" contentId="MFG_eCalED" contentIdTo="MFG_eCalED_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionDay_NL" contentId="MFG_eCalED" contentIdTo="MFG_eCalED_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalEW_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarExceptionWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalEW (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eCalEW_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit calendar exception Week" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalEW_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionWeek" contentId="MFG_eCal_NL" contentIdTo="MFG_eCalEW_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionWeek" contentId="MFG_eCalEW" contentIdTo="MFG_eCalEW_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionWeek_NL" contentId="MFG_eCalEW" contentIdTo="MFG_eCalEW_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalWk_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/NL/Help_MFG_EditCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalWk (Nederlands)" mimeTypeId="text/xml" isPublic="Y"/> <Content contentId="MFG_eCalWk_NL" contentTypeId="DOCUMENT" localeString="nl" contentName="Edit Calendar week" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalWk_NL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarWeek" contentId="MFG_CalWks_NL" contentIdTo="MFG_eCalWk_NL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> - <ContentAssoc mapKey="MANUFACTURING_EditCalendarWeek" contentId="MFG_eCalWk" contentIdTo="MFG_eCalWk_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> + <ContentAssoc mapKey="MANUFACTURING_EditCalendarWeek_NL" contentId="MFG_eCalWk" contentIdTo="MFG_eCalWk_NL" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/documents/manufacturing.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/documents/manufacturing.xml?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/documents/manufacturing.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/documents/manufacturing.xml Mon Feb 10 09:33:25 2014 @@ -25,14 +25,40 @@ xmlns="http://docbook.org/ns/docbook"> <title>Manufacturing</title> <xi:include href="../data/helpdata/Help_MFG.xml"/> - <xi:include href="../data/helpdata/Help_MFG_main.xml"/> + <xi:include href="../data/helpdata/Help_MFG_BomSimulation.xml"/> + <xi:include href="../data/helpdata/Help_MFG_CreateProductionRun.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditCalendar.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditCalendarExceptionDay.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditCalendarWeek.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditCostCalcs.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditProductBom.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditProductManufacturingRules.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditProductionRun.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRouting.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingProductLink.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingTask.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingTaskCost.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingTaskFixedAsset.xml"/> + <xi:include href="../data/helpdata/Help_MFG_EditRoutingTaskProduct.xml"/> + <xi:include href="../data/helpdata/Help_MFG_FindBom.xml"/> + <xi:include href="../data/helpdata/Help_MFG_FindCalendar.xml"/> + <xi:include href="../data/helpdata/Help_MFG_FindInventoryEventPlan.xml"/> <xi:include href="../data/helpdata/Help_MFG_FindProductionRun.xml"/> <xi:include href="../data/helpdata/Help_MFG_FindRouting.xml"/> <xi:include href="../data/helpdata/Help_MFG_FindRoutingTask.xml"/> - <xi:include href="../data/helpdata/Help_MFG_FindCalendar.xml"/> - <xi:include href="../data/helpdata/Help_MFG_EditCostCalc.xml"/> - <xi:include href="../data/helpdata/Help_MFG_FindBom.xml"/> - <xi:include href="../data/helpdata/Help_MFG_FindInventoryEventPlan.xml"/> - <xi:include href="../data/helpdata/Help_MFG_WorkWithShipmentPlans.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ListCalendarWeek.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ListRoutingTaskProducts.xml"/> <xi:include href="../data/helpdata/Help_MFG_ManufacturingReports.xml"/> -</chapter> \ No newline at end of file + <xi:include href="../data/helpdata/Help_MFG_ProductionRunAssocs.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ProductionRunComponents.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ProductionRunContent.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ProductionRunCosts.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ProductionRunFixedAssets.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ProductionRunTasks.xml"/> + <xi:include href="../data/helpdata/Help_MFG_RunMRP.xml"/> + <xi:include href="../data/helpdata/Help_MFG_ShowProductionRun.xml"/> + <xi:include href="../data/helpdata/Help_MFG_WorkWithShipmentPlans.xml"/> + <xi:include href="../data/helpdata/Help_MFG_main.xml"/> +</chapter> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Mon Feb 10 09:33:25 2014 @@ -22,9 +22,9 @@ under the License. xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <form name="CreateProductionRun" target="createProductionRun" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct" size="16"/></field> - <field name="quantity" title="${uiLabelMap.ManufacturingQuantity}"><text size="6"/></field> - <field name="startDate" title="${uiLabelMap.ManufacturingStartDate}"><date-time/></field> + <field name="productId" title="${uiLabelMap.ProductProductId}" required-field="true"><lookup target-form-name="LookupProduct" size="16"/></field> + <field name="quantity" title="${uiLabelMap.ManufacturingQuantity}" required-field="true"><text size="6"/></field> + <field name="startDate" title="${uiLabelMap.ManufacturingStartDate}" required-field="true"><date-time/></field> <field name="facilityId"> <drop-down allow-empty="false"> <entity-options entity-name="Facility" description="${facilityName} [${facilityId}]"> @@ -69,7 +69,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="listFindProductionRun" list-name="listIt" title="" type="list" paginate-target="/FindProductionRun" + <form name="listFindProductionRun" list-name="listIt" title="" type="list" paginate-target="FindProductionRun" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map="result" result-map-list="listIt"> @@ -825,6 +825,35 @@ under the License. <submit button-type="button"/> </field> </form> + <form name="linkProductionRun" type="single" target="createProductionRunAssoc" title="" + header-row-style="header-row" default-table-style="basic-table"> + <field name="productionRunId"><hidden/></field> + <field name="workEffortAssocTypeId"><hidden value="WORK_EFF_PRECEDENCY"/></field> + <field name="productionRunIdTo"> + <drop-down allow-empty="false"> + <entity-options entity-name="WorkEffort" key-field-name="workEffortId" description="[ID: ${workEffortId}] - ${workEffortName}"> + <entity-constraint name="workEffortPurposeTypeId" value="WEPT_PRODUCTION_RUN"/> + <entity-order-by field-name="workEffortId"/> + </entity-options> + </drop-down> + </field> + <!-- + <field name="productionRunLookup"> + <lookup target-form-name="LookupProductRun"/> + </field> + --> + <field name="workFlowSequenceTypeId"> + <drop-down allow-empty="false"> + <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> + <entity-constraint name="enumTypeId" value="WORKFLOW"/> + <entity-order-by field-name="sequenceId"/> + </entity-options> + </drop-down> + </field> + <field name="submitButton" title="${uiLabelMap.CommonSubmit}"> + <submit button-type="button"/> + </field> + </form> <form name="mandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortIdFrom" title=" " widget-style="buttontext"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Mon Feb 10 09:33:25 2014 @@ -1383,6 +1383,7 @@ public class OrderReturnServices { Map<String, Object> orderPaymentPrefDetails = pmtppit.next(); GenericValue orderPaymentPreference = (GenericValue) orderPaymentPrefDetails.get("orderPaymentPreference"); BigDecimal orderPaymentPreferenceAvailable = (BigDecimal) orderPaymentPrefDetails.get("availableTotal"); + GenericValue refundOrderPaymentPreference=null; // Refund up to the maxAmount for the paymentPref, or whatever is left to refund if that's less than the maxAmount BigDecimal amountToRefund = orderPaymentPreferenceAvailable.min(amountLeftToRefund); @@ -1394,23 +1395,36 @@ public class OrderReturnServices { // Call the refund service to refund the payment if (electronicTypes.contains(paymentMethodTypeId)) { try { - // for electronic types such as CREDIT_CARD and EFT_ACCOUNT, use refundPayment service - serviceResult = dispatcher.runSync("refundPayment", UtilMisc.<String, Object>toMap("orderPaymentPreference", orderPaymentPreference, "refundAmount", amountToRefund.setScale(decimals, rounding), "userLogin", userLogin)); + Map<String, Object> serviceContext = UtilMisc.toMap("orderId", orderId,"userLogin", context.get("userLogin")); + serviceContext.put("paymentMethodId", orderPaymentPreference.getString("paymentMethodId")); + serviceContext.put("paymentMethodTypeId", orderPaymentPreference.getString("paymentMethodTypeId")); + serviceContext.put("statusId", orderPaymentPreference.getString("statusId")); + serviceContext.put("maxAmount", amountToRefund.setScale(decimals, rounding)); + String orderPaymentPreferenceNewId = null; + Map<String, Object> result = dispatcher.runSync("createOrderPaymentPreference", serviceContext); + orderPaymentPreferenceNewId = (String) result.get("orderPaymentPreferenceId"); + try { + refundOrderPaymentPreference = delegator.findOne("OrderPaymentPreference", false, "orderPaymentPreferenceId", orderPaymentPreferenceNewId); + } catch (GenericEntityException e) { + return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemsWithTheRefundSeeLogs", locale)); + } + serviceResult = dispatcher.runSync("refundPayment", UtilMisc.<String, Object>toMap("orderPaymentPreference", refundOrderPaymentPreference, "refundAmount", amountToRefund.setScale(decimals, rounding), "userLogin", userLogin)); if (ServiceUtil.isError(serviceResult) || ServiceUtil.isFailure(serviceResult)) { Debug.logError("Error in refund payment: " + ServiceUtil.getErrorMessage(serviceResult), module); continue; } + // for electronic types such as CREDIT_CARD and EFT_ACCOUNT, use refundPayment service paymentId = (String) serviceResult.get("paymentId"); amountRefunded = (BigDecimal) serviceResult.get("refundAmount"); } catch (GenericServiceException e) { - Debug.logError(e, "Problem running the refundPayment service", module); - return ServiceUtil.returnError(UtilProperties.getMessage(resource_error, - "OrderProblemsWithTheRefundSeeLogs", locale)); + return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemsWithTheRefundSeeLogs", locale)); } } else if (paymentMethodTypeId.equals("EXT_BILLACT")) { try { // for Billing Account refunds - serviceResult = dispatcher.runSync("refundBillingAccountPayment", UtilMisc.<String, Object>toMap("orderPaymentPreference", orderPaymentPreference, "refundAmount", amountToRefund.setScale(decimals, rounding), "userLogin", userLogin)); + serviceResult = dispatcher.runSync("refundBillingAccountPayment", + UtilMisc.<String, Object> toMap("orderPaymentPreference", orderPaymentPreference, "refundAmount", + amountToRefund.setScale(decimals, rounding), "userLogin", userLogin)); if (ServiceUtil.isError(serviceResult) || ServiceUtil.isFailure(serviceResult)) { Debug.logError("Error in refund payment: " + ServiceUtil.getErrorMessage(serviceResult), module); continue; @@ -1447,7 +1461,11 @@ public class OrderReturnServices { // Fill out the data for the new ReturnItemResponse Map<String, Object> response = FastMap.newInstance(); - response.put("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId")); + if (UtilValidate.isNotEmpty(refundOrderPaymentPreference)) { + response.put("orderPaymentPreferenceId", refundOrderPaymentPreference.getString("orderPaymentPreferenceId")); + } else { + response.put("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId")); + } response.put("responseAmount", amountRefunded.setScale(decimals, rounding)); response.put("responseDate", now); response.put("userLogin", userLogin); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js Mon Feb 10 09:33:25 2014 @@ -664,6 +664,7 @@ function toggleScreenlet(link, areaId, s * @param element The id of the display field * @param url The request to be called to update the display field * @param options Options to be passed to Ajax.InPlaceEditor + * https://cwiki.apache.org/confluence/display/OFBIZ/Enhancing+Display+Widget+to+use+Ajax.InPlaceEditor */ function ajaxInPlaceEditDisplayField(element, url, options) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd Mon Feb 10 09:33:25 2014 @@ -210,6 +210,17 @@ under the License. </xs:attribute> </xs:attributeGroup> + <xs:attribute name="delegator-name" type="xs:string"> + <xs:annotation> + <xs:documentation> + An alternate delegator name. When specified, the entity operation will use the + alternate delegator instead of the current delegator. + + Optional. Attribute types: constant, ${expression}. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <!-- ============================= ===== The Root Elements ===== @@ -583,7 +594,7 @@ under the License. <xs:element ref="field" /> <xs:element ref="string" /> </xs:choice> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute name="class-name" type="javaClassName" use="required"> <xs:annotation> <xs:documentation> @@ -988,7 +999,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -1095,7 +1106,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="request-name"> <xs:annotation> <xs:documentation> @@ -1125,7 +1136,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="session-name"> <xs:annotation> <xs:documentation> @@ -1248,7 +1259,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="from"> <xs:annotation> <xs:documentation> @@ -1686,7 +1697,7 @@ under the License. </xs:documentation> </xs:annotation> <xs:complexType> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="resource" use="required"> <xs:annotation> <xs:documentation> @@ -2985,15 +2996,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="delegator-name" type="xs:string"> - <xs:annotation> - <xs:documentation> - Overrides the current delegator by specifying a delegator name. - - Optional. Attribute type: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:attributeGroup> <xs:element name="clear-cache-line" substitutionGroup="EntityValueOperations"> @@ -3025,6 +3028,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -3035,7 +3039,9 @@ under the License. This element should be used sparingly because of the performance impact. </xs:documentation> </xs:annotation> - <xs:complexType/> + <xs:complexType> + <xs:attribute ref="delegator-name" /> + </xs:complexType> </xs:element> <xs:element name="clone-value" substitutionGroup="EntityValueOperations"> @@ -3343,15 +3349,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="delegator-name" type="xs:string"> - <xs:annotation> - <xs:documentation> - Overrides the current delegator by specifying a delegator name. - - Optional. Attribute type: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -3400,15 +3398,7 @@ under the License. </xs:annotation> </xs:attribute> <xs:attribute ref="error-list-name" /> - <xs:attribute type="xs:string" name="delegator-name"> - <xs:annotation> - <xs:documentation> - Overrides the current delegator by specifying a delegator name. - - Optional. Attribute type: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -3463,6 +3453,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -3686,15 +3677,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="delegator-name"> - <xs:annotation> - <xs:documentation> - Overrides the current delegator by specifying a delegator name. - - Optional. Attribute type: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -3753,15 +3736,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute type="xs:string" name="delegator-name"> - <xs:annotation> - <xs:documentation> - Overrides the current delegator by specifying a delegator name. - - Optional. Attribute type: constant, ${expression}. - </xs:documentation> - </xs:annotation> - </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -4056,6 +4031,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -4166,6 +4142,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -4196,6 +4173,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -4302,7 +4280,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute ref="field" /> + <xs:attribute ref="field" use="required" /> <xs:attribute type="xs:string" name="stagger-max"> <xs:annotation> <xs:documentation> @@ -4324,6 +4302,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> @@ -4431,6 +4410,7 @@ under the License. </xs:documentation> </xs:annotation> </xs:attribute> + <xs:attribute ref="delegator-name" /> </xs:complexType> </xs:element> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java Mon Feb 10 09:33:25 2014 @@ -22,11 +22,11 @@ import java.util.Map; import org.ofbiz.base.util.collections.FlexibleMapAccessor; import org.ofbiz.base.util.string.FlexibleStringExpander; +import org.ofbiz.entity.Delegator; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; import org.ofbiz.minilang.method.MethodContext; -import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; /** @@ -34,7 +34,7 @@ import org.w3c.dom.Element; * * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearcacheline%3E}}">Mini-language Reference</a> */ -public final class ClearCacheLine extends MethodOperation { +public final class ClearCacheLine extends EntityOperation { private final FlexibleStringExpander entityNameFse; private final FlexibleMapAccessor<Map<String, ? extends Object>> mapFma; @@ -42,9 +42,9 @@ public final class ClearCacheLine extend public ClearCacheLine(Element element, SimpleMethod simpleMethod) throws MiniLangException { super(element, simpleMethod); if (MiniLangValidate.validationOn()) { - MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "map"); + MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "map", "delegator-name"); MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name"); - MiniLangValidate.expressionAttributes(simpleMethod, element, "map"); + MiniLangValidate.expressionAttributes(simpleMethod, element, "map", "delegator-name"); MiniLangValidate.noChildElements(simpleMethod, element); } entityNameFse = FlexibleStringExpander.getInstance(element.getAttribute("entity-name")); @@ -53,12 +53,13 @@ public final class ClearCacheLine extend @Override public boolean exec(MethodContext methodContext) throws MiniLangException { + Delegator delegator = getDelegator(methodContext); String entityName = entityNameFse.expandString(methodContext.getEnvMap()); Map<String, ? extends Object> fieldsMap = mapFma.get(methodContext.getEnvMap()); if (fieldsMap == null) { - methodContext.getDelegator().clearCacheLine(entityName); + delegator.clearCacheLine(entityName); } else { - methodContext.getDelegator().clearCacheLine(entityName, fieldsMap); + delegator.clearCacheLine(entityName, fieldsMap); } return true; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java Mon Feb 10 09:33:25 2014 @@ -18,36 +18,33 @@ *******************************************************************************/ package org.ofbiz.minilang.method.entityops; +import org.ofbiz.entity.Delegator; import org.ofbiz.minilang.MiniLangException; import org.ofbiz.minilang.MiniLangValidate; import org.ofbiz.minilang.SimpleMethod; import org.ofbiz.minilang.method.MethodContext; -import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; /** * Implements the <clear-entity-caches> element. * * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Cclearentitycaches%3E}}">Mini-language Reference</a> */ -public final class ClearEntityCaches extends MethodOperation { +public final class ClearEntityCaches extends EntityOperation { public ClearEntityCaches(Element element, SimpleMethod simpleMethod) throws MiniLangException { super(element, simpleMethod); if (MiniLangValidate.validationOn()) { - NamedNodeMap nnm = element.getAttributes(); - for (int i = 0; i < nnm.getLength(); i++) { - String attributeName = nnm.item(i).getNodeName(); - MiniLangValidate.handleError("Attribute name \"" + attributeName + "\" is not valid.", simpleMethod, element); - } + MiniLangValidate.attributeNames(simpleMethod, element, "delegator-name"); + MiniLangValidate.expressionAttributes(simpleMethod, element, "delegator-name"); MiniLangValidate.noChildElements(simpleMethod, element); } } @Override public boolean exec(MethodContext methodContext) throws MiniLangException { - methodContext.getDelegator().clearAllCaches(); + Delegator delegator = getDelegator(methodContext); + delegator.clearAllCaches(); return true; } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java Mon Feb 10 09:33:25 2014 @@ -68,9 +68,9 @@ public final class CreateValue extends M } try { if (createOrStore) { - methodContext.getDelegator().createOrStore(value, doCacheClear); + value.getDelegator().createOrStore(value, doCacheClear); } else { - methodContext.getDelegator().create(value, doCacheClear); + value.getDelegator().create(value, doCacheClear); } } catch (GenericEntityException e) { String errMsg = "Exception thrown while creating the \"" + valueFma +"\" GenericValue: " + e.getMessage(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java Mon Feb 10 09:33:25 2014 @@ -27,7 +27,6 @@ import org.ofbiz.minilang.MiniLangValida import org.ofbiz.minilang.SimpleMethod; import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; -import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; /** @@ -35,7 +34,7 @@ import org.w3c.dom.Element; * * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centityand%3E}}">Mini-language Reference</a> */ -public final class EntityAnd extends MethodOperation { +public final class EntityAnd extends EntityOperation { public static final String module = EntityAnd.class.getName(); @@ -56,7 +55,7 @@ public final class EntityAnd extends Met @Override public boolean exec(MethodContext methodContext) throws MiniLangException { try { - Delegator delegator = methodContext.getDelegator(); + Delegator delegator = getDelegator(methodContext); this.finder.runFind(methodContext.getEnvMap(), delegator); } catch (GeneralException e) { String errMsg = "Exception thrown while performing entity find: " + e.getMessage(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java Mon Feb 10 09:33:25 2014 @@ -27,7 +27,6 @@ import org.ofbiz.minilang.MiniLangValida import org.ofbiz.minilang.SimpleMethod; import org.ofbiz.minilang.artifact.ArtifactInfoContext; import org.ofbiz.minilang.method.MethodContext; -import org.ofbiz.minilang.method.MethodOperation; import org.w3c.dom.Element; /** @@ -35,7 +34,7 @@ import org.w3c.dom.Element; * * @see <a href="https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference#Mini-languageReference-{{%3Centitycondition%3E}}">Mini-language Reference</a> */ -public final class EntityCondition extends MethodOperation { +public final class EntityCondition extends EntityOperation { public static final String module = EntityCondition.class.getName(); @@ -46,7 +45,7 @@ public final class EntityCondition exten if (MiniLangValidate.validationOn()) { MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "filter-by-date", "list", "distinct", "delegator-name"); MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name", "list"); - MiniLangValidate.expressionAttributes(simpleMethod, element, "list"); + MiniLangValidate.expressionAttributes(simpleMethod, element, "list", "delegator-name"); MiniLangValidate.childElements(simpleMethod, element, "condition-expr", "condition-list", "condition-object", "having-condition-list", "select-field", "order-by", "limit-range", "limit-view", "use-iterator"); MiniLangValidate.requireAnyChildElement(simpleMethod, element, "condition-expr", "condition-list", "condition-object"); } @@ -56,8 +55,8 @@ public final class EntityCondition exten @Override public boolean exec(MethodContext methodContext) throws MiniLangException { try { - Delegator delegator = methodContext.getDelegator(); - this.finder.runFind(methodContext.getEnvMap(), delegator); + Delegator delegator = getDelegator(methodContext); + finder.runFind(methodContext.getEnvMap(), delegator); } catch (GeneralException e) { String errMsg = "Exception thrown while performing entity find: " + e.getMessage(); Debug.logWarning(e, errMsg, module); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |