svn commit: r1566542 [1/3] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1566542 [1/3] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Feb 10 09:33:25 2014 New Revision: 1566542 URL: http://svn.apache.org/r1566542 Log: Merges trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_BomSimulation_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_CreateProductionRun_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionDay_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarExceptionWeek_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendarWeek_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCalendar_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditCostCalcs_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductBom_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductManufacturingRules_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditProductionRun_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRouting.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingProductLink_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskAssoc_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskCost_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskFixedAsset_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTaskProduct_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRoutingTask_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_EditRouting_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_EditRouting_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindBom.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindBom.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindBom_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindBom_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindCalendar_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindInventoryEventPlan_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindProductionRun_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindRouting.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRouting.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRoutingTask_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_FindRouting_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_FindRouting_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListCalendarWeek_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ListRoutingTaskProducts_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ManufacturingReports_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunAssocs_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunComponents_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunContent_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunCosts_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunFixedAssets_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ProductionRunTasks_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_RunMRP.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_RunMRP.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_RunMRP_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_RunMRP_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_ShowProductionRun_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_WorkWithShipmentPlans_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_main.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/Help_MFG_main_NL.xml - copied unchanged from r1566538, ofbiz/trunk/applications/manufacturing/data/helpdata/Help_MFG_main_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-fileupload-1.3.1.jar - copied unchanged from r1566538, ofbiz/trunk/framework/base/lib/commons/commons-fileupload-1.3.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar - copied unchanged from r1566538, ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/lib/geronimo-connector-3.1.1.jar - copied unchanged from r1566538, ofbiz/trunk/framework/geronimo/lib/geronimo-connector-3.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/lib/geronimo-transaction-3.1.1.jar - copied unchanged from r1566538, ofbiz/trunk/framework/geronimo/lib/geronimo-transaction-3.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOperation.java - copied unchanged from r1566538, ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOperation.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.200.v20130326-1255.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.500.v20130515-1343.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.500.v20130515-1343.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.4.0.v20130514-1240.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.4.0.v20130514-1240.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.300.v20130429-1813.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.resources_3.8.101.v20130717-0806.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.resources_3.8.101.v20130717-0806.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.runtime_3.9.0.v20130326-1255.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.core.runtime_3.9.0.v20130326-1255.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.4.1.v201308160907.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.4.1.v201308160907.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.common_2.9.1.v20130827-0309.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.common_2.9.1.v20130827-0309.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.9.0.v20130827-0309.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.9.0.v20130827-0309.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.9.1.v20130827-0309.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.9.1.v20130827-0309.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.9.1.v20130827-0309.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.9.1.v20130827-0309.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20130902-0605.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20130902-0605.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20130327-1442.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20130327-1442.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.200.v20130402-1505.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.5.100.v20130422-1538.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.301.v20130717-1549.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.301.v20130717-1549.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.100.v20130513-1956.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.100.v20130513-1956.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.osgi_3.9.1.v20130814-1242.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.osgi_3.9.1.v20130814-1242.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.200.v20130326-1319.jar - copied unchanged from r1566538, ofbiz/trunk/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.200.v20130326-1319.jar Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/NL/ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-fileupload-1.2.2.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/lib/geronimo-connector-2.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/geronimo/lib/geronimo-transaction-2.1.1.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.expressions_3.4.300.v20110228.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.filesystem_1.3.100.v20110423-0524.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.jobs_3.5.101.v20120113-1953.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.resources_3.7.101.v20120125-1505.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.core.runtime_3.7.0.v20110110.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.datatools.connectivity.oda_3.3.3.v201110130935.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.common_2.7.0.v20120123-0926.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore.change_2.7.1.v20120123-0926.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore.xmi_2.7.0.v20120123-0926.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf.ecore_2.7.0.v20120123-0926.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.emf_2.6.0.v20120123-1045.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.app_1.3.100.v20110321.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.common_3.6.0.v20110523.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.preferences_3.4.2.v20120111-2020.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.equinox.registry_3.5.101.R37x_v20110810-1611.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.osgi.services_3.3.0.v20110513.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.osgi_3.7.2.v20120110-1415.jar ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/lib/org.eclipse.update.configurator_3.3.100.v20100512.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_NL.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/documents/manufacturing.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods-v2.xsd ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearCacheLine.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/ClearEntityCaches.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/CreateValue.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityAnd.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCondition.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityCount.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityData.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/EntityOne.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByAnd.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/FindByPrimaryKey.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeNextSeqId.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/MakeValue.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/RefreshValue.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveByAnd.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveList.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveRelated.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/RemoveValue.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/SequencedIdToEnv.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreList.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/entityops/StoreValue.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/LICENSE ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/data/ExampleHelpData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1563822-1566538 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Mon Feb 10 09:33:25 2014 @@ -67,7 +67,7 @@ <classpathentry kind="lib" path="framework/base/lib/commons/commons-digester3-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-discovery-0.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-el-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.2.2.jar"/> + <classpathentry kind="lib" path="framework/base/lib/commons/commons-fileupload-1.3.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-io-2.4.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-lang-2.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/commons/commons-logging-1.1.2.jar"/> @@ -83,7 +83,7 @@ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/annotations-api-3.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/jsp-api-2.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/servlet-api-3.0.jar"/> @@ -97,7 +97,7 @@ <classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.2.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/> - <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_3.7.2.v20120214-1408.jar"/> + <classpathentry kind="lib" path="specialpurpose/birt/lib/org.eclipse.birt.runtime_4.3.1.v20130918-1142.jar"/> <classpathentry kind="lib" path="specialpurpose/birt/lib/viewservlets.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/ecj-4.2.2.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-catalina-ha.jar"/> @@ -106,8 +106,8 @@ <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-jasper.jar"/> <classpathentry kind="lib" path="framework/catalina/lib/tomcat-7.0.50-tomcat-embed-logging-log4j.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/> - <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> - <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/> + <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/> + <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/> <classpathentry kind="lib" path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/> <classpathentry kind="lib" path="specialpurpose/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/> <classpathentry kind="lib" path="specialpurpose/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Mon Feb 10 09:33:25 2014 @@ -48,7 +48,7 @@ framework/base/lib/commons/commons-csv-1 framework/base/lib/commons/commons-digester3-3.2.jar framework/base/lib/commons/commons-discovery-0.4.jar framework/base/lib/commons/commons-el-1.0.jar -framework/base/lib/commons/commons-fileupload-1.2.2.jar +framework/base/lib/commons/commons-fileupload-1.3.1.jar framework/base/lib/commons/commons-io-2.4.jar framework/base/lib/commons/commons-lang-2.6.jar framework/base/lib/commons/commons-logging-1.1.2.jar @@ -63,7 +63,7 @@ framework/base/lib/j2eespecs/geronimo-ja framework/base/lib/j2eespecs/geronimo-jaxrpc_1.1_spec-1.0.jar framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar -framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar +framework/base/lib/j2eespecs/geronimo-saaj_1.3_spec-1.1.jar framework/base/lib/j2eespecs/annotations-api-3.0.jar framework/base/lib/j2eespecs/jsp-api-2.2.jar framework/base/lib/j2eespecs/servlet-api-3.0.jar @@ -98,8 +98,8 @@ framework/webapp/lib/ezmorph-0.9.1.jar framework/webapp/lib/rome-0.9.jar framework/webapp/lib/serializer-2.7.0.jar framework/webapp/lib/xalan-2.7.1.jar -framework/geronimo/lib/geronimo-connector-2.1.1.jar -framework/geronimo/lib/geronimo-transaction-2.1.1.jar +framework/geronimo/lib/geronimo-connector-3.1.1.jar +framework/geronimo/lib/geronimo-transaction-3.1.1.jar framework/testtools/lib/org.springframework.core-3.1.0.M2.jar framework/testtools/lib/org.springframework.test-3.1.0.M2.jar framework/testtools/lib/org.springframework.web-3.1.0.M2.jar Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml?rev=1566542&r1=1566541&r2=1566542&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/ManufacturingHelpData_EN.xml Mon Feb 10 09:33:25 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 |