From b105d877459897a138101e3fd01e0a85ec1fb192 Mon Sep 17 00:00:00 2001 From: eloyoussef Date: Mon, 16 Apr 2018 18:04:05 +0200 Subject: [PATCH] code refactoring --- golem_resource_pack/models/golem_resource_pack.py | 4 +++- golem_resource_pack/models/golem_resource_reservation.py | 5 +---- golem_resource_pack/tests/test_golem_resource_pack.py | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/golem_resource_pack/models/golem_resource_pack.py b/golem_resource_pack/models/golem_resource_pack.py index fa176e5..ad51f7e 100644 --- a/golem_resource_pack/models/golem_resource_pack.py +++ b/golem_resource_pack/models/golem_resource_pack.py @@ -35,7 +35,7 @@ class GolemResourcePack(models.Model): False : [('readonly', False)]}) note = fields.Text(help='Notes, optional subject for the reservation, reason', - track_visibility='onchange',readonly=True, + track_visibility='onchange', readonly=True, states={'draft': [('readonly', False)], False : [('readonly', False)]}) @@ -59,6 +59,7 @@ class GolemResourcePack(models.Model): @api.multi @api.constrains('partner_id') def set_reservation_partner(self): + """ Set reservation partner """ for pack in self: pack.reservation_ids.write({'partner_id': pack.partner_id.id}) @@ -114,6 +115,7 @@ class GolemResourcePack(models.Model): @api.multi @api.constrains('reservation_ids') def check_reservation_partner(self): + """ Check reservation partner """ for pack in self: if len(filter(lambda x: x.partner_id == pack.partner_id, pack.reservation_ids)) < len(pack.reservation_ids): raise ValidationError(_('Pack client should be the same for all reservations')) diff --git a/golem_resource_pack/models/golem_resource_reservation.py b/golem_resource_pack/models/golem_resource_reservation.py index bf4c7c6..2644175 100644 --- a/golem_resource_pack/models/golem_resource_reservation.py +++ b/golem_resource_pack/models/golem_resource_reservation.py @@ -18,10 +18,7 @@ """ GOLEM Resource Reservation """ -from math import modf -from datetime import timedelta -from odoo import models, fields, api, _ -from odoo.exceptions import ValidationError +from odoo import models, fields class GolemResourceReservation(models.Model): diff --git a/golem_resource_pack/tests/test_golem_resource_pack.py b/golem_resource_pack/tests/test_golem_resource_pack.py index e824749..1cc5274 100644 --- a/golem_resource_pack/tests/test_golem_resource_pack.py +++ b/golem_resource_pack/tests/test_golem_resource_pack.py @@ -20,7 +20,6 @@ import logging from odoo.tests.common import TransactionCase -from odoo.exceptions import ValidationError _LOGGER = logging.getLogger(__name__) @@ -102,7 +101,7 @@ class TestGolemResourcePack(TransactionCase): pack.reservation_ids[0].state_confirm() self.assertEqual(pack.reservation_ids[0].state, "validated") self.assertEqual(pack.state, "validated") - pack.reservation_ids=[(5,0,0)] + pack.reservation_ids = [(5, 0, 0)] self.assertFalse(pack.reservation_ids) self.assertEqual(pack.reservation_count, 0)