From c9f8528c1b00a0dbe68bab788d8d5fb05bad0373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 23 Dec 2012 22:33:40 +0100 Subject: [PATCH] Allow delivery_time to be None review598007 --- CHANGELOG | 2 ++ purchase.py | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 99fd87c7dd..1a8404bd0b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +* Allow no delivery time on product supplier + Version 2.6.0 - 2012-10-22 * Bug fixes (see mercurial logs for details) * Manage negative amount in purchase diff --git a/purchase.py b/purchase.py index 676de142fc..61cb882610 100644 --- a/purchase.py +++ b/purchase.py @@ -1435,8 +1435,7 @@ class ProductSupplier(ModelSQL, ModelView): ('id', If(Eval('context', {}).contains('company'), '=', '!='), Eval('context', {}).get('company', 0)), ]) - delivery_time = fields.Integer('Delivery Time', required=True, - help="In number of days") + delivery_time = fields.Integer('Delivery Time', help="In number of days") currency = fields.Many2One('currency.currency', 'Currency', required=True, ondelete='RESTRICT') @@ -1477,6 +1476,9 @@ class ProductSupplier(ModelSQL, ModelView): # Migration from 2.4: drop required on sequence table.not_null_action('sequence', action='remove') + # Migration from 2.6: drop required on delivery_time + table.not_null_action('delivery_time', action='remove') + @staticmethod def default_company(): return Transaction().context.get('company') @@ -1511,7 +1513,7 @@ class ProductSupplier(ModelSQL, ModelView): if not date: date = Date.today() - if not self.delivery_time: + if self.delivery_time is None: return datetime.date.max return date + datetime.timedelta(self.delivery_time) @@ -1521,7 +1523,7 @@ class ProductSupplier(ModelSQL, ModelView): ''' Date = Pool().get('ir.date') - if not self.delivery_time: + if self.delivery_time is None: return Date.today() return date - datetime.timedelta(self.delivery_time)