diff --git a/golem_resource/__manifest__.py b/golem_resource/__manifest__.py index 273994b..e663f4a 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.3.0', + 'version': '10.0.1.4.0', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', diff --git a/golem_resource/views/golem_resource_views.xml b/golem_resource/views/golem_resource_views.xml index 20b9632..3fb8442 100644 --- a/golem_resource/views/golem_resource_views.xml +++ b/golem_resource/views/golem_resource_views.xml @@ -54,7 +54,7 @@ along with this program. If not, see . - + diff --git a/golem_resource/wizard/golem_reservation_rejection.py b/golem_resource/wizard/golem_reservation_rejection.py index c171966..7fdc781 100644 --- a/golem_resource/wizard/golem_reservation_rejection.py +++ b/golem_resource/wizard/golem_reservation_rejection.py @@ -28,9 +28,9 @@ class GolemReservationRejectionWizard(models.TransientModel): reason = fields.Text(required=True) @api.multi - def validate(self): + def reject(self): """ Sets reservation status to rejected and add reason """ self.ensure_one() rejection = self[0] - rejection.reservation_id.write({'status': 'rejected', + rejection.reservation_id.write({'state': 'rejected', 'rejection_reason': rejection.reason}) diff --git a/golem_resource/wizard/golem_reservation_rejection_views.xml b/golem_resource/wizard/golem_reservation_rejection_views.xml index 8cfef27..0bb4048 100644 --- a/golem_resource/wizard/golem_reservation_rejection_views.xml +++ b/golem_resource/wizard/golem_reservation_rejection_views.xml @@ -30,7 +30,7 @@ along with this program. If not, see .