[REF][I18N]GOLEM Resource Pack : small refactorings and updated translations

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',

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"
+"POT-Creation-Date: 2018-05-25 16:47+0000\n"
-"PO-Revision-Date: 2018-04-17 06:51+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"

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"
+"POT-Creation-Date: 2018-05-25 16:47+0000\n"
-"PO-Revision-Date: 2018-04-17 06:51+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"

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,
+                'context': {'default_pack_id': pack_id.id},
-                            'default_partner_id': pack_id.partner_id.id},
                 'view_mode': 'form',
                 'target': 'new'}
 

golem_resource_pack/views/golem_resource_pack_views.xml

@@ -67,9 +67,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
               </group>
               <group>
-              <button name="quick_reservation" type="object" string="Quick Reservation"
+                <button name="quick_reservation" type="object"
-                states="draft" class="oe_highlight"
+                  string="Quick Reservation" states="draft" class="oe_highlight" />
-                />
               </group>
               <group colspan="2" name="reservations">
                 <field name="reservation_ids" widget="many2many"

golem_resource_pack/wizard/golem_pack_quick_reservation.py

@@ -18,31 +18,42 @@
 
 """ GOLEM Pack Quick Reservation Wizard """
 
+from datetime import timedelta
 from odoo import models, fields, api
 
 class GolemPackQuickReservationWizard(models.TransientModel):
-    """GOLEM Pack Quick Reservation Wizard """
+    """ GOLEM Pack Quick Reservation Wizard """
-    _name = "golem.pack.quick.reservation.wizard"
+    _name = 'golem.pack.quick.reservation.wizard'
+    _description = 'GOLEM Pack Quick Reservation Wizard'
 
-    pack_id = fields.Many2one('golem.resource.pack', required=True)
+    pack_id = fields.Many2one('golem.resource.pack', required=True,
-    partner_id = fields.Many2one('res.partner', string='On behalf of', readonly=True)
+                              ondelete='cascade')
+    partner_id = fields.Many2one(related='pack_id.partner_id')
     resource_ids = fields.Many2many('golem.resource', string="Resource List")
 
     date_start = fields.Datetime('Start date', required=True)
     date_stop = fields.Datetime('Stop date', required=True)
 
+    @api.onchange('date_start')
+    def onchange_date_start(self):
+        """ Propose automatically stop hour after start hour had been filled """
+        for reservation in self:
+            if reservation.date_start:
+                start = fields.Datetime.from_string(reservation.date_start)
+                duration = timedelta(hours=1)
+                reservation.date_stop = start + duration
 
     @api.multi
     def create_reservations(self):
         """ Create a reservation for each resource """
         self.ensure_one()
         wizard = self[0]
-        data = []
         for resource in wizard.resource_ids:
-            reservation = {'user_id': self.env.user,
+            self.env['golem.resource.reservation'].create({
-                           'partner_id': wizard.partner_id,
+                'user_id': self.env.user.id,
-                           'resource_id': resource,
+                'partner_id': wizard.partner_id.id,
+                'resource_id': resource.id,
                 'date_start': wizard.date_start,
-                           'date_stop': wizard.date_stop}
+                'date_stop': wizard.date_stop,
-            data.append((0, 0, reservation))
+                'pack_id': wizard.pack_id.id
-        wizard.pack_id.reservation_ids = data
+            })

golem_resource_pack/wizard/golem_pack_quick_reservation_views.xml

@@ -29,14 +29,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             <group>
               <field name="pack_id" readonly="1" />
               <field name="partner_id" readonly="1"/>
-              <field name="resource_ids" />
+              <field name="resource_ids" options="{'no_create': True}" />
               <field name="date_start" />
               <field name="date_stop" />
             </group>
           </sheet>
           <footer>
-            <button name="create_reservations" string="Create Reservations" type="object"
+            <button name="create_reservations" string="Create Reservations"
-              class="oe_highlight" />
+              type="object" class="oe_highlight" />
             <button string="Cancel" class="oe_link" special="cancel" />
           </footer>
         </form>