From 9971faa07053e5df5b3215c5e4bad438a8c04410 Mon Sep 17 00:00:00 2001
From: ahenriquez <ahenriquez@eficent.com>
Date: Mon, 6 Apr 2020 13:18:53 +0200
Subject: [PATCH 1/4] [UPT]allow to deliver rmas after repair even when not
 paid

---
 rma_repair/__manifest__.py          | 2 +-
 rma_repair/models/rma_order_line.py | 3 +--
 rma_repair/tests/test_rma_repair.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/rma_repair/__manifest__.py b/rma_repair/__manifest__.py
index ff01690c..aff5ec3c 100644
--- a/rma_repair/__manifest__.py
+++ b/rma_repair/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "RMA Repair",
-    "version": "12.0.1.2.0",
+    "version": "12.0.1.2.1",
     "license": "LGPL-3",
     "category": "RMA",
     "summary": "Links RMA with Repairs.",
diff --git a/rma_repair/models/rma_order_line.py b/rma_repair/models/rma_order_line.py
index 4f577ddd..f1134c83 100644
--- a/rma_repair/models/rma_order_line.py
+++ b/rma_repair/models/rma_order_line.py
@@ -142,6 +142,5 @@ class RmaOrderLine(models.Model):
     def _compute_qty_to_deliver(self):
         res = super(RmaOrderLine, self)._compute_qty_to_deliver()
         for rec in self.filtered(lambda l: l.delivery_policy == 'repair'):
-            rec.qty_to_deliver = rec.qty_repaired - rec.qty_delivered - \
-                rec.qty_to_pay
+            rec.qty_to_deliver = rec.qty_repaired - rec.qty_delivered
         return res
diff --git a/rma_repair/tests/test_rma_repair.py b/rma_repair/tests/test_rma_repair.py
index a1b2a537..a36661a4 100644
--- a/rma_repair/tests/test_rma_repair.py
+++ b/rma_repair/tests/test_rma_repair.py
@@ -242,7 +242,7 @@ class TestRmaRepair(common.SingleTransactionCase):
         repair.action_repair_invoice_create()
         self.assertEqual(rma.qty_repaired, 1.0)
         repair.invoice_id.action_invoice_open()
-        self.assertEqual(rma.qty_to_deliver, 0.0)
+        self.assertEqual(rma.qty_to_deliver, 1.0)
         repair.invoice_id.pay_and_reconcile(self.bank_journal, 200.0)
         self.assertEqual(repair.invoice_status, 'paid')
         self.assertEqual(rma.qty_to_pay, 0.0)

From 3924c701c88067634fd324715eb9093ddcbfe37a Mon Sep 17 00:00:00 2001
From: ahenriquez <ahenriquez@eficent.com>
Date: Mon, 6 Apr 2020 17:21:37 +0200
Subject: [PATCH 2/4] [IMP]allow to invoice repair orders from the rma line

---
 rma_repair/models/rma_order_line.py      | 5 +++++
 rma_repair/views/rma_order_line_view.xml | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/rma_repair/models/rma_order_line.py b/rma_repair/models/rma_order_line.py
index f1134c83..a4c3bb44 100644
--- a/rma_repair/models/rma_order_line.py
+++ b/rma_repair/models/rma_order_line.py
@@ -144,3 +144,8 @@ class RmaOrderLine(models.Model):
         for rec in self.filtered(lambda l: l.delivery_policy == 'repair'):
             rec.qty_to_deliver = rec.qty_repaired - rec.qty_delivered
         return res
+
+    def rma_repair_make_invoice(self):
+        res = self.env['repair.order.make_invoice'].with_context(
+            active_ids=self.repair_ids.ids).create({}).make_invoices()
+        return res
diff --git a/rma_repair/views/rma_order_line_view.xml b/rma_repair/views/rma_order_line_view.xml
index d9a5f5a2..16ba2a98 100644
--- a/rma_repair/views/rma_order_line_view.xml
+++ b/rma_repair/views/rma_order_line_view.xml
@@ -45,6 +45,12 @@
                         string="Create Repair Order"
                         class="oe_highlight"
                         type="action"/>
+                <button name="rma_repair_make_invoice"
+                        states="approved"
+                        string="Create Repair Invoices"
+                        class="oe_highlight"
+                        attrs="{'invisible':[('repair_count', '=', 0)]}"
+                        type="object"/>
             </header>
         </field>
     </record>

From 412c5bd1177f796623dd2c178e04b21a36c36d5d Mon Sep 17 00:00:00 2001
From: ahenriquez <ahenriquez@eficent.com>
Date: Mon, 6 Apr 2020 18:28:34 +0200
Subject: [PATCH 3/4] [IMP]Allow to create multiple invoices from rma_line list

---
 rma_repair/views/rma_order_line_view.xml  | 11 +++++++++++
 rma_repair/wizards/__init__.py            |  1 +
 rma_repair/wizards/repair_make_invoice.py | 17 +++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 rma_repair/wizards/repair_make_invoice.py

diff --git a/rma_repair/views/rma_order_line_view.xml b/rma_repair/views/rma_order_line_view.xml
index 16ba2a98..1ad0e4bd 100644
--- a/rma_repair/views/rma_order_line_view.xml
+++ b/rma_repair/views/rma_order_line_view.xml
@@ -55,4 +55,15 @@
         </field>
     </record>
 
+    <record id="action_rma_order_line_make_repair_invoice"
+            model="ir.actions.act_window">
+        <field name="name">Create Repair Invoices</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">repair.order.make_invoice</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="binding_model_id" ref="rma_repair.model_rma_order_line"/>
+    </record>
+
 </odoo>
diff --git a/rma_repair/wizards/__init__.py b/rma_repair/wizards/__init__.py
index 29cb35b3..521029a1 100644
--- a/rma_repair/wizards/__init__.py
+++ b/rma_repair/wizards/__init__.py
@@ -1,3 +1,4 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 from . import rma_order_line_make_repair
+from . import repair_make_invoice
diff --git a/rma_repair/wizards/repair_make_invoice.py b/rma_repair/wizards/repair_make_invoice.py
new file mode 100644
index 00000000..090ffec6
--- /dev/null
+++ b/rma_repair/wizards/repair_make_invoice.py
@@ -0,0 +1,17 @@
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0).
+
+from odoo import api, models
+
+
+class MakeInvoice(models.TransientModel):
+    _inherit = 'repair.order.make_invoice'
+
+    @api.multi
+    def make_invoices(self):
+        if self._context.get('active_model') == 'rma.order.line':
+            rma_lines = self.env['rma.order.line'].browse(
+                self._context.get('active_ids'))
+            self = self.with_context(
+                active_ids=rma_lines.mapped('repair_ids').ids)
+        return super().make_invoices()

From 23b5d97b985f53eef2dddec5ff726f19f6035a44 Mon Sep 17 00:00:00 2001
From: ahenriquez <ahenriquez@eficent.com>
Date: Wed, 8 Apr 2020 09:19:22 +0200
Subject: [PATCH 4/4] [IMP]group repair invoices

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

diff --git a/rma_repair/models/rma_order_line.py b/rma_repair/models/rma_order_line.py
index a4c3bb44..7768e1e0 100644
--- a/rma_repair/models/rma_order_line.py
+++ b/rma_repair/models/rma_order_line.py
@@ -147,5 +147,5 @@ class RmaOrderLine(models.Model):
 
     def rma_repair_make_invoice(self):
         res = self.env['repair.order.make_invoice'].with_context(
-            active_ids=self.repair_ids.ids).create({}).make_invoices()
+            active_ids=self.repair_ids.ids).create({'group': True}).make_invoices()
         return res