From cee1f0457d51de48987603131d41eab5ef810508 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 19 Aug 2014 09:48:05 +0200 Subject: [PATCH] [FIX] sale: define sale_note field before using it as a default value for sale.order When uninstalling/installing sale module, this can be problematic --- addons/sale/sale.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index f7875eb235d..8326fb4a1e5 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -28,6 +28,12 @@ from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FO import openerp.addons.decimal_precision as dp from openerp import workflow +class res_company(osv.Model): + _inherit = "res.company" + _columns = { + 'sale_note': fields.text('Default Terms and Conditions', translate=True, help="Default terms and conditions for quotations."), + } + class sale_order(osv.osv): _name = "sale.order" _inherit = ['mail.thread', 'ir.needaction_mixin'] @@ -992,12 +998,6 @@ class sale_order_line(osv.osv): raise osv.except_osv(_('Invalid Action!'), _('Cannot delete a sales order line which is in state \'%s\'.') %(rec.state,)) return super(sale_order_line, self).unlink(cr, uid, ids, context=context) -class res_company(osv.Model): - _inherit = "res.company" - _columns = { - 'sale_note': fields.text('Default Terms and Conditions', translate=True, help="Default terms and conditions for quotations."), - } - class mail_compose_message(osv.Model): _inherit = 'mail.compose.message'