From 574293f5e1f2de9fe62271a0aa6c648775d310de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 28 Jan 2009 16:14:09 +0000 Subject: [PATCH] When the invoice is just created by the builder, users first have to check invoice lines, so show invoice tab as first tab and not accounting tab in that case git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25340 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../view_confirmed_invoice.xml | 95 +++++++++++++++++++ .../view_invoice.xml | 2 +- .../invoice_item_list.xml | 20 +++- .../view_confirmed_invoice.xml | 95 +++++++++++++++++++ bt5/erp5_invoicing/bt/revision | 2 +- .../bt/template_action_path_list | 2 + 6 files changed, 213 insertions(+), 3 deletions(-) create mode 100644 bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_confirmed_invoice.xml create mode 100644 bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_confirmed_invoice.xml diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_confirmed_invoice.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_confirmed_invoice.xml new file mode 100644 index 0000000000..820521e3d2 --- /dev/null +++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_confirmed_invoice.xml @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>category</string> </key> + <value> <string>object_view</string> </value> + </item> + <item> + <key> <string>condition</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>icon</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>view_confirmed_invoice</string> </value> + </item> + <item> + <key> <string>permissions</string> </key> + <value> + <tuple> + <string>View</string> + </tuple> + </value> + </item> + <item> + <key> <string>priority</string> </key> + <value> <float>0.5</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Invoice View</string> </value> + </item> + <item> + <key> <string>visible</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>string:${object_url}/PurchaseInvoiceTransaction_viewInvoice</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_invoice.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_invoice.xml index 8e06a911d6..c7f2da8c0a 100644 --- a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_invoice.xml +++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/view_invoice.xml @@ -87,7 +87,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python:not(object.AccountingTransaction_isSourceView())</string> </value> + <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_item_list.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_item_list.xml index 91a4f8694b..f97e6762c9 100644 --- a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_item_list.xml +++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_item_list.xml @@ -21,7 +21,9 @@ </item> <item> <key> <string>condition</string> </key> - <value> <string></string> </value> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> </item> <item> <key> <string>description</string> </key> @@ -74,4 +76,20 @@ </dictionary> </pickle> </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value> + </item> + </dictionary> + </pickle> + </record> </ZopeData> diff --git a/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_confirmed_invoice.xml b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_confirmed_invoice.xml new file mode 100644 index 0000000000..ffb0eba4a4 --- /dev/null +++ b/bt5/erp5_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/view_confirmed_invoice.xml @@ -0,0 +1,95 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <tuple> + <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>action</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>category</string> </key> + <value> <string>object_view</string> </value> + </item> + <item> + <key> <string>condition</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> + </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>icon</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>view_confirmed_invoice</string> </value> + </item> + <item> + <key> <string>permissions</string> </key> + <value> + <tuple> + <string>View</string> + </tuple> + </value> + </item> + <item> + <key> <string>priority</string> </key> + <value> <float>0.5</float> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Invoice View</string> </value> + </item> + <item> + <key> <string>visible</string> </key> + <value> <int>1</int> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>string:${object_url}/SaleInvoiceTransaction_viewInvoice</string> </value> + </item> + </dictionary> + </pickle> + </record> + <record id="3" aka="AAAAAAAAAAM="> + <pickle> + <tuple> + <global name="Expression" module="Products.CMFCore.Expression"/> + <tuple/> + </tuple> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>text</string> </key> + <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/bt5/erp5_invoicing/bt/revision b/bt5/erp5_invoicing/bt/revision index 1edbdbab42..cb37cb5c1f 100644 --- a/bt5/erp5_invoicing/bt/revision +++ b/bt5/erp5_invoicing/bt/revision @@ -1 +1 @@ -185 \ No newline at end of file +186 \ No newline at end of file diff --git a/bt5/erp5_invoicing/bt/template_action_path_list b/bt5/erp5_invoicing/bt/template_action_path_list index beae7856aa..0279a1eb96 100644 --- a/bt5/erp5_invoicing/bt/template_action_path_list +++ b/bt5/erp5_invoicing/bt/template_action_path_list @@ -8,6 +8,7 @@ Purchase Invoice Transaction | apply_trade_condition Purchase Invoice Transaction | jump_related_order Purchase Invoice Transaction | jump_to_related_purchase_packing_list Purchase Invoice Transaction | payment_condition +Purchase Invoice Transaction | view_confirmed_invoice Purchase Invoice Transaction | view_discount Purchase Invoice Transaction | view_invoice Purchase Invoice Transaction | view_tax @@ -18,6 +19,7 @@ Sale Invoice Transaction | invoice_print Sale Invoice Transaction | jump_related_order Sale Invoice Transaction | jump_to_related_sale_packing_list Sale Invoice Transaction | payment_condition +Sale Invoice Transaction | view_confirmed_invoice Sale Invoice Transaction | view_discount Sale Invoice Transaction | view_tax Sale Order | jump_related_invoice -- 2.30.9