From 265388f1d2750d6ad2eb2f7c61faf2f6007eed95 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Fri, 12 Jan 2018 23:50:18 +0100
Subject: [PATCH 1/8] Change the method called in the view

---
 .../views/account_analytic_account_view.xml                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contract_sale_generation/views/account_analytic_account_view.xml b/contract_sale_generation/views/account_analytic_account_view.xml
index 9157863392..47a4ccec85 100644
--- a/contract_sale_generation/views/account_analytic_account_view.xml
+++ b/contract_sale_generation/views/account_analytic_account_view.xml
@@ -14,7 +14,7 @@
                 <attribute name="attrs">{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','invoice')]}</attribute>
             </xpath> 
             <xpath expr="//button[@name='recurring_create_invoice']" position="before">
-                <button name="recurring_create_invoice"
+                <button name="recurring_create_sale"
                             type="object"
                             attrs="{'invisible': ['|',('recurring_invoices','!=',True),('type','!=','sale')]}"
                             string="Create sales"

From cc5a10f1b5f6241f0cb0c4e95e72f65a67217e13 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Fri, 12 Jan 2018 23:51:38 +0100
Subject: [PATCH 2/8] Complete the create_invoice method

---
 contract_sale_generation/models/account_analytic_account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py
index 1079d3b8e9..dcff276cf7 100644
--- a/contract_sale_generation/models/account_analytic_account.py
+++ b/contract_sale_generation/models/account_analytic_account.py
@@ -70,7 +70,7 @@ def _create_invoice(self):
         if self.type == 'invoice':
             return super(AccountAnalyticAccount, self)._create_invoice()
         else:
-            return self.env['account.invoice']
+            return self.env['account.invoice']._create_sale()
 
     @api.multi
     def _create_sale(self):

From ea6c907f5aaaca28f161bcb2523b435ebbd9ee93 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Fri, 12 Jan 2018 23:51:52 +0100
Subject: [PATCH 3/8] Bump version + authoring

---
 contract_sale_generation/README.rst      | 1 +
 contract_sale_generation/__manifest__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contract_sale_generation/README.rst b/contract_sale_generation/README.rst
index dda5002294..e7ccfec97c 100644
--- a/contract_sale_generation/README.rst
+++ b/contract_sale_generation/README.rst
@@ -40,6 +40,7 @@ Contributors
 ------------
 
 * Angel Moya <angel.moya@pesol.es>
+* Florent THOMAS <florent.thomas@mind-and-go.com>
 
 Maintainer
 ----------
diff --git a/contract_sale_generation/__manifest__.py b/contract_sale_generation/__manifest__.py
index 285b301342..f20c1a7aa9 100644
--- a/contract_sale_generation/__manifest__.py
+++ b/contract_sale_generation/__manifest__.py
@@ -6,7 +6,7 @@
 
 {
     'name': 'Contracts Management - Recurring Sales',
-    'version': '10.0.2.0.0',
+    'version': '10.0.3.0.0',
     'category': 'Contract Management',
     'license': 'AGPL-3',
     'author': "PESOL, "

From 078b7ccf7c1589df5a88ffffcedc903550d7d448 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Sat, 13 Jan 2018 17:13:43 +0100
Subject: [PATCH 4/8] Correct bad call of method Small Documentation

---
 .../models/account_analytic_account.py               | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py
index dcff276cf7..99cfed7697 100644
--- a/contract_sale_generation/models/account_analytic_account.py
+++ b/contract_sale_generation/models/account_analytic_account.py
@@ -66,14 +66,24 @@ def _prepare_sale(self):
 
     @api.multi
     def _create_invoice(self):
+        """ 
+        Create invoices
+        @param None
+        @return: MUST return an invoice recordset
+        """
         self.ensure_one()
         if self.type == 'invoice':
             return super(AccountAnalyticAccount, self)._create_invoice()
         else:
-            return self.env['account.invoice']._create_sale()
+            return self.env['account.invoice']
 
     @api.multi
     def _create_sale(self):
+        """ 
+        Create Sale orders
+        @param None
+        @return: MUST return a sale.order recordset
+        """
         self.ensure_one()
         if self.type == 'sale':
             sale_vals = self._prepare_sale()

From 901579cd59cd3a3d25b8988053a25c70823a4ea7 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Mon, 15 Jan 2018 21:57:29 +0100
Subject: [PATCH 5/8] Add super call in python test

---
 product_contract/tests/test_sale_order.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/product_contract/tests/test_sale_order.py b/product_contract/tests/test_sale_order.py
index 98b174ff53..61f33858c2 100644
--- a/product_contract/tests/test_sale_order.py
+++ b/product_contract/tests/test_sale_order.py
@@ -24,6 +24,7 @@ def tearDown(self):
         self.env['account.analytic.account']._revert_method(
             'create',
         )
+        super(TestSaleOrder, self).tearDown()
 
     def test_action_done(self):
         """ It should create a contract when the sale for a contract is set

From 7a4b4c17fb806c412eaf1b8110cdb7baba0909ed Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Wed, 17 Jan 2018 09:42:48 +0100
Subject: [PATCH 6/8] Fix Pylint trailing whitespace

---
 contract_sale_generation/models/account_analytic_account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py
index 99cfed7697..884a8ea6fa 100644
--- a/contract_sale_generation/models/account_analytic_account.py
+++ b/contract_sale_generation/models/account_analytic_account.py
@@ -66,7 +66,7 @@ def _prepare_sale(self):
 
     @api.multi
     def _create_invoice(self):
-        """ 
+        """
         Create invoices
         @param None
         @return: MUST return an invoice recordset
@@ -79,7 +79,7 @@ def _create_invoice(self):
 
     @api.multi
     def _create_sale(self):
-        """ 
+        """
         Create Sale orders
         @param None
         @return: MUST return a sale.order recordset

From 76bb38f8f855a0f1208a8e6e04874819e3db2401 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Sat, 20 Jan 2018 19:05:58 +0100
Subject: [PATCH 7/8] [IMP]Comments and doc

---
 contract_sale_generation/models/account_analytic_account.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py
index 884a8ea6fa..a9ecc2964c 100644
--- a/contract_sale_generation/models/account_analytic_account.py
+++ b/contract_sale_generation/models/account_analytic_account.py
@@ -68,7 +68,7 @@ def _prepare_sale(self):
     def _create_invoice(self):
         """
         Create invoices
-        @param None
+        @param self: single record of account.invoice
         @return: MUST return an invoice recordset
         """
         self.ensure_one()
@@ -81,7 +81,7 @@ def _create_invoice(self):
     def _create_sale(self):
         """
         Create Sale orders
-        @param None
+        @param self: single record of sale.order
         @return: MUST return a sale.order recordset
         """
         self.ensure_one()

From 6f734f88f5e9d0ebd541bd734a268ad14173d582 Mon Sep 17 00:00:00 2001
From: Florent THOMAS <florent.thomas@mind-and-go.com>
Date: Mon, 29 Jan 2018 11:17:15 +0100
Subject: [PATCH 8/8] FIX bad field names causing bad quantities in
 sale.order.line

---
 .../models/account_analytic_account.py                     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contract_sale_generation/models/account_analytic_account.py b/contract_sale_generation/models/account_analytic_account.py
index a9ecc2964c..c07d6b0d92 100644
--- a/contract_sale_generation/models/account_analytic_account.py
+++ b/contract_sale_generation/models/account_analytic_account.py
@@ -21,10 +21,11 @@ def _prepare_sale_line(self, line, order_id):
         sale_line = self.env['sale.order.line'].new({
             'order_id': order_id,
             'product_id': line.product_id.id,
-            'proudct_uom_qty': line.quantity,
-            'proudct_uom_id': line.uom_id.id,
+            'product_qty': line.quantity,
+            'product_uom_qty': line.quantity,
+            'product_uom': line.uom_id.id,
         })
-        # Get other invoice line values from product onchange
+        # Get other sale line values from product onchange
         sale_line.product_id_change()
         sale_line_vals = sale_line._convert_to_write(sale_line._cache)
         # Insert markers