From c83ee0b8e6a54e3ecc74506cc575122da5294bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com>
Date: Wed, 14 Nov 2007 09:17:20 +0000
Subject: [PATCH] 2007-11-14 Aurel * update workflow to defined h:m:s on
archive date, many zsql method and script update to take more cases into
account + zope 2.8 format
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17566 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../Archive%20Tool/create_archive.xml | 14 +-
.../portal_types/Archive%20Tool/view.xml | 14 +-
.../portal_types/Archive/view.xml | 14 +-
.../portal_actions/manage_archive.xml | 14 +-
.../archive_inventory_module.xml | 3 +
.../Archive%20Inventory%20Cell.xml | 7 +-
.../Archive%20Inventory%20Line.xml | 7 +-
.../portal_types/Archive%20Inventory.xml | 7 +-
.../portal_types/Archive%20Tool.xml | 7 +-
.../portal_types/Archive.xml | 7 +-
.../ArchiveInventory_view/my_title.xml | 263 ------------------
.../ArchiveTool_createArchive.xml | 7 +-
.../ArchiveTool_viewArchiveList.xml | 7 +-
.../Archive_createAllInventory.xml | 18 +-
.../erp5_archive/Archive_createInventory.xml | 18 +-
.../Archive_getBankAccountUidList.xml | 6 +-
.../erp5_archive/Archive_getNodeUidList.xml | 28 +-
.../Archive_getPaymentUidList.xml | 8 +-
.../erp5_archive/Archive_test.xml | 53 +++-
.../ToolTemplateItem/portal_archives.xml | 55 +++-
.../portal_workflow/archive_workflow.xml | 7 +-
.../archive_workflow/scripts.xml | 7 +-
.../scripts/Archive_updateDate.xml | 157 +++++++++++
.../archive_workflow/scripts/checkArchive.xml | 7 +-
.../archive_workflow/states.xml | 7 +-
.../archive_workflow/states/cancelled.xml | 9 +-
.../archive_workflow/states/deleted.xml | 9 +-
.../archive_workflow/states/draft.xml | 9 +-
.../archive_workflow/states/ready.xml | 9 +-
.../archive_workflow/states/validated.xml | 9 +-
.../archive_workflow/transitions.xml | 7 +-
.../archive_workflow/transitions/cancel.xml | 7 +-
.../transitions/cancel_action.xml | 7 +-
.../archive_workflow/transitions/delete.xml | 7 +-
.../transitions/delete_action.xml | 7 +-
.../archive_workflow/transitions/ready.xml | 9 +-
.../transitions/ready_action.xml | 7 +-
.../archive_workflow/transitions/validate.xml | 7 +-
.../archive_workflow/variables.xml | 7 +-
.../archive_workflow/variables/action.xml | 7 +-
.../archive_workflow/variables/actor.xml | 7 +-
.../archive_workflow/variables/comment.xml | 7 +-
.../variables/error_message.xml | 7 +-
.../archive_workflow/variables/history.xml | 7 +-
.../variables/portal_type.xml | 7 +-
.../archive_workflow/variables/time.xml | 7 +-
.../archive_workflow/worklists.xml | 7 +-
.../archive_workflow/worklists/draft.xml | 9 +-
bt5/erp5_archive/bt/change_log | 3 +
bt5/erp5_archive/bt/revision | 2 +-
bt5/erp5_archive/bt/template_tool_id_list | 2 +-
51 files changed, 386 insertions(+), 538 deletions(-)
delete mode 100644 bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveInventory_view/my_title.xml
create mode 100644 bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/Archive_updateDate.xml
diff --git a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/create_archive.xml b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/create_archive.xml
index f330bb517d..d253f6484e 100644
--- a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/create_archive.xml
+++ b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/create_archive.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.ActionInformation</string>
- <string>ActionInformation</string>
- </tuple>
- <none/>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -70,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/view.xml b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/view.xml
index 81499762c2..e80f971c93 100644
--- a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/view.xml
+++ b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive%20Tool/view.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.ActionInformation</string>
- <string>ActionInformation</string>
- </tuple>
- <none/>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -70,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive/view.xml b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive/view.xml
index 16eff0dec2..517ed3f918 100644
--- a/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive/view.xml
+++ b/bt5/erp5_archive/ActionTemplateItem/portal_types/Archive/view.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.ActionInformation</string>
- <string>ActionInformation</string>
- </tuple>
- <none/>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -70,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/ActionTemplateItem/portal_types/portal_actions/manage_archive.xml b/bt5/erp5_archive/ActionTemplateItem/portal_types/portal_actions/manage_archive.xml
index d858dba748..45fceabd34 100644
--- a/bt5/erp5_archive/ActionTemplateItem/portal_types/portal_actions/manage_archive.xml
+++ b/bt5/erp5_archive/ActionTemplateItem/portal_types/portal_actions/manage_archive.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.ActionInformation</string>
- <string>ActionInformation</string>
- </tuple>
- <none/>
+ <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -70,11 +67,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.CMFCore.Expression</string>
- <string>Expression</string>
- </tuple>
- <none/>
+ <global name="Expression" module="Products.CMFCore.Expression"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/ModuleTemplateItem/archive_inventory_module.xml b/bt5/erp5_archive/ModuleTemplateItem/archive_inventory_module.xml
index f6f43cd40e..7acd8b5dbc 100644
--- a/bt5/erp5_archive/ModuleTemplateItem/archive_inventory_module.xml
+++ b/bt5/erp5_archive/ModuleTemplateItem/archive_inventory_module.xml
@@ -571,6 +571,9 @@
<name>Manage ZCatalogIndex Entries</name>
<role>Manager</role>
</permission>
+ <permission type='list'>
+ <name>Manage extensions</name>
+ </permission>
<permission type='tuple'>
<name>Manage languages</name>
<role>Manager</role>
diff --git a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Cell.xml b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Cell.xml
index 9386e0fcf8..9bea318780 100644
--- a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Cell.xml
+++ b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Cell.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.ERP5Type</string>
- <string>ERP5TypeInformation</string>
- </tuple>
- <none/>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Line.xml b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Line.xml
index 58dca8a0b3..44c101558e 100644
--- a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Line.xml
+++ b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory%20Line.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.ERP5Type</string>
- <string>ERP5TypeInformation</string>
- </tuple>
- <none/>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory.xml b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory.xml
index 07dd0dece3..971fc82526 100644
--- a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory.xml
+++ b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Inventory.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.ERP5Type</string>
- <string>ERP5TypeInformation</string>
- </tuple>
- <none/>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Tool.xml b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Tool.xml
index c021f01148..bdad68afbb 100644
--- a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Tool.xml
+++ b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive%20Tool.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.ERP5Type</string>
- <string>ERP5TypeInformation</string>
- </tuple>
- <none/>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive.xml b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive.xml
index c5db3ab64a..4c131d3ca8 100644
--- a/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive.xml
+++ b/bt5/erp5_archive/PortalTypeTemplateItem/portal_types/Archive.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Type.ERP5Type</string>
- <string>ERP5TypeInformation</string>
- </tuple>
- <none/>
+ <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveInventory_view/my_title.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveInventory_view/my_title.xml
deleted file mode 100644
index 6b82ce9ff2..0000000000
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveInventory_view/my_title.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="StringField" module="Products.Formulator.StandardFields"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>my_title</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Title</string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_createArchive.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_createArchive.xml
index 21829c299b..d59c22d3e5 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_createArchive.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_createArchive.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_viewArchiveList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_viewArchiveList.xml
index a5944591ee..e688e392bb 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_viewArchiveList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/ArchiveTool_viewArchiveList.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createAllInventory.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createAllInventory.xml
index b94685e268..46f1a0c5ea 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createAllInventory.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createAllInventory.xml
@@ -66,18 +66,18 @@
<item>
<key> <string>_body</string> </key>
<value> <string># This script is intended to be call at archive creation\n
-# It will launch one activity per group of 100 node uid in order\n
+# It will launch one activity per group of 10 node uid in order\n
# to create inventory and same for payment_uid\n
\n
account_uid_list = [x.uid for x in context.Archive_getBankAccountUidList()]\n
node_uid_list = [x.node_uid for x in context.Archive_getNodeUidList(connection_id=source_connection_id,\n
account_uid_list=account_uid_list)]\n
\n
-context.log("node_uid_list", node_uid_list)\n
+#context.log("node_uid_list", node_uid_list)\n
while len(node_uid_list):\n
- activity_node_list = node_uid_list[:100]\n
- node_uid_list = node_uid_list[100:]\n
- context.portal_simulation.activate(activity="SQLQueue",\n
+ activity_node_list = node_uid_list[:10]\n
+ node_uid_list = node_uid_list[10:]\n
+ context.portal_simulation.activate(activity="SQLQueue", round_robin_scheduling=1,\n
tag=tag).Archive_createInventory(node_uid_list=activity_node_list,\n
source_connection_id=source_connection_id,\n
destination_sql_catalog_id=destination_sql_catalog_id,\n
@@ -87,11 +87,11 @@ while len(node_uid_list):\n
payment_uid_list = [x.payment_uid for x in context.Archive_getPaymentUidList(connection_id=source_connection_id,\n
account_uid_list=account_uid_list)]\n
\n
-context.log("payment_uid_list", payment_uid_list)\n
+#context.log("payment_uid_list", payment_uid_list)\n
while len(payment_uid_list):\n
- activity_payment_list = payment_uid_list[:100]\n
- payment_uid_list = payment_uid_list[100:]\n
- context.portal_simulation.activate(activity="SQLQueue",\n
+ activity_payment_list = payment_uid_list[:10]\n
+ payment_uid_list = payment_uid_list[10:]\n
+ context.portal_simulation.activate(activity="SQLQueue", round_robin_scheduling=1,\n
tag=tag).Archive_createInventory(payment_uid_list=activity_payment_list,\n
source_connection_id=source_connection_id,\n
destination_sql_catalog_id=destination_sql_catalog_id,\n
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.xml
index ec6aba6c6d..a2e36a5f8f 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_createInventory.xml
@@ -80,17 +80,7 @@ if len(node_uid_list):\n
group_by_section=1,\n
group_by_node=1,\n
connection_id=source_connection_id)\n
- rq = context.portal_simulation.getCurrentInventoryList(node_uid=node_uid_list,\n
- at_date=inventory_date,\n
- group_by_variation=1,\n
- group_by_resource=1,\n
- group_by_section=1,\n
- group_by_node=1,\n
- src__=1,\n
- connection_id=source_connection_id)\n
- \n
- context.log("node",list(node_inventory_list))\n
- context.log("request = %s" %rq, "" )\n
+\n
if len(payment_uid_list):\n
payment_inventory_list = context.portal_simulation.getCurrentInventoryList(payment_uid=payment_uid_list,\n
at_date=inventory_date,\n
@@ -99,12 +89,10 @@ if len(payment_uid_list):\n
group_by_section=1,\n
group_by_payment=1,\n
connection_id=source_connection_id)\n
- context.log("payment",list(payment_inventory_list))\n
\n
inventory_module = context.getPortalObject().archive_inventory_module\n
node_inventory_dict = {}\n
for inventory in node_inventory_list:\n
- context.log("inventory quantity/variation_text/section", ((inventory.total_quantity, inventory.variation_text)))\n
# Do only one inventory per node\n
if not node_inventory_dict.has_key(inventory.node_relative_url):\n
\n
@@ -131,7 +119,6 @@ for inventory in node_inventory_list:\n
inv_line.getPrice()\n
\n
if inventory.variation_text in ("", None):\n
- context.log("setting quantity on line", inventory.total_quantity)\n
inv_line.edit(quantity=inventory.total_quantity)\n
else:\n
# construct base category list\n
@@ -179,7 +166,6 @@ for inv in node_inventory_dict.values(): \n
# same for payment uid\n
payment_inventory_dict = {}\n
for inventory in payment_inventory_list:\n
- context.log("inventory quantity/variation_text/section", ((inventory.total_quantity, inventory.variation_text)))\n
# Do only one inventory per payment\n
if not payment_inventory_dict.has_key(inventory.payment_uid):\n
\n
@@ -270,8 +256,6 @@ for inv in payment_inventory_dict.values(): \n
<string>len</string>
<string>_getattr_</string>
<string>context</string>
- <string>rq</string>
- <string>list</string>
<string>inventory_module</string>
<string>node_inventory_dict</string>
<string>_getiter_</string>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
index 1eac917d6e..f9540b660e 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getBankAccountUidList.xml
@@ -95,7 +95,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_dest1_sql_connection</string> </value>
+ <value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
@@ -111,7 +111,7 @@
</item>
<item>
<key> <string>src</string> </key>
- <value> <string>select catalog.uid from catalog where portal_type = "Bank Account"</string> </value>
+ <value> <string>select catalog.uid from catalog where portal_type = "Bank Account" or portal_type = "Account"</string> </value>
</item>
<item>
<key> <string>template</string> </key>
@@ -147,7 +147,7 @@
</item>
<item>
<key> <string>raw</string> </key>
- <value> <string>select catalog.uid from catalog where portal_type = "Bank Account"</string> </value>
+ <value> <string>select catalog.uid from catalog where portal_type = "Bank Account" or portal_type = "Account"</string> </value>
</item>
</dictionary>
</state>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
index a578a33dc4..a46c17ee3f 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getNodeUidList.xml
@@ -29,6 +29,12 @@
<key> <string>_data</string> </key>
<value>
<dictionary>
+ <item>
+ <key> <string>account_node_uid</string> </key>
+ <value>
+ <dictionary/>
+ </value>
+ </item>
<item>
<key> <string>account_uid_list</string> </key>
<value>
@@ -43,6 +49,7 @@
<value>
<list>
<string>account_uid_list</string>
+<string>account_node_uid</string>
</list>
</value>
</item>
@@ -84,7 +91,8 @@
</item>
<item>
<key> <string>arguments_src</string> </key>
- <value> <string>account_uid_list</string> </value>
+ <value> <string>account_uid_list\r\n
+account_node_uid</string> </value>
</item>
<item>
<key> <string>cache_time_</string> </key>
@@ -104,7 +112,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_dest1_sql_connection</string> </value>
+ <value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
@@ -125,13 +133,17 @@
select distinct(stock.node_uid) \n
from stock \n
where \n
- stock.payment_uid not in (\n
+ (stock.payment_uid not in (\n
<dtml-in account_uid_list>\n
<dtml-unless sequence-start>, </dtml-unless>\n
<dtml-sqlvar sequence-item type="int">\n
</dtml-in>\n
) \n
- or stock.payment_uid is NULL
+ or stock.payment_uid is NULL\n
+ or stock.payment_uid = "")\n
+ <dtml-if account_node_uid>\n
+ and stock.node_uid != <dtml-sqlvar account_node_uid type="int" >\n
+ </dtml-if>
]]></string> </value>
</item>
@@ -174,13 +186,17 @@ where \n
select distinct(stock.node_uid) \n
from stock \n
where \n
- stock.payment_uid not in (\n
+ (stock.payment_uid not in (\n
<dtml-in account_uid_list>\n
<dtml-unless sequence-start>, </dtml-unless>\n
<dtml-sqlvar sequence-item type="int">\n
</dtml-in>\n
) \n
- or stock.payment_uid is NULL
+ or stock.payment_uid is NULL\n
+ or stock.payment_uid = "")\n
+ <dtml-if account_node_uid>\n
+ and stock.node_uid != <dtml-sqlvar account_node_uid type="int" >\n
+ </dtml-if>
]]></string> </value>
</item>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
index 1e2747f362..5fbc65e3a5 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_getPaymentUidList.xml
@@ -104,7 +104,7 @@
</item>
<item>
<key> <string>connection_id</string> </key>
- <value> <string>erp5_dest1_sql_connection</string> </value>
+ <value> <string>erp5_sql_connection</string> </value>
</item>
<item>
<key> <string>id</string> </key>
@@ -131,7 +131,8 @@ where \n
<dtml-sqlvar sequence-item type="int">\n
</dtml-in>\n
) \n
- and stock.payment_uid is not NULL
+ and stock.payment_uid is not NULL \n
+ and stock.payment_uid != ""
]]></string> </value>
</item>
@@ -180,7 +181,8 @@ where \n
<dtml-sqlvar sequence-item type="int">\n
</dtml-in>\n
) \n
- and stock.payment_uid is not NULL
+ and stock.payment_uid is not NULL \n
+ and stock.payment_uid != ""
]]></string> </value>
</item>
diff --git a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_test.xml b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_test.xml
index 5a376c4629..2d3708fda3 100644
--- a/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_test.xml
+++ b/bt5/erp5_archive/SkinTemplateItem/portal_skins/erp5_archive/Archive_test.xml
@@ -68,13 +68,31 @@
<value> <string encoding="cdata"><![CDATA[
non_reflected_portal_type = []\n
-result = True\n
+item_type_list = context.getPortalItemTypeList()\n
+item_container_type_list = []\n
\n
log = 0\n
-#if context.getPortalType() == "Archive Inventory Line":\n
-# log = 1\n
+result = True\n
+\n
+if log:\n
+ context.log("object = %s" %(context,), "archive = %s" %(predicate,))\n
\n
+# items and their container go in all catalog\n
+ptype = context.getPortalType()\n
+if ptype in item_type_list:\n
+ return True\n
+if ptype in item_container_type_list:\n
+ return True\n
\n
+if getattr(context, \'getExplanationValue\', None) is not None:\n
+ try:\n
+ explanation_value = context.getExplanationValue()\n
+ except AttributeError:\n
+ context.log("Archive_test, getExplanationValue failed", "obj = %s" %(context,))\n
+ explanation_value = None\n
+ if explanation_value is not None and explanation_value.getPortalType() \\\n
+ in item_container_type_list:\n
+ return True\n
\n
# Check Date\n
if getattr(context, \'getStopDate\', None) is not None:\n
@@ -88,14 +106,18 @@ if getattr(context, \'getStopDate\', None) is not None:\n
result = result and (context.getStopDate() >= min_stop_date)\n
if log:\n
context.log("result after date", result)\n
-# Object not delivery or movement goes in all archive\n
-result = result or (not(getattr(context, \'isMovement\', 0) or getattr(context, \'isDelivery\', 0)))\n
-if log:\n
- context.log("result after isMovement/Delivery", result)\n
+\n
# Except those we don\'t want\n
-result = result and (context.getPortalType() not in non_reflected_portal_type)\n
-if log:\n
- context.log("result after reflected", result)\n
+if ptype not in non_reflected_portal_type:\n
+ # Object not delivery or movement goes in all archive\n
+ result = result or (not(getattr(context, \'isMovement\', 0) or getattr(context, \'isDelivery\', 0)))\n
+ if log:\n
+ context.log(" - result after isMovement/Delivery", "%s" %result)\n
+else:\n
+ result = result and True\n
+ if log:\n
+ context.log(" - result after reflected", "%s" %result)\n
+\n
# XXX must manage specific case like Applied Rule, where do we want them to go ?\n
return result\n
@@ -144,13 +166,18 @@ return result\n
<tuple>
<string>predicate</string>
<string>non_reflected_portal_type</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>item_type_list</string>
+ <string>item_container_type_list</string>
+ <string>log</string>
<string>True</string>
<string>result</string>
- <string>log</string>
+ <string>ptype</string>
<string>getattr</string>
- <string>context</string>
<string>None</string>
- <string>_getattr_</string>
+ <string>explanation_value</string>
+ <string>AttributeError</string>
<string>max_stop_date</string>
<string>min_stop_date</string>
</tuple>
diff --git a/bt5/erp5_archive/ToolTemplateItem/portal_archives.xml b/bt5/erp5_archive/ToolTemplateItem/portal_archives.xml
index e2766dfce4..f1308a0ef9 100644
--- a/bt5/erp5_archive/ToolTemplateItem/portal_archives.xml
+++ b/bt5/erp5_archive/ToolTemplateItem/portal_archives.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Catalog.Tool.ArchiveTool</string>
- <string>ArchiveTool</string>
- </tuple>
- <none/>
+ <global name="ArchiveTool" module="Products.ERP5Catalog.Tool.ArchiveTool"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -18,10 +15,36 @@
<none/>
</value>
</item>
+ <item>
+ <key> <string>_count</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_folder_handler</string> </key>
+ <value> <string>CMFBTreeFolderHandler</string> </value>
+ </item>
+ <item>
+ <key> <string>_mt_index</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>_tree</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>portal_archives</string> </value>
</item>
+ <item>
+ <key> <string>last_id</string> </key>
+ <value> <string>1</string> </value>
+ </item>
<item>
<key> <string>uid</string> </key>
<value>
@@ -31,4 +54,26 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="Length" module="BTrees.Length"/>
+ </pickle>
+ <pickle> <int>0</int> </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <global name="OOBTree" module="BTrees._OOBTree"/>
+ </pickle>
+ <pickle>
+ <none/>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow.xml
index c0c49d1862..e2f1623604 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.DCWorkflow</string>
- <string>DCWorkflowDefinition</string>
- </tuple>
- <none/>
+ <global name="DCWorkflowDefinition" module="Products.DCWorkflow.DCWorkflow"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts.xml
index 01ba35bf25..66683dde04 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Scripts</string>
- <string>Scripts</string>
- </tuple>
- <none/>
+ <global name="Scripts" module="Products.DCWorkflow.Scripts"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/Archive_updateDate.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/Archive_updateDate.xml
new file mode 100644
index 0000000000..35176f29cc
--- /dev/null
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/Archive_updateDate.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>obj = state_change[\'object\']\n
+from DateTime import DateTime\n
+# we set h/m/s on min date and max date\n
+date = obj.getStopDateRangeMax()\n
+if date is not None:\n
+ date = DateTime("%8s 23:59:59" %(date.Date(),))\n
+ obj.setStopDateRangeMax(date)\n
+\n
+date = obj.getStopDateRangeMin()\n
+if date is not None:\n
+ date = DateTime("%8s 23:59:59" %(date.Date(),))\n
+ obj.setStopDateRangeMin(date)\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>state_change, **kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>state_change</string>
+ <string>kw</string>
+ <string>_getitem_</string>
+ <string>obj</string>
+ <string>DateTime</string>
+ <string>_getattr_</string>
+ <string>date</string>
+ <string>None</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>Archive_updateDate</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/checkArchive.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/checkArchive.xml
index 756e612c1d..e5bf1fa90a 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/checkArchive.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/scripts/checkArchive.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PythonScripts.PythonScript</string>
- <string>PythonScript</string>
- </tuple>
- <none/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states.xml
index d6c2d2d922..cd2db0fb0c 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>States</string>
- </tuple>
- <none/>
+ <global name="States" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/cancelled.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/cancelled.xml
index 23f71a3aee..d90151d77c 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/cancelled.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/cancelled.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>StateDefinition</string>
- </tuple>
- <none/>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -57,7 +54,7 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/deleted.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/deleted.xml
index 8ac951b222..9e29ed9891 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/deleted.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/deleted.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>StateDefinition</string>
- </tuple>
- <none/>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -54,7 +51,7 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/draft.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/draft.xml
index df059fcc54..dbbad8ee3b 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/draft.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/draft.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>StateDefinition</string>
- </tuple>
- <none/>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -59,7 +56,7 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/ready.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/ready.xml
index 113b13557c..d65cb81c3a 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/ready.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/ready.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>StateDefinition</string>
- </tuple>
- <none/>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -58,7 +55,7 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/validated.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/validated.xml
index 77619c6394..f90a9dd1c9 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/validated.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/states/validated.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.States</string>
- <string>StateDefinition</string>
- </tuple>
- <none/>
+ <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -56,7 +53,7 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions.xml
index 3763e3df95..61f19d835a 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>Transitions</string>
- </tuple>
- <none/>
+ <global name="Transitions" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel.xml
index c36fd1f7b9..234727204c 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel_action.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel_action.xml
index adcd303fe3..f46eac2a6e 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel_action.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/cancel_action.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete.xml
index d2f86ab575..e6d68e25f9 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete_action.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete_action.xml
index 552918c81a..e1a7e72a88 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/delete_action.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready.xml
index 1fe350775a..b70d9db8ca 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -54,7 +51,7 @@
</item>
<item>
<key> <string>script_name</string> </key>
- <value> <string></string> </value>
+ <value> <string>Archive_updateDate</string> </value>
</item>
<item>
<key> <string>title</string> </key>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready_action.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready_action.xml
index 4034b3005d..31593fc9ee 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready_action.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/ready_action.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/validate.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/validate.xml
index 4f8e9e02a6..d553ad01bb 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/validate.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/transitions/validate.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Transitions</string>
- <string>TransitionDefinition</string>
- </tuple>
- <none/>
+ <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables.xml
index 07046d72fe..7d9ea0fae8 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>Variables</string>
- </tuple>
- <none/>
+ <global name="Variables" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/action.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/action.xml
index becd6d2fdc..e56bf7a226 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/action.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/action.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml
index e75ea2e3ec..e5fbe8aef5 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/actor.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/comment.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/comment.xml
index f67d5dfea2..c78b599949 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/comment.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/comment.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/error_message.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/error_message.xml
index 61c9a2d189..aace5d205e 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/error_message.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/error_message.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/history.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/history.xml
index b67210d7ba..a16e9ad133 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/history.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/history.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/portal_type.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/portal_type.xml
index 20edbc7d07..d4abc30a9a 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/portal_type.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/portal_type.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/time.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/time.xml
index 5ee01dda49..79cfd6ad69 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/time.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/variables/time.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Variables</string>
- <string>VariableDefinition</string>
- </tuple>
- <none/>
+ <global name="VariableDefinition" module="Products.DCWorkflow.Variables"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists.xml
index 746450c318..609a885c76 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Worklists</string>
- <string>Worklists</string>
- </tuple>
- <none/>
+ <global name="Worklists" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists/draft.xml b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists/draft.xml
index c7436fe4af..cafbaa9663 100644
--- a/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists/draft.xml
+++ b/bt5/erp5_archive/WorkflowTemplateItem/portal_workflow/archive_workflow/worklists/draft.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.DCWorkflow.Worklists</string>
- <string>WorklistDefinition</string>
- </tuple>
- <none/>
+ <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -80,7 +77,7 @@ Base_viewWorklist?simulation_state=draft&portal_type=Archive&reset=1
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
- <global name="PersistentMapping" module="Persistence"/>
+ <global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
diff --git a/bt5/erp5_archive/bt/change_log b/bt5/erp5_archive/bt/change_log
index 9d973b9211..e86f897b48 100644
--- a/bt5/erp5_archive/bt/change_log
+++ b/bt5/erp5_archive/bt/change_log
@@ -1,3 +1,6 @@
+2007-11-14 Aurel
+* update workflow to defined h:m:s on archive date, many zsql method and script update to take more cases into account
+
2007-10-25 romain
* Move Archive Tool frm erp5_core.
diff --git a/bt5/erp5_archive/bt/revision b/bt5/erp5_archive/bt/revision
index 4800c7da68..eebd1d10b6 100644
--- a/bt5/erp5_archive/bt/revision
+++ b/bt5/erp5_archive/bt/revision
@@ -1 +1 @@
-58
\ No newline at end of file
+61
\ No newline at end of file
diff --git a/bt5/erp5_archive/bt/template_tool_id_list b/bt5/erp5_archive/bt/template_tool_id_list
index 4f29aa8e08..0b473dfb43 100644
--- a/bt5/erp5_archive/bt/template_tool_id_list
+++ b/bt5/erp5_archive/bt/template_tool_id_list
@@ -1 +1 @@
-('portal_archives',)
\ No newline at end of file
+portal_archives
\ No newline at end of file
--
2.30.9