From c368f7dd21f1ff8ba2e0a2f87d84a87392b8072d Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 1 Sep 2016 16:29:49 +0200 Subject: [PATCH] [FIX] base,hr_expense: unrequire computed field Which does not make sense. it's the computation that should set the value. Also the default is no longer needed. --- addons/hr_expense/models/hr_expense.py | 2 +- openerp/addons/base/ir/ir_sequence.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py index b492f105319..db654367bc7 100644 --- a/addons/hr_expense/models/hr_expense.py +++ b/addons/hr_expense/models/hr_expense.py @@ -39,7 +39,7 @@ class HrExpense(models.Model): ('reported', 'Reported'), ('done', 'Posted'), ('refused', 'Refused') - ], compute='_compute_state', string='Status', copy=False, default="draft", index=True, readonly=True, required=True, store=True, + ], compute='_compute_state', string='Status', copy=False, index=True, readonly=True, store=True, help="Status of the expense.") sheet_id = fields.Many2one('hr.expense.sheet', string="Expense Report", readonly=True, copy=False) reference = fields.Char(string="Bill Reference") diff --git a/openerp/addons/base/ir/ir_sequence.py b/openerp/addons/base/ir/ir_sequence.py index 28dd8cb1857..cb67a6f7fc9 100644 --- a/openerp/addons/base/ir/ir_sequence.py +++ b/openerp/addons/base/ir/ir_sequence.py @@ -99,7 +99,7 @@ class IrSequence(models.Model): suffix = fields.Char(help="Suffix value of the record for the sequence") number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence") number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual', - required=True, string='Next Number', default=1, + string='Next Number', help="Next number that will be used. This number can be incremented " "frequently so the displayed value might already be obsolete") number_increment = fields.Integer(string='Step', required=True, default=1, @@ -310,7 +310,7 @@ class IrSequenceDateRange(models.Model): sequence_id = fields.Many2one("ir.sequence", string='Main Sequence', required=True, ondelete='cascade') number_next = fields.Integer(string='Next Number', required=True, default=1, help="Next number of this sequence") number_next_actual = fields.Integer(compute='_get_number_next_actual', inverse='_set_number_next_actual', - required=True, string='Next Number', default=1, + string='Next Number', help="Next number that will be used. This number can be incremented " "frequently so the displayed value might already be obsolete")