From a17bb46b44051463e89a73ec8401766aa7067f52 Mon Sep 17 00:00:00 2001 From: Simon Lejeune Date: Wed, 23 Apr 2014 17:15:46 +0200 Subject: [PATCH] [FIX] Sale_layout: renamed 'layout category' as 'section', removed constraint bzr revid: sle@openerp.com-20140423151546-rd8freqn1ljf141k --- addons/sale_layout/models/sale_layout.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/addons/sale_layout/models/sale_layout.py b/addons/sale_layout/models/sale_layout.py index ac9d4241607..7047a63db3b 100644 --- a/addons/sale_layout/models/sale_layout.py +++ b/addons/sale_layout/models/sale_layout.py @@ -56,25 +56,6 @@ class SaleLayoutCategory(osv.Model): 'sequence': 10 } - # We want to forbid edit of a category if it is already linked to a report. - def _check(self, cr, uid, ids): - for cat in self.browse(cr, uid, ids): - invoice_obj = self.pool.get('account.invoice.line') - sale_obj = self.pool.get('sale.order.line') - ids = invoice_obj.search(cr, uid, [('sale_layout_cat_id', '=', cat.id)]) - ids += sale_obj.search(cr, uid, [('sale_layout_cat_id', '=', cat.id)]) - - if len(ids) > 0: - return False - - return True - - _constraints = [( - _check, - 'This category could not be modified nor deleted because it is still used in an invoice or' - ' a sale report.', ['name'] - )] - class AccountInvoice(osv.Model): _inherit = 'account.invoice' @@ -98,7 +79,7 @@ class AccountInvoiceLine(osv.Model): _inherit = 'account.invoice.line' _columns = { 'sale_layout_cat_id': fields.many2one('sale_layout.category', - 'Layout Category'), + string='Section'), 'categ_sequence': fields.related('sale_layout_cat_id', 'sequence', type='integer', string='Layout Sequence', store=True) @@ -128,7 +109,7 @@ class SaleOrderLine(osv.Model): _inherit = 'sale.order.line' _columns = { 'sale_layout_cat_id': fields.many2one('sale_layout.category', - 'Layout Category'), + string='Section'), 'categ_sequence': fields.related('sale_layout_cat_id', 'sequence', type='integer', string='Layout Sequence', store=True)