diff --git a/golem_resource/__manifest__.py b/golem_resource/__manifest__.py index cda9627..c0457f6 100644 --- a/golem_resource/__manifest__.py +++ b/golem_resource/__manifest__.py @@ -20,7 +20,7 @@ 'name': 'GOLEM non-profit resources', 'summary': 'GOLEM resources management', 'description': ''' GOLEM resources management ''', - 'version': '10.0.1.6.2', + 'version': '10.0.1.7.0', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', diff --git a/golem_resource/i18n/fr.po b/golem_resource/i18n/fr.po index 3b384a7..642a16c 100644 --- a/golem_resource/i18n/fr.po +++ b/golem_resource/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-02-19 08:39+0000\n" -"PO-Revision-Date: 2018-02-19 08:39+0000\n" +"POT-Creation-Date: 2018-03-09 07:42+0000\n" +"PO-Revision-Date: 2018-03-09 07:42+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -138,7 +138,7 @@ msgid "End availibility should be after than start availibility" msgstr "La fin de disponibilité ne peut pas être après le début" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:107 +#: code:addons/golem_resource/models/golem_resource_reservation.py:109 #: code:addons/golem_resource/models/golem_resource_timetable.py:55 #, python-format msgid "End time should be after than start time" @@ -242,29 +242,40 @@ msgid "Name" msgstr "Nom" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:195 +#: code:addons/golem_resource/models/golem_resource_reservation.py:197 #, python-format msgid "Not allowed, the resource is already taken during this period : from {} to {} this day, please choose another périod before confirming." msgstr "Interdit : la ressource est déjà réservée durant cette période : de {} à {} ce jour, merci de choisir une autre période avant de confirmer." #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:177 +#: code:addons/golem_resource/models/golem_resource_reservation.py:179 #, python-format msgid "Not allowed, the resource is not available during this period, please choose another time before confirming." msgstr "Interdit : la ressource n'est pas disponible durant cette période, merci de choisir d'autres horaires avant de confirmer à nouveau." #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:164 +#: code:addons/golem_resource/models/golem_resource_reservation.py:166 #, python-format msgid "Not allowed, the resource is not available in this period, please choose another périod before confirming" msgstr "Interdit : la ressource n'est pas disponible durant cette période, merci de choisir d'autres dates avant de confirmer à nouveau." #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:182 +#: code:addons/golem_resource/models/golem_resource_reservation.py:184 #, python-format msgid "Not allowed, the resource is not available this day. Please choose another date." msgstr "Interdit : la ressource n'est pas disponible ce jour de la semaine. Merci de choisir un autre jour." +#. module: golem_resource +#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_note +msgid "Note" +msgstr "Note" + +#. module: golem_resource +#: model:ir.model.fields,help:golem_resource.field_golem_resource_reservation_note +#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_form +msgid "Notes, optional subject for the reservation, reason" +msgstr "Notes, subjet, motif, descriptif optionnel pour la réservation" + #. module: golem_resource #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_partner_id msgid "On behalf of" @@ -276,7 +287,7 @@ msgid "Partner" msgstr "Partenaire" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:139 +#: code:addons/golem_resource/models/golem_resource_reservation.py:141 #, python-format msgid "Please enter the rejection reason" msgstr "Merci de saisir le motif du refus" @@ -338,7 +349,7 @@ msgid "Resource" msgstr "Ressource" #. module: golem_resource -#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4449 +#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4023 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_name msgid "Resource Type" msgstr "Type de ressource" @@ -359,7 +370,7 @@ msgstr "Le type de ressource doit être unique." #: model:ir.ui.menu,name:golem_resource.golem_resource_menu #: model:ir.ui.menu,name:golem_resource.resource_list_menu msgid "Resources" -msgstr "Resources" +msgstr "Ressources" #. module: golem_resource #: code:addons/golem_resource/models/golem_resource_timetable.py:38 @@ -477,7 +488,7 @@ msgid "Without validation" msgstr "Sans validation" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:153 +#: code:addons/golem_resource/models/golem_resource_reservation.py:155 #, python-format msgid "You do not have permissions to validate or reject a reservation." msgstr "Vous n'avez pas les autorisations nécessaires pour valider ou rejeter une réservation." diff --git a/golem_resource/i18n/golem_resource.pot b/golem_resource/i18n/golem_resource.pot index 685e04d..84c7f29 100644 --- a/golem_resource/i18n/golem_resource.pot +++ b/golem_resource/i18n/golem_resource.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-19 08:39+0000\n" -"PO-Revision-Date: 2018-02-19 08:39+0000\n" +"POT-Creation-Date: 2018-03-09 07:42+0000\n" +"PO-Revision-Date: 2018-03-09 07:42+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -138,7 +138,7 @@ msgid "End availibility should be after than start availibility" msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:107 +#: code:addons/golem_resource/models/golem_resource_reservation.py:109 #: code:addons/golem_resource/models/golem_resource_timetable.py:55 #, python-format msgid "End time should be after than start time" @@ -242,29 +242,40 @@ msgid "Name" msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:195 +#: code:addons/golem_resource/models/golem_resource_reservation.py:197 #, python-format msgid "Not allowed, the resource is already taken during this period : from {} to {} this day, please choose another périod before confirming." msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:177 +#: code:addons/golem_resource/models/golem_resource_reservation.py:179 #, python-format msgid "Not allowed, the resource is not available during this period, please choose another time before confirming." msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:164 +#: code:addons/golem_resource/models/golem_resource_reservation.py:166 #, python-format msgid "Not allowed, the resource is not available in this period, please choose another périod before confirming" msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:182 +#: code:addons/golem_resource/models/golem_resource_reservation.py:184 #, python-format msgid "Not allowed, the resource is not available this day. Please choose another date." msgstr "" +#. module: golem_resource +#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_note +msgid "Note" +msgstr "" + +#. module: golem_resource +#: model:ir.model.fields,help:golem_resource.field_golem_resource_reservation_note +#: model:ir.ui.view,arch_db:golem_resource.golem_resource_reservation_view_form +msgid "Notes, optional subject for the reservation, reason" +msgstr "" + #. module: golem_resource #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_reservation_partner_id msgid "On behalf of" @@ -276,7 +287,7 @@ msgid "Partner" msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:139 +#: code:addons/golem_resource/models/golem_resource_reservation.py:141 #, python-format msgid "Please enter the rejection reason" msgstr "" @@ -338,7 +349,7 @@ msgid "Resource" msgstr "" #. module: golem_resource -#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4449 +#: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_id_4023 #: model:ir.model.fields,field_description:golem_resource.field_golem_resource_type_name msgid "Resource Type" msgstr "" @@ -477,7 +488,7 @@ msgid "Without validation" msgstr "" #. module: golem_resource -#: code:addons/golem_resource/models/golem_resource_reservation.py:153 +#: code:addons/golem_resource/models/golem_resource_reservation.py:155 #, python-format msgid "You do not have permissions to validate or reject a reservation." msgstr "" diff --git a/golem_resource/models/golem_resource_reservation.py b/golem_resource/models/golem_resource_reservation.py index f654d70..2a09802 100644 --- a/golem_resource/models/golem_resource_reservation.py +++ b/golem_resource/models/golem_resource_reservation.py @@ -49,6 +49,8 @@ class GolemResourceReservation(models.Model): resource_avaibility_stop = fields.Date(related='resource_id.avaibility_stop') resource_timetable_ids = fields.One2many(related='resource_id.timetable_ids') + note = fields.Text(help='Notes, optional subject for the reservation, reason') + user_id = fields.Many2one('res.users', required=True, index=True, readonly=True, string='User', default=lambda self: self.env.user, states={'draft': [('readonly', False)]}) diff --git a/golem_resource/views/golem_resource_reservation_views.xml b/golem_resource/views/golem_resource_reservation_views.xml index 0ed86a1..a161e26 100644 --- a/golem_resource/views/golem_resource_reservation_views.xml +++ b/golem_resource/views/golem_resource_reservation_views.xml @@ -85,6 +85,8 @@ along with this program. If not, see . +