diff --git a/golem_resource_pack/__manifest__.py b/golem_resource_pack/__manifest__.py index 25d251c..f12326a 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.6', + 'version': '10.0.0.0.7', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', diff --git a/golem_resource_pack/models/golem_resource_pack.py b/golem_resource_pack/models/golem_resource_pack.py index f997ac4..1b170d6 100644 --- a/golem_resource_pack/models/golem_resource_pack.py +++ b/golem_resource_pack/models/golem_resource_pack.py @@ -60,7 +60,8 @@ class GolemResourcePack(models.Model): return {'name' : _('Reservations Creating'), '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'} diff --git a/golem_resource_pack/wizard/golem_pack_quick_reservation.py b/golem_resource_pack/wizard/golem_pack_quick_reservation.py index e3e581f..7aca024 100644 --- a/golem_resource_pack/wizard/golem_pack_quick_reservation.py +++ b/golem_resource_pack/wizard/golem_pack_quick_reservation.py @@ -25,6 +25,7 @@ class GolemPackQuickReservationWizard(models.TransientModel): _name = "golem.pack.quick.reservation.wizard" pack_id = fields.Many2one('golem.resource.pack', required=True) + partner_id = fields.Many2one('res.partner', string='On behalf of', readonly=True) resource_ids = fields.Many2many('golem.resource', string="Resource List") date_start = fields.Datetime('Start date', required=True) @@ -34,10 +35,14 @@ class GolemPackQuickReservationWizard(models.TransientModel): @api.multi def create_reservations(self): """ Create a reservation for each resource """ - pass - """ self.ensure_one() - rdata = {'state': 'rejected', - 'rejection_reason': self[0].reason} - self[0].pack_id.reservation_ids.filtered(lambda r: r.state == 'confirmed').write(rdata) - self[0].pack_id.rejection_reason = self[0].reason""" + wizard = self[0] + data = [] + for resource in wizard.resource_ids: + reservation = {'user_id': self.env.user, + 'partner_id': wizard.partner_id, + 'resource_id': resource, + 'date_start': wizard.date_start, + 'date_stop': wizard.date_stop} + data.append((0, 0, reservation)) + wizard.pack_id.reservation_ids = data diff --git a/golem_resource_pack/wizard/golem_pack_quick_reservation_views.xml b/golem_resource_pack/wizard/golem_pack_quick_reservation_views.xml index a164245..70d564e 100644 --- a/golem_resource_pack/wizard/golem_pack_quick_reservation_views.xml +++ b/golem_resource_pack/wizard/golem_pack_quick_reservation_views.xml @@ -28,6 +28,7 @@ along with this program. If not, see . +