From 4609c0e3b0a90ead25d26912fdb6f972cde2688b Mon Sep 17 00:00:00 2001
From: lreficent <lois.rilo@eficent.com>
Date: Wed, 2 Aug 2017 17:05:58 +0200
Subject: [PATCH] [9.0][FIX] rma: * fix assignment of moves. * default qty in
 rma lines. * remove account dependency. * test and flake8 fixes.

---
 rma_purchase/models/rma_order.py         | 12 +++++------
 rma_purchase/models/rma_order_line.py    |  1 -
 rma_purchase/wizards/rma_add_purchase.py | 26 ++++++++++++------------
 rma_purchase/wizards/rma_make_picking.py |  2 +-
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/rma_purchase/models/rma_order.py b/rma_purchase/models/rma_order.py
index 3b21983e..54121cc0 100644
--- a/rma_purchase/models/rma_order.py
+++ b/rma_purchase/models/rma_order.py
@@ -2,9 +2,6 @@
 # © 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from openerp import api, fields, models
-from openerp.addons import decimal_precision as dp
-from random import randint
-from datetime import datetime
 
 
 class RmaOrder(models.Model):
@@ -17,7 +14,8 @@ class RmaOrder(models.Model):
             purchase_list = []
             for line in rec.rma_line_ids:
                 for procurement_id in line.procurement_ids:
-                    if procurement_id.purchase_id and procurement_id.purchase_id.id:
+                    if procurement_id.purchase_id and \
+                            procurement_id.purchase_id.id:
                         purchase_list.append(procurement_id.purchase_id.id)
             rec.po_count = len(list(set(purchase_list)))
 
@@ -26,7 +24,7 @@ class RmaOrder(models.Model):
         po_list = []
         for rma_line in self.rma_line_ids:
             if rma_line.purchase_order_line_id and \
-                     rma_line.purchase_order_line_id.id:
+                    rma_line.purchase_order_line_id.id:
                 po_list.append(rma_line.purchase_order_line_id.order_id.id)
         self.origin_po_count = len(list(set(po_list)))
 
@@ -35,8 +33,8 @@ class RmaOrder(models.Model):
                               copy=False, default=0)
 
     origin_po_count = fields.Integer(compute=_compute_origin_po_count,
-                                    string='# of Origin PO', copy=False,
-                                    default=0)
+                                     string='# of Origin PO', copy=False,
+                                     default=0)
 
     @api.multi
     def action_view_purchase_order(self):
diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py
index f87c5eb3..8cd51869 100644
--- a/rma_purchase/models/rma_order_line.py
+++ b/rma_purchase/models/rma_order_line.py
@@ -3,7 +3,6 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 from openerp import api, fields, models
 from openerp.addons import decimal_precision as dp
-from random import randint
 
 
 class RmaOrderLine(models.Model):
diff --git a/rma_purchase/wizards/rma_add_purchase.py b/rma_purchase/wizards/rma_add_purchase.py
index c31a99ec..e80357f9 100644
--- a/rma_purchase/wizards/rma_add_purchase.py
+++ b/rma_purchase/wizards/rma_add_purchase.py
@@ -3,10 +3,8 @@
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
 import time
-from openerp import models, fields, exceptions, api, _
+from openerp import _, api, fields, models
 from openerp.exceptions import ValidationError
-from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DT_FORMAT
-import openerp.addons.decimal_precision as dp
 
 
 class RmaAddPurchase(models.TransientModel):
@@ -31,18 +29,20 @@ class RmaAddPurchase(models.TransientModel):
         return res
 
     rma_id = fields.Many2one('rma.order',
-                              string='RMA Order',
-                              readonly=True,
-                              ondelete='cascade')
+                             string='RMA Order',
+                             readonly=True,
+                             ondelete='cascade')
 
     partner_id = fields.Many2one(comodel_name='res.partner', string='Partner',
                                  readonly=True)
-    purchase_id = fields.Many2one(comodel_name='purchase.order', string='Order')
-    purchase_line_ids = fields.Many2many('purchase.order.line',
-                                     'rma_add_purchase_add_line_rel',
-                                     'purchase_line_id', 'rma_add_purchase_id',
-                                     readonly=False,
-                                     string='Purcahse Order Lines')
+    purchase_id = fields.Many2one(
+        comodel_name='purchase.order', string='Order')
+    purchase_line_ids = fields.Many2many(
+        'purchase.order.line',
+        'rma_add_purchase_add_line_rel',
+        'purchase_line_id', 'rma_add_purchase_id',
+        readonly=False,
+        string='Purcahse Order Lines')
 
     def _prepare_rma_line_from_po_line(self, line):
         operation = line.product_id.rma_operation_id and \
@@ -75,7 +75,7 @@ class RmaAddPurchase(models.TransientModel):
             {'in_route_id': operation.in_route_id.id or route,
              'out_route_id': operation.out_route_id.id or route,
              'receipt_policy': operation.receipt_policy,
-             'location_id': operation.location_id.id or
+             'location_id': operation.location_id.id or \
                             self.env.ref('stock.stock_location_stock').id,
              'operation_id': operation.id,
              'refund_policy': operation.refund_policy,
diff --git a/rma_purchase/wizards/rma_make_picking.py b/rma_purchase/wizards/rma_make_picking.py
index f80204c9..38e40f95 100644
--- a/rma_purchase/wizards/rma_make_picking.py
+++ b/rma_purchase/wizards/rma_make_picking.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # © 2017 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
-from openerp import models, fields, exceptions, api, _
+from openerp import _, api, fields, models
 
 
 class RmaMakePicking(models.TransientModel):