From 2a89c926ecd7d60eaed65af9f7708780ea6982a8 Mon Sep 17 00:00:00 2001 From: qdp-odoo Date: Fri, 11 Dec 2015 15:29:24 +0100 Subject: [PATCH] [FIX] analytic, addentum to commit f6d6762dc7150076b5463b09480222db813b2cf1: added some domains to filter out archived analytic accounts --- addons/purchase/purchase.py | 2 +- addons/purchase_requisition/purchase_requisition.py | 4 ++-- addons/sale/sale.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 996bbc28090..c29cd37b478 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -460,7 +460,7 @@ class PurchaseOrderLine(models.Model): price_tax = fields.Monetary(compute='_compute_amount', string='Tax', store=True) order_id = fields.Many2one('purchase.order', string='Order Reference', select=True, required=True, ondelete='cascade') - account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account') + account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account', domain=[('account_type', '=', 'normal')]) company_id = fields.Many2one('res.company', related='order_id.company_id', string='Company', store=True, readonly=True) state = fields.Selection(related='order_id.state', stored=True) diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index 0a9a2034beb..b076a536857 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -41,7 +41,7 @@ class purchase_requisition(osv.osv): 'Status', track_visibility='onchange', required=True, copy=False), 'multiple_rfq_per_supplier': fields.boolean('Multiple RFQ per vendor'), - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('account_type', '=', 'normal')]), 'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', required=True), } @@ -314,7 +314,7 @@ class purchase_requisition_line(osv.osv): 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure')), 'requisition_id': fields.many2one('purchase.requisition', 'Call for Tenders', ondelete='cascade'), 'company_id': fields.related('requisition_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), - 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account',), + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('account_type', '=', 'normal')]), 'schedule_date': fields.date('Scheduled Date'), } diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 2a5bae6b068..1525429904a 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -116,7 +116,7 @@ class SaleOrder(models.Model): pricelist_id = fields.Many2one('product.pricelist', string='Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order.") currency_id = fields.Many2one("res.currency", related='pricelist_id.currency_id', string="Currency", readonly=True, required=True) - project_id = fields.Many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order.", copy=False) + project_id = fields.Many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order.", copy=False, domain=[('account_type', '=', 'normal')]) order_line = fields.One2many('sale.order.line', 'order_id', string='Order Lines', states={'cancel': [('readonly', True)], 'done': [('readonly', True)]}, copy=True)