From e965a1397368fd963f3b3a2aa86f1d4a92f54e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Fri, 30 Oct 2009 12:46:17 +0000 Subject: [PATCH] Don't show cancelled invoices in diverged worklists git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30146 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../worklists/99a_diverged_sale_invoice_list.xml | 14 +++++++++++++- .../99b_diverged_purchase_invoice_list.xml | 14 +++++++++++++- bt5/erp5_accounting/bt/revision | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99a_diverged_sale_invoice_list.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99a_diverged_sale_invoice_list.xml index 726ffcc1dac..56368735d5a 100644 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99a_diverged_sale_invoice_list.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99a_diverged_sale_invoice_list.xml @@ -21,7 +21,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(portal_type)s&causality_state=diverged +accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(portal_type)s&causality_state=diverged&simulation_state:list=planned&simulation_state:list=confirmed&simulation_state:list=started&simulation_state:list=stopped&simulation_state:list=delivered ]]></string> </value> </item> @@ -99,6 +99,18 @@ accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(por </tuple> </value> </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>planned</string> + <string>confirmed</string> + <string>started</string> + <string>stopped</string> + <string>delivered</string> + </tuple> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99b_diverged_purchase_invoice_list.xml b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99b_diverged_purchase_invoice_list.xml index 0fa4ab8606d..3f8fabcfc3d 100644 --- a/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99b_diverged_purchase_invoice_list.xml +++ b/bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/worklists/99b_diverged_purchase_invoice_list.xml @@ -21,7 +21,7 @@ <key> <string>actbox_url</string> </key> <value> <string encoding="cdata"><![CDATA[ -accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(portal_type)s&causality_state=diverged +accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(portal_type)s&causality_state=diverged&simulation_state:list=planned&simulation_state:list=confirmed&simulation_state:list=started&simulation_state:list=stopped&simulation_state:list=delivered ]]></string> </value> </item> @@ -99,6 +99,18 @@ accounting_module/view?reset:int=1&local_roles=%(local_roles)s&portal_type=%(por </tuple> </value> </item> + <item> + <key> <string>simulation_state</string> </key> + <value> + <tuple> + <string>planned</string> + <string>confirmed</string> + <string>started</string> + <string>stopped</string> + <string>delivered</string> + </tuple> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_accounting/bt/revision b/bt5/erp5_accounting/bt/revision index d328906f644..65bdad7fa21 100644 --- a/bt5/erp5_accounting/bt/revision +++ b/bt5/erp5_accounting/bt/revision @@ -1 +1 @@ -1025 \ No newline at end of file +1026 \ No newline at end of file -- 2.30.9