From 0421f494bc294ca16c462229ba4d6860158d36e0 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Fri, 25 May 2018 18:52:26 +0200 Subject: [PATCH] [REF][I18N]GOLEM Resource Pack : small refactorings and updated translations --- golem_resource_pack/__manifest__.py | 2 +- golem_resource_pack/i18n/fr.po | 59 +++++++++++++++++-- .../i18n/golem_resource_pack.pot | 59 +++++++++++++++++-- .../models/golem_resource_pack.py | 5 +- .../views/golem_resource_pack_views.xml | 5 +- .../wizard/golem_pack_quick_reservation.py | 35 +++++++---- .../golem_pack_quick_reservation_views.xml | 6 +- 7 files changed, 141 insertions(+), 30 deletions(-) diff --git a/golem_resource_pack/__manifest__.py b/golem_resource_pack/__manifest__.py index f12326a..9e6ac44 100644 --- a/golem_resource_pack/__manifest__.py +++ b/golem_resource_pack/__manifest__.py @@ -20,7 +20,7 @@ 'name': 'GOLEM resources pack', 'summary': 'GOLEM resources pack', 'description': ''' GOLEM resources pack ''', - 'version': '10.0.0.0.7', + 'version': '10.0.0.1.0', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', diff --git a/golem_resource_pack/i18n/fr.po b/golem_resource_pack/i18n/fr.po index 9e37567..166e420 100644 --- a/golem_resource_pack/i18n/fr.po +++ b/golem_resource_pack/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-04-17 06:51+0000\n" -"PO-Revision-Date: 2018-04-17 06:51+0000\n" +"POT-Creation-Date: 2018-05-25 16:47+0000\n" +"PO-Revision-Date: 2018-05-25 16:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_rejection_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form msgid "Cancel" @@ -37,18 +38,26 @@ msgid "Confirmed" msgstr "Confirmé" #. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form +msgid "Create Reservations" +msgstr "Créer les réservations" + +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_create_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_create_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_create_uid msgid "Created by" msgstr "Créé par" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_create_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_create_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_create_date msgid "Created on" msgstr "Créé le" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_display_name #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_display_name #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_display_name msgid "Display Name" @@ -59,6 +68,11 @@ msgstr "Nom affiché" msgid "Draft" msgstr "Brouillon" +#. module: golem_resource_pack +#: model:ir.model,name:golem_resource_pack.model_golem_pack_quick_reservation_wizard +msgid "GOLEM Pack Quick Reservation Wizard" +msgstr "GOLEM Pack Quick Reservation Wizard" + #. module: golem_resource_pack #: model:ir.model,name:golem_resource_pack.model_golem_resource_reservation msgid "GOLEM Reservation Model" @@ -70,24 +84,28 @@ msgid "GOLEM Resource Pack Model" msgstr "GOLEM Resource Pack Model" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_id msgid "ID" msgstr "ID" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard___last_update #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard___last_update #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack___last_update msgid "Last Modified on" msgstr "Dernière Modification le" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_write_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_write_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_write_uid msgid "Last Updated by" msgstr "Dernière mise à jour par" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_write_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_write_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_write_date msgid "Last Updated on" @@ -109,6 +127,7 @@ msgid "Notes, optional subject for the reservation, reason" msgstr "Notes, subjet, motif, descriptif optionnel pour la réservation" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_partner_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_partner_id msgid "On behalf of" msgstr "Pour le compte de" @@ -119,22 +138,33 @@ msgid "Pack" msgstr "Lot" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_pack_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_pack_id msgid "Pack id" msgstr "Lot" #. module: golem_resource_pack -#: code:addons/golem_resource_pack/models/golem_resource_pack.py:126 +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:138 #, python-format msgid "Pack partner should be the same for all reservations" msgstr "Toutes les réservations devraient avoir le même compte" #. module: golem_resource_pack -#: code:addons/golem_resource_pack/models/golem_resource_pack.py:108 +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:120 #, python-format msgid "Please enter the rejection reason" msgstr "Merci de saisir le motif de refus" +#. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form +msgid "Quick Reservation" +msgstr "Réservations rapides" + +#. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form +msgid "Quick Reservations" +msgstr "Réservations rapides" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_reason msgid "Reason" @@ -178,16 +208,37 @@ msgstr "Nombre de réservations" msgid "Reservations" msgstr "Réservations" +#. module: golem_resource_pack +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:60 +#, python-format +msgid "Reservations Creation" +msgstr "Création de réservations" + +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_resource_ids +msgid "Resource List" +msgstr "Resource List" + #. module: golem_resource_pack #: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form msgid "Set to draft" msgstr "Brouillon" +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_date_start +msgid "Start date" +msgstr "Date de début" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_state msgid "State" msgstr "État" +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_date_stop +msgid "Stop date" +msgstr "Date de fin" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_user_id msgid "User" diff --git a/golem_resource_pack/i18n/golem_resource_pack.pot b/golem_resource_pack/i18n/golem_resource_pack.pot index b8d7023..93a6a25 100644 --- a/golem_resource_pack/i18n/golem_resource_pack.pot +++ b/golem_resource_pack/i18n/golem_resource_pack.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-17 06:51+0000\n" -"PO-Revision-Date: 2018-04-17 06:51+0000\n" +"POT-Creation-Date: 2018-05-25 16:47+0000\n" +"PO-Revision-Date: 2018-05-25 16:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,6 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_rejection_wizard_view_form #: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form msgid "Cancel" @@ -37,18 +38,26 @@ msgid "Confirmed" msgstr "" #. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form +msgid "Create Reservations" +msgstr "" + +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_create_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_create_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_create_uid msgid "Created by" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_create_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_create_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_create_date msgid "Created on" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_display_name #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_display_name #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_display_name msgid "Display Name" @@ -59,6 +68,11 @@ msgstr "" msgid "Draft" msgstr "" +#. module: golem_resource_pack +#: model:ir.model,name:golem_resource_pack.model_golem_pack_quick_reservation_wizard +msgid "GOLEM Pack Quick Reservation Wizard" +msgstr "" + #. module: golem_resource_pack #: model:ir.model,name:golem_resource_pack.model_golem_resource_reservation msgid "GOLEM Reservation Model" @@ -70,24 +84,28 @@ msgid "GOLEM Resource Pack Model" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_id msgid "ID" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard___last_update #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard___last_update #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack___last_update msgid "Last Modified on" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_write_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_write_uid #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_write_uid msgid "Last Updated by" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_write_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_write_date #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_write_date msgid "Last Updated on" @@ -109,6 +127,7 @@ msgid "Notes, optional subject for the reservation, reason" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_partner_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_partner_id msgid "On behalf of" msgstr "" @@ -119,22 +138,33 @@ msgid "Pack" msgstr "" #. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_pack_id #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_pack_id msgid "Pack id" msgstr "" #. module: golem_resource_pack -#: code:addons/golem_resource_pack/models/golem_resource_pack.py:126 +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:138 #, python-format msgid "Pack partner should be the same for all reservations" msgstr "" #. module: golem_resource_pack -#: code:addons/golem_resource_pack/models/golem_resource_pack.py:108 +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:120 #, python-format msgid "Please enter the rejection reason" msgstr "" +#. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form +msgid "Quick Reservation" +msgstr "" + +#. module: golem_resource_pack +#: model:ir.ui.view,arch_db:golem_resource_pack.golem_pack_quick_reservation_wizard_view_form +msgid "Quick Reservations" +msgstr "" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_rejection_wizard_reason msgid "Reason" @@ -178,16 +208,37 @@ msgstr "" msgid "Reservations" msgstr "" +#. module: golem_resource_pack +#: code:addons/golem_resource_pack/models/golem_resource_pack.py:60 +#, python-format +msgid "Reservations Creation" +msgstr "" + +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_resource_ids +msgid "Resource List" +msgstr "" + #. module: golem_resource_pack #: model:ir.ui.view,arch_db:golem_resource_pack.golem_resource_pack_view_form msgid "Set to draft" msgstr "" +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_date_start +msgid "Start date" +msgstr "" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_state msgid "State" msgstr "" +#. module: golem_resource_pack +#: model:ir.model.fields,field_description:golem_resource_pack.field_golem_pack_quick_reservation_wizard_date_stop +msgid "Stop date" +msgstr "" + #. module: golem_resource_pack #: model:ir.model.fields,field_description:golem_resource_pack.field_golem_resource_pack_user_id msgid "User" diff --git a/golem_resource_pack/models/golem_resource_pack.py b/golem_resource_pack/models/golem_resource_pack.py index 1b170d6..c88bc04 100644 --- a/golem_resource_pack/models/golem_resource_pack.py +++ b/golem_resource_pack/models/golem_resource_pack.py @@ -57,11 +57,10 @@ class GolemResourcePack(models.Model): """ Quick Reservation Creating""" self.ensure_one() pack_id = self[0] - return {'name' : _('Reservations Creating'), + return {'name' : _('Reservations Creation'), 'type' : 'ir.actions.act_window', 'res_model' : 'golem.pack.quick.reservation.wizard', - 'context': {'default_pack_id': pack_id.id, - 'default_partner_id': pack_id.partner_id.id}, + 'context': {'default_pack_id': pack_id.id}, 'view_mode': 'form', 'target': 'new'} diff --git a/golem_resource_pack/views/golem_resource_pack_views.xml b/golem_resource_pack/views/golem_resource_pack_views.xml index b3a38e6..d75233d 100644 --- a/golem_resource_pack/views/golem_resource_pack_views.xml +++ b/golem_resource_pack/views/golem_resource_pack_views.xml @@ -67,9 +67,8 @@ along with this program. If not, see . -