From 9694112ddd9702364dd43da441c994c22ab3ea0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 3 Nov 2008 15:42:37 +0100 Subject: [PATCH] Use Date for effective_date and planned_date instead of DateTime --- move.py | 4 ++-- packing.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/move.py b/move.py index 8f3650138c..98b4c133b4 100644 --- a/move.py +++ b/move.py @@ -40,8 +40,8 @@ class Move(OSV): readonly=True, select=1) packing_internal = fields.Many2One('stock.packing.internal', 'Internal Packing', readonly=True, select=1) - planned_date = fields.Date("Planned Date", states=STATES) - effective_date = fields.Date("Effective Date", readonly=True) + planned_date = fields.Date("Planned Date", states=STATES, select=2) + effective_date = fields.Date("Effective Date", readonly=True, select=2) state = fields.Selection([ ('draft', 'Draft'), ('assigned', 'Assigned'), diff --git a/packing.py b/packing.py index 54923390f6..b545c01971 100644 --- a/packing.py +++ b/packing.py @@ -17,8 +17,8 @@ class PackingIn(OSV): _description = __doc__ _rec_name = 'code' - effective_date = fields.DateTime('Effective Date', readonly=True) - planned_date = fields.DateTime( + effective_date = fields.Date('Effective Date', readonly=True) + planned_date = fields.Date( 'Planned Date', states={'readonly': "state != 'draft'",}) reference = fields.Char( "Reference", size=None, select=1, @@ -186,7 +186,7 @@ class PackingIn(OSV): {'state': 'done'}, context) self.write(cursor, user, packing_id,{ 'state': 'done', - 'effective_date': datetime.datetime.now(), + 'effective_date': datetime.date.today(), }, context=context) def set_state_cancel(self, cursor, user, packing_id, context=None): @@ -459,7 +459,7 @@ class PackingOut(OSV): {'state': 'done'}, context=context) self.write(cursor, user, packing_id, { 'state':'done', - 'effective_date': datetime.datetime.now(), + 'effective_date': datetime.date.today(), }, context=context) def set_state_packed(self, cursor, user, packing_id, context=None): @@ -655,8 +655,8 @@ class PackingInternal(OSV): _description = __doc__ _rec_name = 'code' - effective_date =fields.DateTime('Effective Date', readonly=True) - planned_date = fields.DateTime( + effective_date =fields.Date('Effective Date', readonly=True) + planned_date = fields.Date( 'Planned Date', states={'readonly': "state != 'draft'",}) code = fields.Char("Code", size=None, select=1, readonly=True) reference = fields.Char( @@ -742,7 +742,7 @@ class PackingInternal(OSV): context=context) self.write( cursor, user, packing_id, {'state':'done', - 'effective_date': datetime.datetime.now()}, + 'effective_date': datetime.date.today()}, context=context) def set_state_cancel(self, cursor, user, packing_id, context=None):