From 33ded22f1b52a0b19128d86a57894ba2aa228705 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Wed, 1 Aug 2018 16:16:02 +0200 Subject: [PATCH] [REF][IMP]GOLEM Activity Registrations * Large refactoring around registration trees (using contexts) ; * Enhancement on base tree view and form. --- golem_activity_registration/__manifest__.py | 2 +- golem_activity_registration/i18n/fr.po | 18 +++--- .../i18n/golem_activity_registration.pot | 18 +++--- .../models/golem_activity_registration.py | 4 +- .../golem_activity_registration_views.xml | 28 ++++++---- .../views/golem_activity_views.xml | 9 +-- .../views/golem_member_views.xml | 19 +------ .../__manifest__.py | 5 +- .../i18n/fr.po | 34 +++++++++++- .../golem_activity_registration_payment.pot | 34 +++++++++++- .../models/golem_activity_registration.py | 3 +- .../golem_activity_registration_views.xml | 33 ++++++++--- .../views/golem_activity_views.xml | 37 ------------- .../__manifest__.py | 5 +- golem_activity_registration_state/i18n/fr.po | 31 ++++++----- .../golem_activity_registration_state.pot | 31 ++++++----- .../golem_activity_registration_views.xml | 55 ++++++++++++++++++- .../views/golem_activity_views.xml | 50 ----------------- .../views/golem_member_views.xml | 26 +-------- 19 files changed, 226 insertions(+), 216 deletions(-) delete mode 100644 golem_activity_registration_payment/views/golem_activity_views.xml delete mode 100644 golem_activity_registration_state/views/golem_activity_views.xml diff --git a/golem_activity_registration/__manifest__.py b/golem_activity_registration/__manifest__.py index a975623..3d0ebf9 100644 --- a/golem_activity_registration/__manifest__.py +++ b/golem_activity_registration/__manifest__.py @@ -18,7 +18,7 @@ { 'name': 'GOLEM Activity Member Registrations', 'summary': 'GOLEM Activities Member Registrations management', - 'version': '10.0.1.3.5', + 'version': '10.0.1.4.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_activity_registration/i18n/fr.po b/golem_activity_registration/i18n/fr.po index 673e394..cc2df2b 100644 --- a/golem_activity_registration/i18n/fr.po +++ b/golem_activity_registration/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 16:22+0000\n" -"PO-Revision-Date: 2018-07-20 18:22+0200\n" +"POT-Creation-Date: 2018-08-01 14:09+0000\n" +"PO-Revision-Date: 2018-08-01 16:12+0200\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgid "Animator" msgstr "Intervenant" #. module: golem_activity_registration -#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree msgid "Base price" msgstr "Prix de base" @@ -191,11 +191,6 @@ msgstr "Dernière mise à jour par" msgid "Last Updated on" msgstr "Dernière mise à jour le" -#. module: golem_activity_registration -#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id -msgid "Member" -msgstr "Adhérent" - #. module: golem_activity_registration #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_activity_registration_ids #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_form_inherit_registration @@ -244,6 +239,11 @@ msgstr "Prix de vente" msgid "Season" msgstr "Saison" +#. module: golem_activity_registration +#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id +msgid "Service user" +msgstr "Usager" + #. module: golem_activity_registration #: code:addons/golem_activity_registration/models/golem_activity_registration.py:70 #, python-format @@ -269,7 +269,7 @@ msgid "This member has already been registered for this activity." msgstr "L'usager a déjà été inscrit à cette activité." #. module: golem_activity_registration -#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree msgid "Total" msgstr "Total" diff --git a/golem_activity_registration/i18n/golem_activity_registration.pot b/golem_activity_registration/i18n/golem_activity_registration.pot index 3e8f06b..942e7f4 100644 --- a/golem_activity_registration/i18n/golem_activity_registration.pot +++ b/golem_activity_registration/i18n/golem_activity_registration.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-20 16:21+0000\n" -"PO-Revision-Date: 2018-07-20 16:21+0000\n" +"POT-Creation-Date: 2018-08-01 14:09+0000\n" +"PO-Revision-Date: 2018-08-01 14:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgid "Animator" msgstr "" #. module: golem_activity_registration -#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree msgid "Base price" msgstr "" @@ -191,11 +191,6 @@ msgstr "" msgid "Last Updated on" msgstr "" -#. module: golem_activity_registration -#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id -msgid "Member" -msgstr "" - #. module: golem_activity_registration #: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_activity_registration_ids #: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_form_inherit_registration @@ -244,6 +239,11 @@ msgstr "" msgid "Season" msgstr "" +#. module: golem_activity_registration +#: model:ir.model.fields,field_description:golem_activity_registration.field_golem_activity_registration_member_id +msgid "Service user" +msgstr "" + #. module: golem_activity_registration #: code:addons/golem_activity_registration/models/golem_activity_registration.py:70 #, python-format @@ -269,7 +269,7 @@ msgid "This member has already been registered for this activity." msgstr "" #. module: golem_activity_registration -#: model:ir.ui.view,arch_db:golem_activity_registration.golem_member_form_inherit_golem_activity_registration +#: model:ir.ui.view,arch_db:golem_activity_registration.golem_activity_registration_tree msgid "Total" msgstr "" diff --git a/golem_activity_registration/models/golem_activity_registration.py b/golem_activity_registration/models/golem_activity_registration.py index 37f8ea7..4a69f08 100644 --- a/golem_activity_registration/models/golem_activity_registration.py +++ b/golem_activity_registration/models/golem_activity_registration.py @@ -77,8 +77,8 @@ class GolemActivityRegistration(models.Model): _description = 'GOLEM Activity Registration' _rec_name ='activity_id' - member_id = fields.Many2one('golem.member', string='Member', required=True, - ondelete='cascade', index=True) + member_id = fields.Many2one('golem.member', string='Service user', + required=True, ondelete='cascade', index=True) activity_id = fields.Many2one('golem.activity', required=True, index=True, string='Activity', ondelete='cascade') activity_price = fields.Float(related='activity_id.list_price') diff --git a/golem_activity_registration/views/golem_activity_registration_views.xml b/golem_activity_registration/views/golem_activity_registration_views.xml index 7288c1c..64334f2 100644 --- a/golem_activity_registration/views/golem_activity_registration_views.xml +++ b/golem_activity_registration/views/golem_activity_registration_views.xml @@ -1,6 +1,6 @@ diff --git a/golem_activity_registration/views/golem_activity_views.xml b/golem_activity_registration/views/golem_activity_views.xml index 9a56f1b..1af2e6e 100644 --- a/golem_activity_registration/views/golem_activity_views.xml +++ b/golem_activity_registration/views/golem_activity_views.xml @@ -34,14 +34,7 @@ along with this program. If not, see . - - - - - - + context="{'default_activity_id': active_id, 'season_show': 0, 'activity_show': 0}" /> diff --git a/golem_activity_registration/views/golem_member_views.xml b/golem_activity_registration/views/golem_member_views.xml index 47bb9d0..e946001 100644 --- a/golem_activity_registration/views/golem_member_views.xml +++ b/golem_activity_registration/views/golem_member_views.xml @@ -31,22 +31,9 @@ along with this program. If not, see . - - - - - - - - - - - - - + context="{'default_member_id': active_id, 'member_show': 0}" /> + diff --git a/golem_activity_registration_payment/__manifest__.py b/golem_activity_registration_payment/__manifest__.py index f51f23b..05a799e 100644 --- a/golem_activity_registration_payment/__manifest__.py +++ b/golem_activity_registration_payment/__manifest__.py @@ -19,15 +19,14 @@ 'name': 'GOLEM Activity Member Registration Payments', 'summary': 'GOLEM Activities Member Registration Payments', 'description': 'GOLEM Activities Member Registration Payments', - 'version': '10.0.0.1.0', + 'version': '10.0.0.2.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois', 'license': 'AGPL-3', 'application': False, 'installable': True, 'depends': ['golem_activity_registration_state', 'golem_payment'], - 'data': ['views/golem_activity_views.xml', - 'views/golem_member_views.xml', + 'data': ['views/golem_member_views.xml', 'views/golem_activity_registration_views.xml', 'wizard/golem_activity_registration_invoicing.xml'] } diff --git a/golem_activity_registration_payment/i18n/fr.po b/golem_activity_registration_payment/i18n/fr.po index 8651b2c..8e3d299 100644 --- a/golem_activity_registration_payment/i18n/fr.po +++ b/golem_activity_registration_payment/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-31 17:51+0000\n" -"PO-Revision-Date: 2018-07-31 19:58+0200\n" +"POT-Creation-Date: 2018-08-01 14:10+0000\n" +"PO-Revision-Date: 2018-08-01 16:15+0200\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -39,6 +39,16 @@ msgstr "Activités et tarifs" msgid "All confirmed registrations had already been invoiced." msgstr "Toutes les inscriptions confirmées ont déjà été facturées." +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "By invoice state" +msgstr "Par état de facturation" + +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Canceled Invoice" +msgstr "Facture Annulée" + #. module: golem_activity_registration_payment #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form msgid "Close" @@ -71,6 +81,11 @@ msgstr "Afficher la facture" msgid "Display payments" msgstr "Afficher les paiements" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Draft Invoice" +msgstr "Facture Brouillon" + #. module: golem_activity_registration_payment #: model:ir.model,name:golem_activity_registration_payment.model_golem_activity_registration msgid "GOLEM Activity Registration" @@ -128,6 +143,11 @@ msgstr "Ligne de facturation" msgid "Invoice pending registrations" msgstr "Inscriptions en attente de facturation" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_state_tree_inherit_payment +msgid "Invoice state" +msgstr "Invoice state" + #. module: golem_activity_registration_payment #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_line_write_uid #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_write_uid @@ -140,6 +160,16 @@ msgstr "Dernière mise à jour par" msgid "Last Updated on" msgstr "Dernière mise à jour le" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Opened Invoice" +msgstr "Facture Ouverte" + +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Paid Invoice" +msgstr "Facture Payée" + #. module: golem_activity_registration_payment #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form msgid "Please confirm activity prices and choose a payment schedule if needed." diff --git a/golem_activity_registration_payment/i18n/golem_activity_registration_payment.pot b/golem_activity_registration_payment/i18n/golem_activity_registration_payment.pot index 5522147..01596ad 100644 --- a/golem_activity_registration_payment/i18n/golem_activity_registration_payment.pot +++ b/golem_activity_registration_payment/i18n/golem_activity_registration_payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-31 17:51+0000\n" -"PO-Revision-Date: 2018-07-31 17:51+0000\n" +"POT-Creation-Date: 2018-08-01 14:09+0000\n" +"PO-Revision-Date: 2018-08-01 14:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -35,6 +35,16 @@ msgstr "" msgid "All confirmed registrations had already been invoiced." msgstr "" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "By invoice state" +msgstr "" + +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Canceled Invoice" +msgstr "" + #. module: golem_activity_registration_payment #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form msgid "Close" @@ -67,6 +77,11 @@ msgstr "" msgid "Display payments" msgstr "" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Draft Invoice" +msgstr "" + #. module: golem_activity_registration_payment #: model:ir.model,name:golem_activity_registration_payment.model_golem_activity_registration msgid "GOLEM Activity Registration" @@ -124,6 +139,11 @@ msgstr "" msgid "Invoice pending registrations" msgstr "" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_state_tree_inherit_payment +msgid "Invoice state" +msgstr "" + #. module: golem_activity_registration_payment #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_line_write_uid #: model:ir.model.fields,field_description:golem_activity_registration_payment.field_golem_activity_registration_invoicing_write_uid @@ -136,6 +156,16 @@ msgstr "" msgid "Last Updated on" msgstr "" +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Opened Invoice" +msgstr "" + +#. module: golem_activity_registration_payment +#: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_search_inherit_payment +msgid "Paid Invoice" +msgstr "" + #. module: golem_activity_registration_payment #: model:ir.ui.view,arch_db:golem_activity_registration_payment.golem_activity_registration_invoicing_view_form msgid "Please confirm activity prices and choose a payment schedule if needed." diff --git a/golem_activity_registration_payment/models/golem_activity_registration.py b/golem_activity_registration_payment/models/golem_activity_registration.py index ed33522..9aba3b8 100644 --- a/golem_activity_registration_payment/models/golem_activity_registration.py +++ b/golem_activity_registration_payment/models/golem_activity_registration.py @@ -27,4 +27,5 @@ class GolemActivityRegistration(models.Model): string='Invoice line', ondelete='set null') invoice_id = fields.Many2one(related='invoice_line_id.invoice_id') - invoice_state = fields.Selection(related='invoice_line_id.invoice_id.state') + invoice_state = fields.Selection(related='invoice_line_id.invoice_id.state', + store=True) diff --git a/golem_activity_registration_payment/views/golem_activity_registration_views.xml b/golem_activity_registration_payment/views/golem_activity_registration_views.xml index a8e353b..632e8d1 100644 --- a/golem_activity_registration_payment/views/golem_activity_registration_views.xml +++ b/golem_activity_registration_payment/views/golem_activity_registration_views.xml @@ -19,29 +19,44 @@ along with this program. If not, see . - - Activity Registration Tree adaptations + + Activity Registration State Tree adaptations golem.activity.registration + ref="golem_activity_registration_state.golem_activity_registration_tree_inherit_state" /> - - - + + + - Activity Registration Search adaptations + Activity Registration State Search adaptations golem.activity.registration + ref="golem_activity_registration_state.golem_activity_registration_search_inherit_state" /> - + + + + + + + + + + + diff --git a/golem_activity_registration_payment/views/golem_activity_views.xml b/golem_activity_registration_payment/views/golem_activity_views.xml deleted file mode 100644 index a04f96c..0000000 --- a/golem_activity_registration_payment/views/golem_activity_views.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - Activity Form adaptations - golem.activity - - - - - - - - - - diff --git a/golem_activity_registration_state/__manifest__.py b/golem_activity_registration_state/__manifest__.py index 5dbeaf7..97f6471 100644 --- a/golem_activity_registration_state/__manifest__.py +++ b/golem_activity_registration_state/__manifest__.py @@ -19,7 +19,7 @@ 'name': 'GOLEM Activity Session Member Registrations States', 'summary': 'GOLEM Activities Session Member Registration states', 'description': 'GOLEM Activities Session Member Registration states', - 'version': '10.0.2.0.0', + 'version': '10.0.2.1.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois', 'license': 'AGPL-3', @@ -27,6 +27,5 @@ 'installable': True, 'depends': ['golem_activity_registration', 'golem_payment'], 'data': ['views/golem_activity_registration_views.xml', - 'views/golem_member_views.xml', - 'views/golem_activity_views.xml'] + 'views/golem_member_views.xml'] } diff --git a/golem_activity_registration_state/i18n/fr.po b/golem_activity_registration_state/i18n/fr.po index ba9228b..9b72fbe 100644 --- a/golem_activity_registration_state/i18n/fr.po +++ b/golem_activity_registration_state/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-01 11:37+0000\n" -"PO-Revision-Date: 2018-08-01 13:43+0200\n" +"POT-Creation-Date: 2018-08-01 14:09+0000\n" +"PO-Revision-Date: 2018-08-01 16:13+0200\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,30 +26,34 @@ msgid "Activity id" msgstr "Activité liée" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Are you sure you want to remove this subscription ?" msgstr "Êtes-vous sûr de vouloir supprimer cette inscription ?" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state +msgid "By state" +msgstr "Par état" + +#. module: golem_activity_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Cancel" msgstr "Annuler" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Canceled" msgstr "Annulé" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Confirm" msgstr "Confirmer" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Confirmed" msgstr "Confirmé" @@ -61,6 +65,7 @@ msgstr "Nom affiché" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Draft" msgstr "Brouillon" @@ -156,14 +161,12 @@ msgid "Registration id" msgstr "Registration id" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Remove" msgstr "Supprimer" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Reset to draft" msgstr "Remettre en brouillon" @@ -184,8 +187,8 @@ msgid "Validate all draft registrations" msgstr "Valider toutes les inscriptions" #. module: golem_activity_registration_state -#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:101 -#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:114 +#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:79 +#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:92 #, python-format msgid "You can not confirm a canceled registration." msgstr "Vous ne pouvez pas confirmer une inscription qui a été annulée." diff --git a/golem_activity_registration_state/i18n/golem_activity_registration_state.pot b/golem_activity_registration_state/i18n/golem_activity_registration_state.pot index c3c40b6..d021a7c 100644 --- a/golem_activity_registration_state/i18n/golem_activity_registration_state.pot +++ b/golem_activity_registration_state/i18n/golem_activity_registration_state.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-01 11:37+0000\n" -"PO-Revision-Date: 2018-08-01 11:37+0000\n" +"POT-Creation-Date: 2018-08-01 14:09+0000\n" +"PO-Revision-Date: 2018-08-01 14:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,30 +26,34 @@ msgid "Activity id" msgstr "" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Are you sure you want to remove this subscription ?" msgstr "" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state +msgid "By state" +msgstr "" + +#. module: golem_activity_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Cancel" msgstr "" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Canceled" msgstr "" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Confirm" msgstr "" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Confirmed" msgstr "" @@ -61,6 +65,7 @@ msgstr "" #. module: golem_activity_registration_state #: selection:golem.activity.registration,state:0 +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_search_inherit_state msgid "Draft" msgstr "" @@ -156,14 +161,12 @@ msgid "Registration id" msgstr "" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Remove" msgstr "" #. module: golem_activity_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_form_inherit_registration_state -#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_member_form_inherit_registration_state +#: model:ir.ui.view,arch_db:golem_activity_registration_state.golem_activity_registration_tree_inherit_state msgid "Reset to draft" msgstr "" @@ -184,8 +187,8 @@ msgid "Validate all draft registrations" msgstr "" #. module: golem_activity_registration_state -#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:101 -#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:114 +#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:79 +#: code:addons/golem_activity_registration_state/models/golem_activity_registration.py:92 #, python-format msgid "You can not confirm a canceled registration." msgstr "" diff --git a/golem_activity_registration_state/views/golem_activity_registration_views.xml b/golem_activity_registration_state/views/golem_activity_registration_views.xml index fe8769b..e7305ed 100644 --- a/golem_activity_registration_state/views/golem_activity_registration_views.xml +++ b/golem_activity_registration_state/views/golem_activity_registration_views.xml @@ -18,6 +18,20 @@ along with this program. If not, see . + + + Activity Registration form adaptations + golem.activity.registration + + +
+ +
+ + + @@ -27,13 +41,50 @@ along with this program. If not, see . ref="golem_activity_registration.golem_activity_registration_tree" /> - red: state == 'canceled';darkgrey: state == 'draft'; + darkgrey: state == 'canceled';blue: state == 'confirmed'; + 0 - + +