From 25f1f864b0665fb8d02e3444702436b862a6b9b7 Mon Sep 17 00:00:00 2001 From: Lucas Carvalho <lucas@nexedi.com> Date: Mon, 14 Sep 2009 21:46:34 +0000 Subject: [PATCH] - changed the worklist 1) List Draft Products 2) List Draft Services 3) List Validated Products 4) List Validated Services git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29047 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...duct_list.xml => 1_draft_product_list.xml} | 2 +- ...vice_list.xml => 2_draft_service_list.xml} | 2 +- .../3_draft_purchase_trade_condition_list.xml | 107 ------------------ ...n_list.xml => 3_validate_product_list.xml} | 12 +- ...n_list.xml => 4_validate_service_list.xml} | 12 +- .../6_draft_sale_trade_condition_list.xml | 107 ------------------ bt5/erp5_commerce/bt/revision | 2 +- 7 files changed, 15 insertions(+), 229 deletions(-) rename bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/{4_draft_product_list.xml => 1_draft_product_list.xml} (97%) rename bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/{5_draft_service_list.xml => 2_draft_service_list.xml} (97%) delete mode 100644 bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml rename bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/{1_draft_person_list.xml => 3_validate_product_list.xml} (86%) rename bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/{2_draft_organisation_list.xml => 4_validate_service_list.xml} (86%) delete mode 100644 bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/6_draft_sale_trade_condition_list.xml diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_draft_product_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_product_list.xml similarity index 97% rename from bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_draft_product_list.xml rename to bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_product_list.xml index 19a591477a..0860b621fb 100644 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_draft_product_list.xml +++ b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_product_list.xml @@ -37,7 +37,7 @@ product_module/view?validation_state=draft&local_roles:list=Assignee&local_roles </item> <item> <key> <string>id</string> </key> - <value> <string>4_draft_product_list</string> </value> + <value> <string>1_draft_product_list</string> </value> </item> <item> <key> <string>var_matches</string> </key> diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/5_draft_service_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_service_list.xml similarity index 97% rename from bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/5_draft_service_list.xml rename to bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_service_list.xml index 96dfd20c35..ec76716fe4 100644 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/5_draft_service_list.xml +++ b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_service_list.xml @@ -37,7 +37,7 @@ service_module/view?validation_state=draft&local_roles:list=Assignee&local_roles </item> <item> <key> <string>id</string> </key> - <value> <string>5_draft_service_list</string> </value> + <value> <string>2_draft_service_list</string> </value> </item> <item> <key> <string>var_matches</string> </key> diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml deleted file mode 100644 index 0b0c390725..0000000000 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_draft_purchase_trade_condition_list.xml +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>actbox_category</string> </key> - <value> <string>global</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Purchase Trade Conditions to Validate (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -purchase_trade_condition_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Purchase Trade Conditions to Validate</string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>3_draft_purchase_trade_condition_list</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Guard" module="Products.DCWorkflow.Guard"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Assignor</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="PersistentMapping" module="Persistence.mapping"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>data</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Purchase Trade Condition</string> - </tuple> - </value> - </item> - <item> - <key> <string>validation_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_person_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_validate_product_list.xml similarity index 86% rename from bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_person_list.xml rename to bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_validate_product_list.xml index 85fc9e3e67..e4528faebc 100644 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/1_draft_person_list.xml +++ b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/3_validate_product_list.xml @@ -15,19 +15,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Persons to Validate (%(count)s)</string> </value> + <value> <string>Products to Publish (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 +product_module/view?validation_state=validated&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Persons to Validate</string> </value> + <value> <string>Products to Published</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -37,7 +37,7 @@ person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles: </item> <item> <key> <string>id</string> </key> - <value> <string>1_draft_person_list</string> </value> + <value> <string>3_validate_product_list</string> </value> </item> <item> <key> <string>var_matches</string> </key> @@ -86,7 +86,7 @@ person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles: <key> <string>portal_type</string> </key> <value> <tuple> - <string>Person</string> + <string>Product</string> </tuple> </value> </item> @@ -94,7 +94,7 @@ person_module/view?validation_state=draft&local_roles:list=Assignee&local_roles: <key> <string>validation_state</string> </key> <value> <tuple> - <string>draft</string> + <string>validated</string> </tuple> </value> </item> diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_organisation_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_validate_service_list.xml similarity index 86% rename from bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_organisation_list.xml rename to bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_validate_service_list.xml index afb8ac23d3..7bd3addddc 100644 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/2_draft_organisation_list.xml +++ b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/4_validate_service_list.xml @@ -15,19 +15,19 @@ </item> <item> <key> <string>actbox_name</string> </key> - <value> <string>Organisations to Validate (%(count)s)</string> </value> + <value> <string>Products to Publish (%(count)s)</string> </value> </item> <item> <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 +service_module/view?validation_state=validated&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 ]]></string> </value> </item> <item> <key> <string>description</string> </key> - <value> <string>Organisations to Validate</string> </value> + <value> <string>Services to Published</string> </value> </item> <item> <key> <string>guard</string> </key> @@ -37,7 +37,7 @@ organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_ </item> <item> <key> <string>id</string> </key> - <value> <string>2_draft_organisation_list</string> </value> + <value> <string>4_validate_service_list</string> </value> </item> <item> <key> <string>var_matches</string> </key> @@ -86,7 +86,7 @@ organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_ <key> <string>portal_type</string> </key> <value> <tuple> - <string>Organisation</string> + <string>Service</string> </tuple> </value> </item> @@ -94,7 +94,7 @@ organisation_module/view?validation_state=draft&local_roles:list=Assignee&local_ <key> <string>validation_state</string> </key> <value> <tuple> - <string>draft</string> + <string>validated</string> </tuple> </value> </item> diff --git a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/6_draft_sale_trade_condition_list.xml b/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/6_draft_sale_trade_condition_list.xml deleted file mode 100644 index e85bfd36fb..0000000000 --- a/bt5/erp5_commerce/WorkflowTemplateItem/portal_workflow/commerce_validation_workflow/worklists/6_draft_sale_trade_condition_list.xml +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>actbox_category</string> </key> - <value> <string>global</string> </value> - </item> - <item> - <key> <string>actbox_name</string> </key> - <value> <string>Sale Trade Conditions to Validate (%(count)s)</string> </value> - </item> - <item> - <key> <string>actbox_url</string> </key> - <value> <string encoding="cdata"><![CDATA[ - -sale_trade_condition_module/view?validation_state=draft&local_roles:list=Assignee&local_roles:list=Assignor&reset=1 - -]]></string> </value> - </item> - <item> - <key> <string>description</string> </key> - <value> <string>Sale Trade Conditions to Validate</string> </value> - </item> - <item> - <key> <string>guard</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>6_draft_sale_trade_condition_list</string> </value> - </item> - <item> - <key> <string>var_matches</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <global name="Guard" module="Products.DCWorkflow.Guard"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>roles</string> </key> - <value> - <tuple> - <string>Assignee</string> - <string>Assignor</string> - </tuple> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="3" aka="AAAAAAAAAAM="> - <pickle> - <tuple> - <global name="PersistentMapping" module="Persistence.mapping"/> - <tuple/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>data</string> </key> - <value> - <dictionary> - <item> - <key> <string>portal_type</string> </key> - <value> - <tuple> - <string>Sale Trade Condition</string> - </tuple> - </value> - </item> - <item> - <key> <string>validation_state</string> </key> - <value> - <tuple> - <string>draft</string> - </tuple> - </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_commerce/bt/revision b/bt5/erp5_commerce/bt/revision index aebfaa171d..58e77f3515 100644 --- a/bt5/erp5_commerce/bt/revision +++ b/bt5/erp5_commerce/bt/revision @@ -1 +1 @@ -214 \ No newline at end of file +215 \ No newline at end of file -- 2.30.9