2005-12-20 Kevin

* Update state type of packing_list_workflow, internal_packing_list_workflow and order_workflow states. 2005-12-19 Jerome * bug fix; don't use SQLQueue in delivery_edit_workflow * trigger delivery_edit on workflow transitions. 2005-12-19 Seb * added category type 'sub_variation' on aggregate 2005-12-14 Seb * use activity tags in packing_list_workflow/scripts/PackingList_updateAppliedRule 2005-12-14 jerome * package the content of trade_date category, because PaymentCondition_getTradeDate depends on it 2005-12-11 seb * fixed the duplicate applied rule problem in order_workflow git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4829 20353a03-c40f-0410-a6d1-a30d3c3de9de

2005-12-20 Kevin
* Update state type of packing_list_workflow, internal_packing_list_workflow and order_workflow states. 2005-12-19 Jerome * bug fix; don't use SQLQueue in delivery_edit_workflow * trigger delivery_edit on workflow transitions. 2005-12-19 Seb * added category type 'sub_variation' on aggregate 2005-12-14 Seb * use activity tags in packing_list_workflow/scripts/PackingList_updateAppliedRule 2005-12-14 jerome * package the content of trade_date category, because PaymentCondition_getTradeDate depends on it 2005-12-11 seb * fixed the duplicate applied rule problem in order_workflow git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4829 20353a03-c40f-0410-a6d1-a30d3c3de9de
c3353bbb · Kevin Deldycke · 8d6d3e46 · c3353bbb · c3353bbb · c3353bbb
Commit c3353bbb authored Dec 21, 2005 by Kevin Deldycke
58 changed files
--- a/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/internal_packing_list_module.xml
@@ -112,6 +112,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -222,6 +225,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -290,6 +296,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -690,6 +699,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/inventory_module.xml
@@ -112,6 +112,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -222,6 +225,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -290,6 +296,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -690,6 +699,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_order_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_packing_list_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_supply_module.xml
@@ -85,6 +85,9 @@
  <permission>
   <name>Add ERP5 Forms</name>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
  </permission>
@@ -169,6 +172,9 @@
  <permission>
   <name>Add Pluggable Index</name>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
  </permission>
@@ -220,6 +226,9 @@
  <permission>
   <name>Add ZODB Mount Points</name>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
  </permission>
@@ -526,6 +535,9 @@
  <permission>
   <name>WebDAV access</name>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/purchase_trade_condition_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_order_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_packing_list_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_supply_module.xml
@@ -85,6 +85,9 @@
  <permission>
   <name>Add ERP5 Forms</name>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
  </permission>
@@ -169,6 +172,9 @@
  <permission>
   <name>Add Pluggable Index</name>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
  </permission>
@@ -220,6 +226,9 @@
  <permission>
   <name>Add ZODB Mount Points</name>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
  </permission>
@@ -526,6 +535,9 @@
  <permission>
   <name>WebDAV access</name>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
+++ b/bt5/erp5_trade/ModuleTemplateItem/sale_trade_condition_module.xml
@@ -127,6 +127,9 @@
   <name>Add ERP5 Forms</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ERP5 OOo Templates</name>
+  </permission>
  <permission>
   <name>Add ERP5 PDF Forms</name>
   <role>Manager</role>
@@ -237,6 +240,9 @@
   <name>Add Pluggable Index</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add Portal ZSyncer Tools</name>
+  </permission>
  <permission>
   <name>Add Python Scripts</name>
   <role>Manager</role>
@@ -305,6 +311,9 @@
   <name>Add ZODB Mount Points</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>Add ZSyncers</name>
+  </permission>
  <permission>
   <name>Add Zope Tutorials</name>
   <role>Manager</role>
@@ -723,6 +732,9 @@
   <name>WebDAV access</name>
   <role>Manager</role>
  </permission>
+  <permission>
+   <name>ZSyncer: Use ZSyncer</name>
+  </permission>
  <permission>
   <name>ZopeProfiler: manage</name>
  </permission>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Cell.xml
@@ -225,8 +225,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -259,7 +259,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container%20Line.xml
@@ -292,8 +292,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -326,7 +326,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Container.xml
@@ -234,8 +234,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -268,7 +268,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Delivery%20Cell.xml
@@ -225,8 +225,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -259,7 +259,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Discount.xml
@@ -225,8 +225,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -259,7 +259,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List%20Line.xml
@@ -355,8 +355,8 @@ a manufactured product, like a pen, a bicycle...</string> </value>
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Internal%20Packing%20List.xml
@@ -237,8 +237,8 @@ a manufactured product, like a pen, a bicycle...</string> </value>
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Cell.xml
@@ -227,8 +227,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -261,7 +261,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory%20Line.xml
@@ -355,8 +355,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Inventory.xml
@@ -226,8 +226,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Payment%20Condition.xml
@@ -282,8 +282,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order%20Line.xml
@@ -381,7 +381,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Order.xml
@@ -404,8 +404,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List%20Cell.xml
@@ -282,7 +282,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Packing%20List.xml
@@ -243,7 +243,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Supply.xml
@@ -234,7 +234,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Purchase%20Trade%20Condition.xml
@@ -393,8 +393,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -427,7 +427,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order%20Line.xml
@@ -385,7 +385,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Order.xml
@@ -450,7 +450,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Cell.xml
@@ -224,8 +224,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -258,7 +258,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List%20Line.xml
@@ -381,7 +381,7 @@ a manufactured product, like a pen, a bicycle...</string> </value>
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Packing%20List.xml
@@ -312,7 +312,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Supply.xml
@@ -234,7 +234,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Sale%20Trade%20Condition.xml
@@ -396,8 +396,8 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.CMFCore.ActionInformation</string>
-          <string>ActionInformation</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
+          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
      </tuple>
@@ -430,7 +430,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
+++ b/bt5/erp5_trade/PortalTypeTemplateItem/portal_types/Supply%20Line.xml
@@ -584,7 +584,7 @@
    <pickle>
      <tuple>
        <tuple>
-          <string>Products.ERP5Type.CMFCorePatch</string>
+          <string>Products.ERP5Type.patches.ActionInformation</string>
          <string>PatchedActionInformation</string>
        </tuple>
        <none/>
@@ -626,7 +626,7 @@
            <key> <string>permissions</string> </key>
            <value>
              <tuple>
-                <string>View</string>
+                <string>Manage properties</string>
              </tuple>
            </value>
        </item>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingListLine_view/my_variation_category_list.xml
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Resource_viewDefaultSupplyLine/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_view/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewAdditionalPrice/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewBasePrice/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewDiscountRatio/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewExclusiveDiscountRatio/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio/my_price_currency.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SupplyLine_viewSurchargeRatio/my_price_currency.xml
@@ -281,7 +281,7 @@
      <dictionary>
        <item>
            <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\',\'\')]+map(lambda x:(x.getTitle(),\'currency/%s\' %x.id),here.currency.objectValues())</string> </value>
+            <value> <string>python:here.CurrencyModule_getCurrencyItemList()</string> </value>
        </item>
      </dictionary>
    </pickle>

--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/TradeCondition_getDueDate.xml
@@ -81,7 +81,7 @@ case = {\n
  \'packing list\': context.getStartDate,   #packing_list.getTargetStopDate,\n
 }\n
 LOG("context.getTradeDateId() => %s "%context.getPaymentConditionTradeDate())\n
-due_date = case[context.getPaymentConditionTradeDate()]()\n
+due_date = case.get(context.getPaymentConditionTradeDate(), context.getStartDate)()\n
 due_date += context.getPaymentConditionPaymentTerm(0)\n
 \n
 peom = context.getPaymentConditionPaymentEndOfMonth()\n
@@ -117,36 +117,36 @@ return due_date\n
        </item>
        <item>
            <key> <string>_code</string> </key>
-            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAA0AAAAQAAAAQwAA
-AHMrAgAAZAEAawAAbAAAfQAAAWQCAIQAAH0BAGQDAIQAAH0BAGgAAAR0AgB0AwB0BABkBACDAgAD
+            <value> <string encoding="base64">YwAAAAAAAAAAAQAAAEAAAABzDQAAAGQBAIQAAFoAAGQAAFMoAgAAAE5jAAAAAAwAAAAQAAAAQwAA
+AHM9AgAAZAEAawAAbAAAfQAAAWQCAIQAAH0BAGQDAIQAAH0BAGgAAAR0AgB0AwB0BABkBACDAgAD
 PARkBQB0AwB0BABkBACDAgADPARkBgB0AwB0BABkBACDAgADPARkBwB0AwB0BABkBACDAgADPH0F
-AHwBAGQIAHQDAHQEAGQJAIMCAIMAABaDAQABdAYAfAUAdAMAdAQAZAkAgwIAgwAAgwIAgwAAfQcA
-fAcAdAMAdAQAZAoAgwIAZAsAgwEAN30HAHQDAHQEAGQMAIMCAIMAAH0IAHwBAGQNAHwIABaDAQAB
-dAMAdAQAZAoAgwIAgwAAfQkAfAEAZA4AfAkAFoMBAAF0AwB0BABkDwCDAgCDAAB9CgB8AQBkEAB8
-CgAWgwEAAXwIAG+PAAFkCwB9CwB0AwB8BwBkEQCDAgCDAAB9DAB4LAB8DAB0AwB8BwB8CwAXZBEA
-gwIAgwAAagIAbw4AAXwLAGQSADd9CwBxQAEBV3wHAHwLABdkEgAYfQcAfAkAdAIAagMAbw4AAXwH
-AHwJADd9BwBuAQABfAoAdAIAagMAbw4AAXwHAHwKADd9BwBxIwIBbnAAAXwKAHQCAGQTAGQLAGcD
-AGoHAG9ZAAFkCwB9CwB0AwB8BwBkEQCDAgCDAAB9DAB4LAB8DAB0AwB8BwB8CwAXZBEAgwIAgwAA
-agIAbw4AAXwLAGQSADh9CwBx5QEBV3wHAHwLABd8CgAXfQcAbgEAAXwHAFNkAABTKBQAAABOKAEA
-AABzCAAAAERhdGVUaW1lYwEAAAADAAAAAwAAAEMAAABzFgAAAHQAAHQBAGQBAIMCAGQCAHwAAIMC
-AFMoAwAAAE5zAwAAAGxvZ3MZAAAAVHJhZGVDb25kaXRpb25fZ2V0RHVlRGF0ZSgDAAAAcwkAAABf
-Z2V0YXR0cl9zBwAAAGNvbnRleHRzAwAAAG1zZygDAAAAcwMAAABtc2dzCQAAAF9nZXRhdHRyX3MH
-AAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMKAAAAPGxhbWJkYS42PgQA
-AABzAAAAAGMBAAAAAgAAAAEAAABDAAAAcwQAAAB0AABTKAEAAABOKAEAAABzBAAAAE5vbmUoAgAA
-AHMDAAAAbXNncwQAAABOb25lKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwoAAAA8bGFt
-YmRhLjc+BQAAAHMAAAAAcwwAAABnZXRTdGFydERhdGVzBwAAAGludm9pY2VzBQAAAG9yZGVycwwA
-AABwYWNraW5nIGxpc3RzHwAAAGNvbnRleHQuZ2V0VHJhZGVEYXRlSWQoKSA9PiAlcyBzHAAAAGdl
-dFBheW1lbnRDb25kaXRpb25UcmFkZURhdGVzHgAAAGdldFBheW1lbnRDb25kaXRpb25QYXltZW50
-VGVybWkAAAAAcyQAAABnZXRQYXltZW50Q29uZGl0aW9uUGF5bWVudEVuZE9mTW9udGhzCQAAAHBv
-ZW0gOiAlc3MHAAAAcHQgOiAlc3MoAAAAZ2V0UGF5bWVudENvbmRpdGlvblBheW1lbnRBZGRpdGlv
-bmFsVGVybXMIAAAAcGF0IDogJXNzBQAAAG1vbnRoaQEAAABzAAAAACgNAAAAcwgAAABEYXRlVGlt
-ZXMDAAAATE9HcwQAAABOb25lcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzBAAAAGNhc2VzCQAA
-AF9nZXRpdGVtX3MIAAAAZHVlX2RhdGVzBAAAAHBlb21zAgAAAHB0cwMAAABwYXRzAQAAAGlzBQAA
-AG1vbnRoKA0AAABzCAAAAERhdGVUaW1lcwMAAABMT0dzBAAAAE5vbmVzCQAAAF9nZXRhdHRyX3MH
-AAAAY29udGV4dHMEAAAAY2FzZXMJAAAAX2dldGl0ZW1fcwgAAABkdWVfZGF0ZXMEAAAAcGVvbXMC
+AHwBAGQIAHQDAHQEAGQJAIMCAIMAABaDAQABdAMAfAUAZAoAgwIAdAMAdAQAZAkAgwIAgwAAdAMA
+dAQAZAQAgwIAgwIAgwAAfQYAfAYAdAMAdAQAZAsAgwIAZAwAgwEAN30GAHQDAHQEAGQNAIMCAIMA
+AH0HAHwBAGQOAHwHABaDAQABdAMAdAQAZAsAgwIAgwAAfQgAfAEAZA8AfAgAFoMBAAF0AwB0BABk
+EACDAgCDAAB9CQB8AQBkEQB8CQAWgwEAAXwHAG+PAAFkDAB9CgB0AwB8BgBkEgCDAgCDAAB9CwB4
+LAB8CwB0AwB8BgB8CgAXZBIAgwIAgwAAagIAbw4AAXwKAGQTADd9CgBxUgEBV3wGAHwKABdkEwAY
+fQYAfAgAdAIAagMAbw4AAXwGAHwIADd9BgBuAQABfAkAdAIAagMAbw4AAXwGAHwJADd9BgBxNQIB
+bnAAAXwJAHQCAGQUAGQMAGcDAGoHAG9ZAAFkDAB9CgB0AwB8BgBkEgCDAgCDAAB9CwB4LAB8CwB0
+AwB8BgB8CgAXZBIAgwIAgwAAagIAbw4AAXwKAGQTADh9CgBx9wEBV3wGAHwKABd8CQAXfQYAbgEA
+AXwGAFNkAABTKBUAAABOKAEAAABzCAAAAERhdGVUaW1lYwEAAAADAAAAAwAAAEMAAABzFgAAAHQA
+AHQBAGQBAIMCAGQCAHwAAIMCAFMoAwAAAE5zAwAAAGxvZ3MZAAAAVHJhZGVDb25kaXRpb25fZ2V0
+RHVlRGF0ZSgDAAAAcwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHRzAwAAAG1zZygDAAAAcwMAAABt
+c2dzCQAAAF9nZXRhdHRyX3MHAAAAY29udGV4dCgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9u
+KXMLAAAAPGxhbWJkYS4yNT4EAAAAcwAAAABjAQAAAAIAAAABAAAAQwAAAHMEAAAAdAAAUygBAAAA
+TigBAAAAcwQAAABOb25lKAIAAABzAwAAAG1zZ3MEAAAATm9uZSgAAAAAKAAAAABzDwAAAFNjcmlw
+dCAoUHl0aG9uKXMLAAAAPGxhbWJkYS4yNj4FAAAAcwAAAABzDAAAAGdldFN0YXJ0RGF0ZXMHAAAA
+aW52b2ljZXMFAAAAb3JkZXJzDAAAAHBhY2tpbmcgbGlzdHMfAAAAY29udGV4dC5nZXRUcmFkZURh
+dGVJZCgpID0+ICVzIHMcAAAAZ2V0UGF5bWVudENvbmRpdGlvblRyYWRlRGF0ZXMDAAAAZ2V0cx4A
+AABnZXRQYXltZW50Q29uZGl0aW9uUGF5bWVudFRlcm1pAAAAAHMkAAAAZ2V0UGF5bWVudENvbmRp
+dGlvblBheW1lbnRFbmRPZk1vbnRocwkAAABwb2VtIDogJXNzBwAAAHB0IDogJXNzKAAAAGdldFBh
+eW1lbnRDb25kaXRpb25QYXltZW50QWRkaXRpb25hbFRlcm1zCAAAAHBhdCA6ICVzcwUAAABtb250
+aGkBAAAAcwAAAAAoDAAAAHMIAAAARGF0ZVRpbWVzAwAAAExPR3MEAAAATm9uZXMJAAAAX2dldGF0
+dHJfcwcAAABjb250ZXh0cwQAAABjYXNlcwgAAABkdWVfZGF0ZXMEAAAAcGVvbXMCAAAAcHRzAwAA
+AHBhdHMBAAAAaXMFAAAAbW9udGgoDAAAAHMIAAAARGF0ZVRpbWVzAwAAAExPR3MEAAAATm9uZXMJ
+AAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwQAAABjYXNlcwgAAABkdWVfZGF0ZXMEAAAAcGVvbXMC
 AAAAcHRzAwAAAHBhdHMBAAAAaXMFAAAAbW9udGgoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
 bilzGQAAAFRyYWRlQ29uZGl0aW9uX2dldER1ZURhdGUBAAAAc0gAAAAAAg0BCQEJAgQBGAESARIB
-DgIaAR4BGQISAQ4BEgEOARIBDgIHAQYBEgEDAB0BDwEOAQ0BDgENARIDFgEGARIBAwAdAQ8BEgIo
+DgIaATABGQISAQ4BEgEOARIBDgIHAQYBEgEDAB0BDwEOAQ0BDgENARIDFgEGARIBAwAdAQ8BEgIo
 AQAAAHMZAAAAVHJhZGVDb25kaXRpb25fZ2V0RHVlRGF0ZSgBAAAAcxkAAABUcmFkZUNvbmRpdGlv
 bl9nZXREdWVEYXRlKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQeXRob24pcwgAAAA8bW9kdWxlPgEA
 AABzAAAAAA==</string> </value>
@@ -195,7 +195,6 @@ AABzAAAAAA==</string> </value>
                            <string>_getattr_</string>
                            <string>context</string>
                            <string>case</string>
-                            <string>_getitem_</string>
                            <string>due_date</string>
                            <string>peom</string>
                            <string>pt</string>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/internal_packing_list_workflow/states/delivered.xml
@@ -42,6 +42,14 @@
              <tuple/>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/auto_planned.xml
@@ -41,6 +41,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>draft_order</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/cancelled.xml
@@ -42,6 +42,14 @@
              <tuple/>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>draft_order</string>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>uid</string> </key>
            <value>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/draft.xml
@@ -44,6 +44,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>draft_order</string>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>uid</string> </key>
            <value>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/ordered.xml
@@ -41,6 +41,15 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>future_inventory</string>
+                <string>planned_order</string>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>uid</string> </key>
            <value>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/order_workflow/states/planned.xml
@@ -43,6 +43,15 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>future_inventory</string>
+                <string>planned_order</string>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>uid</string> </key>
            <value>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/scripts/PackingList_updateAppliedRule.xml
@@ -23,16 +23,7 @@
        <item>
            <key> <string>__ac_local_roles__</string> </key>
            <value>
-              <dictionary>
-                <item>
-                    <key> <string>rc</string> </key>
-                    <value>
-                      <list>
-                        <string>Owner</string>
-                      </list>
-                    </value>
-                </item>
-              </dictionary>
+              <none/>
            </value>
        </item>
        <item>
@@ -95,9 +86,10 @@ packing_list.activate(after_path=after_path_list,tag=tag,\n
 \n
 \n
 # Make sure to reindex related simulation movement if we are already\n
-# simulated\n
+# simulated, call reindexObject, not immediateReindexObject so that\n
+# catalogObjectList will be called with many objects\n
 packing_list.activate(after_path=after_path_list,tag=tag,\n
-     priority=3).applyToDeliveryRelatedMovement(method_id=\'recursiveReindexObject\')\n
+     priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
 \n
 packing_list.startBuilding()\n
 packing_list.activate(\n
@@ -118,25 +110,24 @@ AGQWAHwKAIMAAWQXAIMCAIMAAAFkAABTKBgAAABOYwEAAAADAAAAAwAAAEMAAABzFgAAAHQAAHQB
 AGQBAIMCAGQCAHwAAIMCAFMoAwAAAE5zAwAAAGxvZ3MdAAAAUGFja2luZ0xpc3RfdXBkYXRlQXBw
 bGllZFJ1bGUoAwAAAHMJAAAAX2dldGF0dHJfcwcAAABjb250ZXh0cwMAAABtc2coAwAAAHMDAAAA
 bXNncwkAAABfZ2V0YXR0cl9zBwAAAGNvbnRleHQoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhv
-bilzCwAAADxsYW1iZGEuNTA+AQAAAHMAAAAAYwEAAAABAAAAAQAAAEMAAABzBAAAAGQBAFMoAgAA
-AE5zCAAAAERJU0FCTEVEKAAAAAAoAQAAAHMDAAAAbXNnKAAAAAAoAAAAAHMPAAAAU2NyaXB0IChQ
-eXRob24pcwsAAAA8bGFtYmRhLjUxPgIAAABzAAAAAHMGAAAAb2JqZWN0cxEAAABnZXRDYXVzYWxp
-dHlWYWx1ZXMGAAAAYXBwZW5kcwcAAABnZXRQYXRocxcAAABfZmlyc3RVcGRhdGVBcHBsaWVkUnVs
-ZXMHAAAAX2V4cGFuZHMDAAAAdGFncwgAAABwcmlvcml0eWkDAAAAcwgAAABhY3RpdmF0ZXMKAAAA
-YWZ0ZXJfcGF0aHMRAAAAdXBkYXRlQXBwbGllZFJ1bGVzBwAAAHJ1bGVfaWRzFQAAAGRlZmF1bHRf
-ZGVsaXZlcnlfcnVsZXMLAAAAYWN0aXZhdGVfa3dzHgAAAGFwcGx5VG9EZWxpdmVyeVJlbGF0ZWRN
-b3ZlbWVudHMJAAAAbWV0aG9kX2lkcxYAAAByZWN1cnNpdmVSZWluZGV4T2JqZWN0cw0AAABzdGFy
-dEJ1aWxkaW5ncwkAAABhZnRlcl90YWdzFAAAAHVwZGF0ZUNhdXNhbGl0eVN0YXRlKAoAAABzAwAA
-AExPR3MJAAAAX2dldGF0dHJfcwwAAABzdGF0ZV9jaGFuZ2VzDAAAAHBhY2tpbmdfbGlzdHMLAAAA
-YWN0aXZhdGVfa3dzBwAAAGNvbnRleHRzDQAAAHJlbGF0ZWRfb3JkZXJzDwAAAGFmdGVyX3BhdGhf
-bGlzdHMEAAAATm9uZXMDAAAAdGFnKAsAAABzDAAAAHN0YXRlX2NoYW5nZXMCAAAAa3dzAwAAAExP
-R3MJAAAAX2dldGF0dHJfcwwAAABwYWNraW5nX2xpc3RzCwAAAGFjdGl2YXRlX2t3cwcAAABjb250
-ZXh0cw0AAAByZWxhdGVkX29yZGVycw8AAABhZnRlcl9wYXRoX2xpc3RzBAAAAE5vbmVzAwAAAHRh
-ZygAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMdAAAAUGFja2luZ0xpc3RfdXBkYXRlQXBw
-bGllZFJ1bGUBAAAAcyAAAAAJAQkCDwMGARIBBgEQASMBJAEWAR4CLQENBTEDEwEMASgBAAAAcx0A
-AABQYWNraW5nTGlzdF91cGRhdGVBcHBsaWVkUnVsZSgBAAAAcx0AAABQYWNraW5nTGlzdF91cGRh
-dGVBcHBsaWVkUnVsZSgAAAAAKAAAAABzDwAAAFNjcmlwdCAoUHl0aG9uKXMIAAAAPG1vZHVsZT4B
-AAAAcwAAAAA=</string> </value>
+bilzCgAAADxsYW1iZGEuND4BAAAAcwAAAABjAQAAAAEAAAABAAAAQwAAAHMEAAAAZAEAUygCAAAA
+TnMIAAAARElTQUJMRUQoAAAAACgBAAAAcwMAAABtc2coAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5
+dGhvbilzCgAAADxsYW1iZGEuNT4CAAAAcwAAAABzBgAAAG9iamVjdHMRAAAAZ2V0Q2F1c2FsaXR5
+VmFsdWVzBgAAAGFwcGVuZHMHAAAAZ2V0UGF0aHMXAAAAX2ZpcnN0VXBkYXRlQXBwbGllZFJ1bGVz
+BwAAAF9leHBhbmRzAwAAAHRhZ3MIAAAAcHJpb3JpdHlpAwAAAHMIAAAAYWN0aXZhdGVzCgAAAGFm
+dGVyX3BhdGhzEQAAAHVwZGF0ZUFwcGxpZWRSdWxlcwcAAABydWxlX2lkcxUAAABkZWZhdWx0X2Rl
+bGl2ZXJ5X3J1bGVzCwAAAGFjdGl2YXRlX2t3cx4AAABhcHBseVRvRGVsaXZlcnlSZWxhdGVkTW92
+ZW1lbnRzCQAAAG1ldGhvZF9pZHMNAAAAcmVpbmRleE9iamVjdHMNAAAAc3RhcnRCdWlsZGluZ3MJ
+AAAAYWZ0ZXJfdGFncxQAAAB1cGRhdGVDYXVzYWxpdHlTdGF0ZSgKAAAAcwMAAABMT0dzCQAAAF9n
+ZXRhdHRyX3MMAAAAc3RhdGVfY2hhbmdlcwwAAABwYWNraW5nX2xpc3RzCwAAAGFjdGl2YXRlX2t3
+cwcAAABjb250ZXh0cw0AAAByZWxhdGVkX29yZGVycw8AAABhZnRlcl9wYXRoX2xpc3RzBAAAAE5v
+bmVzAwAAAHRhZygLAAAAcwwAAABzdGF0ZV9jaGFuZ2VzAgAAAGt3cwMAAABMT0dzCQAAAF9nZXRh
+dHRyX3MMAAAAcGFja2luZ19saXN0cwsAAABhY3RpdmF0ZV9rd3MHAAAAY29udGV4dHMNAAAAcmVs
+YXRlZF9vcmRlcnMPAAAAYWZ0ZXJfcGF0aF9saXN0cwQAAABOb25lcwMAAAB0YWcoAAAAACgAAAAA
+cw8AAABTY3JpcHQgKFB5dGhvbilzHQAAAFBhY2tpbmdMaXN0X3VwZGF0ZUFwcGxpZWRSdWxlAQAA
+AHMgAAAACQEJAg8DBgESAQYBEAEjASQBFgEeAi0BDQYxAxMBDAEoAQAAAHMdAAAAUGFja2luZ0xp
+c3RfdXBkYXRlQXBwbGllZFJ1bGUoAQAAAHMdAAAAUGFja2luZ0xpc3RfdXBkYXRlQXBwbGllZFJ1
+bGUoAAAAACgAAAAAcw8AAABTY3JpcHQgKFB5dGhvbilzCAAAADxtb2R1bGU+AQAAAHMAAAAA</string> </value>
        </item>
        <item>
            <key> <string>_filepath</string> </key>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/confirmed.xml
@@ -47,6 +47,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>reserved_inventory</string>
+              </tuple>
+            </value>
+        </item>
        <item>
            <key> <string>uid</string> </key>
            <value>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/delivered.xml
@@ -42,6 +42,14 @@
              <tuple/>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/ready.xml
@@ -41,6 +41,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>reserved_inventory</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/started.xml
@@ -39,6 +39,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/states/stopped.xml
@@ -39,6 +39,14 @@
              </tuple>
            </value>
        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple>
+                <string>current_inventory</string>
+              </tuple>
+            </value>
+        </item>
      </dictionary>
    </pickle>
  </record>

--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
+2005-12-20 Kevin
+* Update state type of packing_list_workflow, internal_packing_list_workflow and order_workflow states.
+
+2005-12-19 Jérome
+* bug fix; don't use SQLQueue in delivery_edit_workflow
+* trigger delivery_edit on workflow transitions.
+
+2005-12-19 Seb
+* added category type 'sub_variation' on aggregate
+
+2005-12-14 Seb
+* use activity tags in packing_list_workflow/scripts/PackingList_updateAppliedRule
+
+2005-12-14 jerome
+* package the content of trade_date category, because PaymentCondition_getTradeDate depends on it
+
+2005-12-11 seb
+* fixed the duplicate applied rule problem in order_workflow
+
 2005-12-08 yo
 * Fix the LEFT JOIN syntax in Order_zSelectMovement.


--- a/bt5/erp5_trade/bt/template_path_list
+++ b/bt5/erp5_trade/bt/template_path_list
 portal_rules/default_delivery_rule
+portal_categories/trade_date
 portal_deliveries/sale_packing_list_builder
 portal_categories/order/supply
 portal_categories/resource/packing
 portal_rules/default_order_rule
-portal_deliveries/purchase_packing_list_builder
-portal_categories/origin/order
\ No newline at end of file
+portal_categories/trade_date/**
+portal_categories/origin/order
+portal_deliveries/purchase_packing_list_builder
\ No newline at end of file