From 2000c1235a38ed08e629e3a157911576978773bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 1 Feb 2010 10:10:36 +0000 Subject: [PATCH] Make invoice view the default before confirmed state, because user is supposed to enter invoice lines first, and let accounting lines be generated from invoice lines git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32116 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml | 2 +- .../Purchase%20Invoice%20Transaction/invoice_view.xml | 2 +- .../Sale%20Invoice%20Transaction/confirmed_invoice_view.xml | 2 +- .../portal_types/Sale%20Invoice%20Transaction/invoice_view.xml | 2 +- bt5/erp5_simplified_invoicing/bt/revision | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml index d99834ee09..d380bb22e6 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/confirmed_invoice_view.xml @@ -97,7 +97,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value> + <value> <string>python: object.getSimulationState() in (\'draft\', \'planned\', \'confirmed\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml index 7d135f62c7..3a57aa53b2 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/invoice_view.xml @@ -97,7 +97,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value> + <value> <string>python: object.getSimulationState() not in (\'draft\', \'planned\', \'confirmed\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml index 98d2275ebf..884e1f0533 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/confirmed_invoice_view.xml @@ -97,7 +97,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: object.getSimulationState() == \'confirmed\'</string> </value> + <value> <string>python: object.getSimulationState() in (\'draft\', \'planned\', \'confirmed\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml index 8e289b1f81..bf633c629b 100644 --- a/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml +++ b/bt5/erp5_simplified_invoicing/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/invoice_view.xml @@ -97,7 +97,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>python: object.getSimulationState() != \'confirmed\'</string> </value> + <value> <string>python: object.getSimulationState() not in (\'draft\', \'planned\', \'confirmed\')</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_simplified_invoicing/bt/revision b/bt5/erp5_simplified_invoicing/bt/revision index 801f180102..31ff414b74 100644 --- a/bt5/erp5_simplified_invoicing/bt/revision +++ b/bt5/erp5_simplified_invoicing/bt/revision @@ -1 +1 @@ -47 \ No newline at end of file +48 \ No newline at end of file -- 2.30.9