From eb02e356d1d7ae8e560135a7d103ce7a8ef16729 Mon Sep 17 00:00:00 2001
From: Jes?s Mart?n Jim?nez <jesus@nan-tic.com>
Date: Tue, 23 Aug 2016 14:38:07 +0200
Subject: [PATCH] Fix type of invoice

---
 invoice.py                              | 13 +++++--------
 tests/scenario_invoice_intercompany.rst |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/invoice.py b/invoice.py
index 2389f88..511fc65 100644
--- a/invoice.py
+++ b/invoice.py
@@ -22,8 +22,7 @@ class Invoice:
             ('party', '=', Eval('party')),
             ],
         states={
-            'invisible': ~Eval('type', '').in_(
-                ['out_invoice', 'out_credit_note']),
+            'invisible': Eval('type', '') != 'out',
             'readonly': Eval('state') != 'draft',
             },
         depends=['type', 'state', 'party'])
@@ -37,7 +36,7 @@ class Invoice:
         cls._buttons.update({
                 'create_intercompany_invoices': {
                     'invisible': (~Eval('state').in_(['posted', 'paid'])
-                        | Eval('type').in_(['in_invoice', 'in_credit_note'])),
+                        | Eval('type') == 'in'),
                     },
                 })
 
@@ -144,7 +143,7 @@ class Invoice:
     def get_intercompany_invoice(self):
         pool = Pool()
         Party = pool.get('party.party')
-        if (self.type[:4] != 'out_' or not self.target_company
+        if (self.type != 'out' or not self.target_company
                 or self.intercompany_invoices):
             return
         transaction = Transaction()
@@ -193,12 +192,10 @@ class InvoiceLine:
         'Intercompany Account',
         domain=[
             If(Bool(Eval('_parent_invoice')),
-                If(Eval('_parent_invoice', {}).get('type').in_(['out_invoice',
-                    'out_credit_note']),
+                If(Eval('_parent_invoice', {}).get('type') == 'out',
                     ('kind', '=', 'expense'),
                     ('kind', '=', 'revenue')),
-                If(Eval('invoice_type').in_(['out_invoice',
-                            'out_credit_note']),
+                If(Eval('invoice_type') == 'out',
                     ('kind', '=', 'expense'),
                     ('kind', '=', 'revenue')))
             ],
diff --git a/tests/scenario_invoice_intercompany.rst b/tests/scenario_invoice_intercompany.rst
index ee2d681..51d014f 100644
--- a/tests/scenario_invoice_intercompany.rst
+++ b/tests/scenario_invoice_intercompany.rst
@@ -305,7 +305,7 @@ Check that the intercompany invoice had been created::
     >>> with config.set_context(company=target_company.id):
     ...      target_invoice, = Invoice.find([('company', '=', target_company.id)])
     ...      target_invoice.type
-    u'in_invoice'
+    u'in'
     >>> with config.set_context(company=target_company.id):
     ...      target_invoice.company == target_company
     True