From b7a1b9313bdacb69a0d2f2101ce68dcf2e64234b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 2 Mar 2015 23:37:40 +0100
Subject: [PATCH] Allow to easily extend account domain of invoice line

issue4598
review15061002
---
 invoice.py | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/invoice.py b/invoice.py
index ea81485090..ec0ca127c7 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1418,18 +1418,6 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         fields.Many2One('product.uom.category', 'Product Uom Category'),
         'on_change_with_product_uom_category')
     account = fields.Many2One('account.account', 'Account',
-        domain=[
-            ('company', '=', Eval('company', -1)),
-            If(Bool(Eval('_parent_invoice')),
-                If(Eval('_parent_invoice', {}).get('type').in_(['out_invoice',
-                    'out_credit_note']),
-                    ('kind', '=', 'revenue'),
-                    ('kind', '=', 'expense')),
-                If(Eval('invoice_type').in_(['out_invoice',
-                            'out_credit_note']),
-                    ('kind', '=', 'revenue'),
-                    ('kind', '=', 'expense')))
-            ],
         states={
             'invisible': Eval('type') != 'line',
             'required': Eval('type') == 'line',
@@ -1503,6 +1491,38 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
                     'uses the same account (%(account)s).'),
                 })
 
+        # Set account domain dynamically for kind
+        cls.account.domain = [
+            ('company', '=', Eval('company', -1)),
+            If(Bool(Eval('_parent_invoice')),
+                If(Eval('_parent_invoice', {}).get('type').in_(
+                        ['out_invoice', 'out_credit_note']),
+                    ('kind', 'in', cls._account_domain('out')),
+                    If(Eval('_parent_invoice', {}).get('type').in_(
+                            ['in_invoice', 'in_credit_note']),
+                        ('kind', 'in', cls._account_domain('in')),
+                        ('kind', 'in',
+                            cls._account_domain('out')
+                            + cls._account_domain('in')))),
+                If(Eval('invoice_type').in_(
+                        ['out_invoice', 'out_credit_note']),
+                    ('kind', 'in', cls._account_domain('out')),
+                    If(Eval('invoice_type').in_(
+                            ['in_invoice', 'in_credit_note']),
+                        ('kind', 'in', cls._account_domain('in')),
+                        ('kind', 'in',
+                            cls._account_domain('out')
+                            + cls._account_domain('in'))))),
+            ]
+        cls.account.depends += ['company', 'invoice_type']
+
+    @staticmethod
+    def _account_domain(type_):
+        if type_ == 'out':
+            return ['revenue']
+        elif type_ == 'in':
+            return ['expense']
+
     @classmethod
     def __register__(cls, module_name):
         pool = Pool()