svn commit: r1564402 [2/2] - in /ofbiz/branches/webhelp-2012-1
Locked
svn commit: r1564402 [2/2] - in /ofbiz/branches/webhelp-2012-1
 
|
Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_NL.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_NL.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_NL.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_NL.xml Tue Feb 4 18:03:54 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/webhelp-2012-12-07/applications/manufacturing/documents/manufacturing.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/documents/manufacturing.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/documents/manufacturing.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/documents/manufacturing.xml Tue Feb 4 18:03:54 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/webhelp-2012-12-07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Tue Feb 4 18:03:54 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,10 +825,39 @@ 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"> - <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false"> + <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false" link-type="anchor"> <parameter param-name="productionRunId" from-field="workEffortIdFrom"/> </hyperlink> </field> @@ -857,7 +886,7 @@ under the License. <form name="dependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortIdTo" title=" " widget-style="buttontext"> - <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false"> + <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false" link-type="anchor"> <parameter param-name="productionRunId" from-field="workEffortIdTo"/> </hyperlink> </field> Modified: ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Tue Feb 4 18:03:54 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/webhelp-2012-12-07/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/build.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/build.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/build.xml Tue Feb 4 18:03:54 2014 @@ -1155,16 +1155,22 @@ under the License. <ivy:cleancache/> </target> - <target name="download-activemq" description="Download activemq for DCC (Distributed Cache Clearing)"> + <target name="download-activemq" description="Download activemq for DCC (Distributed Cache Clearing"> <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="activemq"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <target name="download-cobertura" description="Download cobertura related files"> <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="cobertura"/> </target> - <target name="download-PG-JDBC" description="Download postgres jdbc driver"> + <target name="download-PG-JDBC" description="Download postgres jdbc driver"> <ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="postgres"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <target name="download-sonar-ant-task" description="Download sonar related files"> @@ -1173,6 +1179,9 @@ under the License. <target name="download-mySQL-JDBC" description="Download mySQL jdbc driver"> <ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="mysql"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <!-- ================================================================== --> Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/htmlTemplate.ftl?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/htmlTemplate.ftl Tue Feb 4 18:03:54 2014 @@ -29,23 +29,14 @@ under the License. <#if (!id?has_content)> <#local id = Static["org.ofbiz.base.util.UtilHttp"].getNextUniqueId(request) /> </#if> - <#if (!ajaxUrl?has_content)> - <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/> - <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" /> + <#if "true" == readonly> + <#local readonly = true/> + <#else> + <#local readonly = false /> </#if> - <#if (!showDescription?has_content)> - <#local showDescription = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.lookup.showDescription", "N")> - <#if "Y" == showDescription> - <#local showDescription = "true" /> - <#else> - <#local showDescription = "false" /> - </#if> + <#if userPreferences.VISUAL_THEME == "BIZZNESS_TIME"> + <#local position = "center" /> </#if> - <#if "true" == readonly> - <#local readonly = true/> - <#else> - <#local readonly = false /> - </#if> <@renderLookupField name formName fieldFormName className alert value size maxlength id event action readonly autocomplete descriptionFieldName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed/> </#macro> @@ -75,4 +66,4 @@ under the License. </#if> </#if> <@renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl uiLabelMap.CommonFirst paginatePreviousStyle ajaxPreviousUrl previousUrl uiLabelMap.CommonPrevious uiLabelMap.CommonPage ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl uiLabelMap.CommonNext paginateLastStyle ajaxLastUrl lastUrl uiLabelMap.CommonLast uiLabelMap.CommonItemsPerPage/> -</#macro> \ No newline at end of file +</#macro> Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/lookup.ftl?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/lookup.ftl Tue Feb 4 18:03:54 2014 @@ -34,7 +34,7 @@ under the License. if (typeof(jQuery) == 'undefined') { if (!jQueryLibLoaded) { jQueryLibLoaded = true; - document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.10.2.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); + document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.11.0.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-migrate-1.2.1.js</@ofbizContentUrl>\"></scr" + "ipt>"); } setTimeout("initJQuery()", 50); Modified: ofbiz/branches/webhelp-2012-12-07/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/common/widget/CommonScreens.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/framework/common/widget/CommonScreens.xml Tue Feb 4 18:03:54 2014 @@ -150,7 +150,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true" /> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true" /> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true" /> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true" /> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" /> @@ -481,7 +481,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/cmssite/template/cms/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) +++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/cmssite/template/cms/HtmlHead.ftl Tue Feb 4 18:03:54 2014 @@ -32,7 +32,7 @@ under the License. <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/> <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> - <link rel="stylesheet" href="/contentimages/contentForum.css" type="text/css"/> + <link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/> <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/> <meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)!}"/> Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/EcommerceTypeData.xml Tue Feb 4 18:03:54 2014 @@ -23,7 +23,7 @@ under the License. <VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="02"/> - <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/contentForum.css" sequenceId="03"/> + <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="03"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/> Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml Tue Feb 4 18:03:54 2014 @@ -47,7 +47,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> @@ -262,7 +262,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true" /> Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleHelpData.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleHelpData.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleHelpData.xml Tue Feb 4 18:03:54 2014 @@ -26,12 +26,13 @@ under the License. dataResourceId="HELP_EXAMPLE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EXAMPLE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> - <DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/xml" isPublic="Y" - objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml" - dataResourceName="Exemple pour le développement" /> - <Content contentId="HELP_EXAMPLE_FR" dataResourceId="HELP_EXAMPLE_FR" contentName="Exemple pour le développement" localeString="fr" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> + <DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" + objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + dataResourceName="Exemple pour le développement" mimeTypeId="text/xml" isPublic="Y" /> + <Content contentId="HELP_EXAMPLE_FR" contentTypeId="DOCUMENT" contentName="Exemple pour le développement" templateDataResourceId="HELP_TEMPL" + dataResourceId="HELP_EXAMPLE_FR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html" localeString="fr" /> <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="HELP_EXAMPLE_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> - + <DataResource dataResourceId="EXAMPLE_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EXAMPLE_main" contentTypeId="DOCUMENT" contentName="Example main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |