From 3fbb3fe187a2a6c3d49fe18f0248500c4b06067c Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Sun, 18 Feb 2018 16:42:29 +0100
Subject: [PATCH] [TYPO]GOLEM Resource : better meaning for reject/validate

---
 golem_resource/__manifest__.py                              | 2 +-
 golem_resource/views/golem_resource_views.xml               | 2 +-
 golem_resource/wizard/golem_reservation_rejection.py        | 4 ++--
 golem_resource/wizard/golem_reservation_rejection_views.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

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 <http://www.gnu.org/licenses/>.
               <group>
                   <field name="name" />
                   <field name="type_id" />
-                  <field name="product_tmpl_id" options="{'no_create': true}" />
+                  <field name="product_tmpl_id" options="{'no_create': True}" />
               </group>
               <group>
                   <field name="validation_required" />
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 <http://www.gnu.org/licenses/>.
             <field name="reason" />
           </group>
           <footer>
-            <button name="validate" string="Validate" type="object"
+            <button name="reject" string="Reject" type="object"
               class="oe_highlight" />
             <button string="Cancel" class="oe_link" special="cancel" />
           </footer>