[Erp5-report] r8289 - in /erp5/trunk/bt5/erp5_trade: PortalTypeWorkflowChainTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: kevin
Date: Mon Jul  3 15:40:39 2006
New Revision: 8289

URL: http://svn.erp5.org?rev=8289&view=rev
Log:
Revert merge with delivery_patch

Modified:
    erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
    erp5/trunk/bt5/erp5_trade/bt/change_log
    erp5/trunk/bt5/erp5_trade/bt/template_module_id_list
    erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list
    erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
    erp5/trunk/bt5/erp5_trade/bt/template_skin_id_list
    erp5/trunk/bt5/erp5_trade/bt/template_workflow_id_list

Modified: erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml (original)
+++ erp5/trunk/bt5/erp5_trade/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml Mon Jul  3 15:40:39 2006
@@ -14,10 +14,6 @@
  <chain>
   <type>Delivery Cell</type>
   <workflow>packing_list_interaction_workflow, delivery_edit_workflow</workflow>
- </chain>
- <chain>
-  <type>Delivery Patch</type>
-  <workflow>delivery_patch_workflow</workflow>
  </chain>
  <chain>
   <type>Discount</type>
@@ -117,7 +113,7 @@
  </chain>
  <chain>
   <type>Sale Supply Line</type>
-  <workflow>supply_line_interaction_workflow, edit_workflow</workflow>
+  <workflow>edit_workflow, supply_line_interaction_workflow</workflow>
  </chain>
  <chain>
   <type>Sale Trade Condition</type>

Modified: erp5/trunk/bt5/erp5_trade/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/change_log?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_trade/bt/change_log Mon Jul  3 15:40:39 2006
@@ -1,5 +1,6 @@
 2006-07-03 Kevin
 * Merge Seb's delivery_patch business template and erp5_trade.
+* Revert previous action.
 * Add a short basic description.
 
 2006-05-11 Alex

Modified: erp5/trunk/bt5/erp5_trade/bt/template_module_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_module_id_list?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_module_id_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_module_id_list Mon Jul  3 15:40:39 2006
@@ -1,4 +1,3 @@
-delivery_patch_module
 internal_packing_list_module
 inventory_module
 purchase_order_module

Modified: erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_portal_type_id_list Mon Jul  3 15:40:39 2006
@@ -2,10 +2,6 @@
 Container Cell
 Container Line
 Delivery Cell
-Delivery Patch
-Delivery Patch Cell
-Delivery Patch Line
-Delivery Patch Module
 Delivery Rule
 Discount
 Internal Packing List

Modified: erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_portal_type_workflow_chain_list Mon Jul  3 15:40:39 2006
@@ -6,7 +6,6 @@
 Container | edit_workflow
 Delivery Cell | delivery_edit_workflow
 Delivery Cell | packing_list_interaction_workflow
-Delivery Patch | delivery_patch_workflow
 Discount | edit_workflow
 Internal Packing List Cell | delivery_edit_workflow
 Internal Packing List Cell | packing_list_interaction_workflow

Modified: erp5/trunk/bt5/erp5_trade/bt/template_skin_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_skin_id_list?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_skin_id_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_skin_id_list Mon Jul  3 15:40:39 2006
@@ -1,2 +1,1 @@
-erp5_delivery_patch
 erp5_trade

Modified: erp5/trunk/bt5/erp5_trade/bt/template_workflow_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/template_workflow_id_list?rev=8289&r1=8288&r2=8289&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/template_workflow_id_list (original)
+++ erp5/trunk/bt5/erp5_trade/bt/template_workflow_id_list Mon Jul  3 15:40:39 2006
@@ -1,5 +1,4 @@
 delivery_edit_workflow
-delivery_patch_workflow
 internal_packing_list_workflow
 inventory_workflow
 order_interaction_workflow