From fb202e8ec142dec6247d008c4b42f6fef51d5d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sun, 20 Mar 2016 22:59:32 +0100
Subject: [PATCH] Merge invoice and credit note

issue5225
review18921002
---
 sale.py                                  | 4 ++--
 tests/scenario_sale_invoice_grouping.rst | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sale.py b/sale.py
index 09ab1ab255..82c84d9025 100644
--- a/sale.py
+++ b/sale.py
@@ -37,9 +37,9 @@ class Sale:
                 )
         return invoice_domain
 
-    def _get_invoice_sale(self, invoice_type):
+    def _get_invoice_sale(self):
         Invoice = Pool().get('account.invoice')
-        invoice = super(Sale, self)._get_invoice_sale(invoice_type)
+        invoice = super(Sale, self)._get_invoice_sale()
         if self.invoice_grouping_method:
             domain = self._get_grouped_invoice_domain(invoice)
             order = self._get_grouped_invoice_order()
diff --git a/tests/scenario_sale_invoice_grouping.rst b/tests/scenario_sale_invoice_grouping.rst
index 74bb78b632..ee89562919 100644
--- a/tests/scenario_sale_invoice_grouping.rst
+++ b/tests/scenario_sale_invoice_grouping.rst
@@ -144,7 +144,7 @@ Check the invoices::
     2
     >>> invoice = invoices[0]
     >>> invoice.type
-    u'out_invoice'
+    u'out'
     >>> invoice.click('post')
     >>> invoice.state
     u'posted'