svn commit: r1564402 [1/2] - in /ofbiz/branches/webhelp-2012-1
Locked
svn commit: r1564402 [1/2] - in /ofbiz/branches/webhelp-2012-1
 
|
Author: jleroux
Date: Tue Feb 4 18:03:54 2014 New Revision: 1564402 URL: http://svn.apache.org/r1564402 Log: Merges trunk HEAD Added: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_EditRouting_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRouting_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindBom.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindBom.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindBom_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindBom_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindRouting.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRouting.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_FindRouting_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRouting_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_RunMRP.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_RunMRP.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_RunMRP_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_RunMRP_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_main.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_main.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/Help_MFG_main_NL.xml - copied unchanged from r1564400, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_main_NL.xml ofbiz/branches/webhelp-2012-12-07/framework/images/webapp/images/jquery/jquery-1.11.0.js - copied unchanged from r1564400, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.11.0.js ofbiz/branches/webhelp-2012-12-07/framework/images/webapp/images/jquery/jquery-1.11.0.min.js - copied unchanged from r1564400, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.11.0.min.js Removed: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/EN/ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/helpdata/NL/ ofbiz/branches/webhelp-2012-12-07/framework/images/webapp/images/jquery/jquery-1.10.2.js ofbiz/branches/webhelp-2012-12-07/framework/images/webapp/images/jquery/jquery-1.10.2.min.js ofbiz/branches/webhelp-2012-12-07/framework/images/webapp/images/jquery/jquery-1.10.2.min.map Modified: ofbiz/branches/webhelp-2012-12-07/ (props changed) ofbiz/branches/webhelp-2012-12-07/.project ofbiz/branches/webhelp-2012-12-07/applications/content/ofbiz-component.xml ofbiz/branches/webhelp-2012-12-07/applications/content/widget/CommonScreens.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_EN.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_NL.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/documents/manufacturing.xml ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/webhelp-2012-12-07/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/webhelp-2012-12-07/build.xml ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/htmlTemplate.ftl ofbiz/branches/webhelp-2012-12-07/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/webhelp-2012-12-07/framework/common/widget/CommonScreens.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/cmssite/template/cms/HtmlHead.ftl ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/EcommerceTypeData.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleHelpData.xml Propchange: ofbiz/branches/webhelp-2012-12-07/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1562008-1564400 Modified: ofbiz/branches/webhelp-2012-12-07/.project URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/.project?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/.project (original) +++ ofbiz/branches/webhelp-2012-12-07/.project Tue Feb 4 18:03:54 2014 @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>ofbiz</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> + <name>webhelp-2012-12-07</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> </projectDescription> Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/ofbiz-component.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/ofbiz-component.xml Tue Feb 4 18:03:54 2014 @@ -70,13 +70,6 @@ under the License. location="webapp/content" base-permission="CONTENTMGR" mount-point="/content"/> - - <webapp name="contentimages" - title="Content Images" - server="default-server" - location="webapp/content/images" - mount-point="/contentimages/" - app-bar-display="false"/> <webapp name="ofbizhelp" title="OFBiz Help" Modified: ofbiz/branches/webhelp-2012-12-07/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/content/widget/CommonScreens.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/content/widget/CommonScreens.xml Tue Feb 4 18:03:54 2014 @@ -32,7 +32,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.ContentCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ContentCompanySubtitle" global="true"/> - <set field="layoutSettings.styleSheets[]" value="/contentimages/contentForum.css" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/content/images/contentForum.css" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="activeApp" value="contentmgr" global="true"/> <set field="applicationMenuName" value="ContentAppBar" global="true"/> Modified: ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_EN.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_EN.xml?rev=1564402&r1=1564401&r2=1564402&view=diff ============================================================================== --- ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_EN.xml (original) +++ ofbiz/branches/webhelp-2012-12-07/applications/manufacturing/data/ManufacturingHelpData_EN.xml Tue Feb 4 18:03:54 2014 @@ -21,7 +21,7 @@ <entity-engine-xml> <!-- This is the mapping for the help screens in locale EN --> <DataResource dataResourceId="HELP_MFG" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="OFBiz:MFG Overview" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_MFG" contentTypeId="DOCUMENT" contentName="Manufacturing" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_MFG" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -29,70 +29,70 @@ <!-- the main menu --> <DataResource dataResourceId="MFG_Main" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Main" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_Main" contentTypeId="DOCUMENT" contentName="Main" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_main" contentId="HELP_MFG" contentIdTo="MFG_Main" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRuns" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_findProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_findProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRuns" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRuns" contentTypeId="DOCUMENT" contentName="Production Runs" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRuns" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindProductionRun" contentId="HELP_MFG" contentIdTo="MFG_ProdRuns" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Routes" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_FindRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Routes" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_Routes" contentTypeId="DOCUMENT" contentName="Routings" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Routes" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindRouting" contentId="HELP_MFG" contentIdTo="MFG_Routes" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTasks" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_FindRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTasks" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_RouteTasks" contentTypeId="DOCUMENT" contentName="Routing Tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTasks" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindRoutingTask" contentId="HELP_MFG" contentIdTo="MFG_RouteTasks" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Cals" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_FindCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Cals" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_Cals" contentTypeId="DOCUMENT" contentName="Calendars" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Cals" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindCalendar" contentId="HELP_MFG" contentIdTo="MFG_Cals" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_CostCalcs" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditCostCalcs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_CostCalcs" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_CostCalcs" contentTypeId="DOCUMENT" contentName="Cost Components" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_CostCalcs" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditCostCalcs" contentId="HELP_MFG" contentIdTo="MFG_CostCalcs" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_BOMs" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_FindBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_BOMs" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_BOMs" contentTypeId="DOCUMENT" contentName="Bill of Materials" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_BOMs" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindBom" contentId="HELP_MFG" contentIdTo="MFG_BOMs" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_MRPs" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_FindInventoryEventPlan.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_MRPs" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_MRPs" contentTypeId="DOCUMENT" contentName="Materials Resource Plans" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_MRPs" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_FindInventoryEventPlan" contentId="HELP_MFG" contentIdTo="MFG_MRPs" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ShipPlans" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_WorkWithShipmentPlans.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ShipPlans" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ShipPlans" contentTypeId="DOCUMENT" contentName="Shipment Plans" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ShipPlans" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_WorkWithShipmentPlans" contentId="HELP_MFG" contentIdTo="MFG_ShipPlans" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_Reports" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ManufacturingReports.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_Reports" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_Reports" contentTypeId="DOCUMENT" contentName="Reports" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_Reports" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -100,21 +100,21 @@ <!-- Regarding Bill of Materials --> <DataResource dataResourceId="MFG_eBOM" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductBom.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eBOM" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eBOM" contentTypeId="DOCUMENT" contentName="Edit BoM" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eBOM" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditProductBom" contentId="MFG_BOMs" contentIdTo="MFG_eBOM" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_sBOM" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_BomSimulation.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_BomSimulation.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_sBOM" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_sBOM" contentTypeId="DOCUMENT" contentName="Simulate BoM" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_sBOM" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_BomSimulation" contentId="MFG_BOMs" contentIdTo="MFG_sBOM" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eMFGRules" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eMFGRules" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eMFGRules" contentTypeId="DOCUMENT" contentName="Edit manufacturing rules" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eMFGRules" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -122,7 +122,7 @@ <!-- Regarding MRP --> <DataResource dataResourceId="MFG_rMRP" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_RunMRP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_RunMRP.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_rMRP" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_rMRP" contentTypeId="DOCUMENT" contentName="Run MRP" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_rMRP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -130,56 +130,56 @@ <!-- Regarding Routing and Routing Tasks --> <DataResource dataResourceId="MFG_eRoute" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRoute" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRoute" contentTypeId="DOCUMENT" contentName="Edit route" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRoute" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRouting" contentId="MFG_Routes" contentIdTo="MFG_eRoute" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTA" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingTaskAssoc.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTA" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRouteTA" contentTypeId="DOCUMENT" contentName="Edit route associated task(s)" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTA" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskAssoc" contentId="MFG_eRoute" contentIdTo="MFG_eRouteTA" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRoutePL" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingProductLink.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRoutePL" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRoutePL" contentTypeId="DOCUMENT" contentName="Edit route associated product(s)" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRoutePL" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRoutingProductLink" contentId="MFG_eRoute" contentIdTo="MFG_eRoutePL" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTask" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTask" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRouteTask" contentTypeId="DOCUMENT" contentName="Edit routing task" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTask" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRoutingTask" contentId="MFG_RouteTasks" contentIdTo="MFG_eRouteTask" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTC" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingTaskCost.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTC" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRouteTC" contentTypeId="DOCUMENT" contentName="Edit routing task cost" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTC" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskCost" contentId="MFG_eRouteTask" contentIdTo="MFG_eRouteTC" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTaskP" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ListRoutingTaskProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTaskP" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_RouteTaskP" contentTypeId="DOCUMENT" contentName="List routing task products" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTaskP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ListRoutingTaskProducts" contentId="MFG_eRouteTask" contentIdTo="MFG_RouteTaskP" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_RouteTaskA" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingTaskFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_RouteTaskA" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_RouteTaskA" contentTypeId="DOCUMENT" contentName="Routing task assets" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_RouteTaskA" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditRoutingTaskFixedAssets" contentId="MFG_eRouteTask" contentIdTo="MFG_RouteTaskA" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eRouteTaskP" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditRoutingTaskProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eRouteTaskP" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eRouteTaskP" contentTypeId="DOCUMENT" contentName="Edit routing task product" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eRouteTaskP" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -187,56 +187,56 @@ <!-- Regarding Production Runs --> <DataResource dataResourceId="MFG_sProdRun" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ShowProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_sProdRun" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_sProdRun" contentTypeId="DOCUMENT" contentName="Show production run" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_sProdRun" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ShowProductionRun" contentId="MFG_ProdRuns" contentIdTo="MFG_sProdRun" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eProdRun" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eProdRun" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eProdRun" contentTypeId="DOCUMENT" contentName="Edit production run" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eProdRun" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditProductionRun" contentId="MFG_sProdRun" contentIdTo="MFG_eProdRun" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunT" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunT" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunT" contentTypeId="DOCUMENT" contentName="Production run tasks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ProductionRunTasks" contentId="MFG_sProdRun" contentIdTo="MFG_ProdRunT" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunC" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunComponents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunC" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunC" contentTypeId="DOCUMENT" contentName="Production run components" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunC" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ProductionRunComponents" contentId="MFG_sProdRun" contentIdTo="MFG_ProdRunC" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunAt" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunAt" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunAt" contentTypeId="DOCUMENT" contentName="Production run fixed assets" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunAt" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ProductionRunFixedAssets" contentId="MFG_sProdRun" contentIdTo="MFG_ProdRunAt" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunAc" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunAssocs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunAc" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunAc" contentTypeId="DOCUMENT" contentName="Production run associations" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunAc" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ProductionRunAssocs" contentId="MFG_sProdRun" contentIdTo="MFG_ProdRunAc" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunC" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunC" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunC" contentTypeId="DOCUMENT" contentName="Production run content" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunC" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ProductionRunContent" contentId="MFG_sProdRun" contentIdTo="MFG_ProdRunC" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_ProdRunE" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ProductionRunCosts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_ProdRunE" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_ProdRunE" contentTypeId="DOCUMENT" contentName="Production run costs" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_ProdRunE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -244,38 +244,38 @@ <!-- Regarding Calendars --> <DataResource dataResourceId="MFG_CalWks" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_ListCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_CalWks" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_CalWks" contentTypeId="DOCUMENT" contentName="Calendar weeks" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_CalWks" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_ListCalendarWeek" contentId="MFG_Cals" contentIdTo="MFG_CalWks" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCal" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendar.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCal" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eCal" contentTypeId="DOCUMENT" contentName="Edit calendar" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCal" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditCalendar" contentId="MFG_Cals" contentIdTo="MFG_eCal" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalED" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditCalendarExceptionDay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalED" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eCalED" contentTypeId="DOCUMENT" contentName="Edit calendar exception day" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalED" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionDay" contentId="MFG_eCal" contentIdTo="MFG_eCalED" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalEW" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditCalendarExceptionWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalEW" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eCalEW" contentTypeId="DOCUMENT" contentName="Edit calendar exception Week" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalEW" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditCalendarExceptionWeek" contentId="MFG_eCal" contentIdTo="MFG_eCalEW" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="MFG_eCalWk" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="applications/manufacturing/data/helpdata/EN/Help_MFG_EditCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MFG_eCalWk" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="MFG_eCalWk" contentTypeId="DOCUMENT" contentName="Edit Calendar week" templateDataResourceId="HELP_TEMPL" dataResourceId="MFG_eCalWk" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc mapKey="MANUFACTURING_EditCalendarWeek" contentId="MFG_CalWks" contentIdTo="MFG_eCalWk" contentAssocTypeId="TREE_CHILD" fromDate="2012-01-12 01:01:01" sequenceNum="000"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |