[IMP] rma_analytic: black, isort, prettier

rma_analytic/__manifest__.py

@@ -6,7 +6,7 @@
     "version": "12.0.1.0.0",
     "author": "Eficent," "Odoo Community Association (OCA)",
     "license": "LGPL-3",
-    "website": "http://www.eficent.com",
+    "website": "https://github.com/ForgeFlow/stock-rma",
     "category": "Analytic",
     "depends": [
         "rma_account",

rma_analytic/models/rma_order_line.py

@@ -15,11 +15,7 @@ class RmaOrderLine(models.Model):
 
     @api.multi
     def _prepare_rma_line_from_inv_line(self, line):
-        res = super(
-            RmaOrderLine, self
-        )._prepare_rma_line_from_inv_line(line)
+        res = super(RmaOrderLine, self)._prepare_rma_line_from_inv_line(line)
         if line.account_analytic_id:
-            res.update(
-                analytic_account_id=line.account_analytic_id.id
-            )
+            res.update(analytic_account_id=line.account_analytic_id.id)
         return res

rma_analytic/models/stock_move.py

@@ -9,9 +9,5 @@ class StockMove(models.Model):
 
     def _prepare_procurement_values(self):
         res = super(StockMove, self)._prepare_procurement_values()
-        res.update(
-            {
-                "account_analytic_id": self.rma_line_id.analytic_account_id.id
-            }
-        )
+        res.update({"account_analytic_id": self.rma_line_id.analytic_account_id.id})
         return res

rma_analytic/tests/test_rma_analytic.py

@@ -5,7 +5,6 @@ from odoo.addons.rma.tests import test_rma
 
 
 class TestRmaAnalytic(test_rma.TestRma):
-
     @classmethod
     def setUpClass(cls):
         super(TestRmaAnalytic, cls).setUpClass()
@@ -23,15 +22,11 @@ class TestRmaAnalytic(test_rma.TestRma):
             cls.env.ref("base.res_partner_2"),
             dropship=False,
         )
-        receivable_type = cls.env.ref(
-            "account.data_account_type_receivable"
-        )
+        receivable_type = cls.env.ref("account.data_account_type_receivable")
         # Create Invoices:
         customer_account = (
             cls.env["account.account"]
-            .search(
-                [("user_type_id", "=", receivable_type.id)], limit=1
-            )
+            .search([("user_type_id", "=", receivable_type.id)], limit=1)
             .id
         )
         cls.inv_customer = cls.env["account.invoice"].create(
@@ -41,9 +36,7 @@ class TestRmaAnalytic(test_rma.TestRma):
                 "type": "out_invoice",
             }
         )
-        cls.anal = cls.env["account.analytic.account"].create(
-            {"name": "Name"}
-        )
+        cls.anal = cls.env["account.analytic.account"].create({"name": "Name"})
         cls.inv_line_1 = cls.env["account.invoice.line"].create(
             {
                 "name": cls.partner_id.name,
@@ -89,21 +82,11 @@ class TestRmaAnalytic(test_rma.TestRma):
                     "operation_id": self.env.ref(
                         "rma.rma_operation_customer_replace"
                     ).id,
-                    "in_route_id": self.env.ref(
-                        "rma.route_rma_customer"
-                    ),
-                    "out_route_id": self.env.ref(
-                        "rma.route_rma_customer"
-                    ),
-                    "in_warehouse_id": self.env.ref(
-                        "stock.warehouse0"
-                    ),
-                    "out_warehouse_id": self.env.ref(
-                        "stock.warehouse0"
-                    ),
-                    "location_id": self.env.ref(
-                        "stock.stock_location_stock"
-                    ),
+                    "in_route_id": self.env.ref("rma.route_rma_customer"),
+                    "out_route_id": self.env.ref("rma.route_rma_customer"),
+                    "in_warehouse_id": self.env.ref("stock.warehouse0"),
+                    "out_warehouse_id": self.env.ref("stock.warehouse0"),
+                    "location_id": self.env.ref("stock.stock_location_stock"),
                     "type": "customer",
                     "invoice_line_id": self.inv_line_1.id,
                     "uom_id": self.product_1.uom_id.id,
@@ -138,13 +121,7 @@ class TestRmaAnalytic(test_rma.TestRma):
                 "active_ids": [rma_order.id],
                 "active_model": "rma.order",
             }
-        ).create(
-            {
-                "invoice_line_ids": [
-                    (6, 0, self.inv_customer.invoice_line_ids.ids)
-                ]
-            }
-        )
+        ).create({"invoice_line_ids": [(6, 0, self.inv_customer.invoice_line_ids.ids)]})
         add_inv.add_lines()
 
         self.assertEqual(
@@ -166,21 +143,11 @@ class TestRmaAnalytic(test_rma.TestRma):
                     "operation_id": self.env.ref(
                         "rma_account.rma_operation_customer_refund"
                     ).id,
-                    "in_route_id": self.env.ref(
-                        "rma.route_rma_customer"
-                    ).id,
-                    "out_route_id": self.env.ref(
-                        "rma.route_rma_customer"
-                    ).id,
-                    "in_warehouse_id": self.env.ref(
-                        "stock.warehouse0"
-                    ).id,
-                    "out_warehouse_id": self.env.ref(
-                        "stock.warehouse0"
-                    ).id,
-                    "location_id": self.env.ref(
-                        "stock.stock_location_stock"
-                    ).id,
+                    "in_route_id": self.env.ref("rma.route_rma_customer").id,
+                    "out_route_id": self.env.ref("rma.route_rma_customer").id,
+                    "in_warehouse_id": self.env.ref("stock.warehouse0").id,
+                    "out_warehouse_id": self.env.ref("stock.warehouse0").id,
+                    "location_id": self.env.ref("stock.stock_location_stock").id,
                     "type": "customer",
                     "invoice_line_id": self.inv_line_1.id,
                     "uom_id": self.product_1.uom_id.id,

rma_analytic/views/rma_order_line_view.xml

@@ -1,14 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0" ?>
 <!-- Copyright 2018 Eficent Business and IT Consulting Services S.L.
      License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
 <odoo>
     <record id="view_rma_line_tree" model="ir.ui.view">
         <field name="name">rma.order.line.tree</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_tree"/>
+        <field name="inherit_id" ref="rma.view_rma_line_tree" />
         <field name="arch" type="xml">
             <field name="state" position="after">
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field
+                    name="analytic_account_id"
+                    groups="analytic.group_analytic_accounting"
+                />
             </field>
         </field>
     </record>
@@ -16,10 +19,13 @@
     <record id="view_rma_line_supplier_tree" model="ir.ui.view">
         <field name="name">rma.order.line.supplier.tree</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_tree"/>
+        <field name="inherit_id" ref="rma.view_rma_line_supplier_tree" />
         <field name="arch" type="xml">
             <field name="state" position="after">
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field
+                    name="analytic_account_id"
+                    groups="analytic.group_analytic_accounting"
+                />
             </field>
         </field>
     </record>
@@ -27,10 +33,13 @@
     <record id="view_rma_line_supplier_form" model="ir.ui.view">
         <field name="name">rma.order.line.supplier.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_supplier_form" />
         <field name="arch" type="xml">
             <group name="main_info" position="inside">
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field
+                    name="analytic_account_id"
+                    groups="analytic.group_analytic_accounting"
+                />
             </group>
         </field>
     </record>
@@ -38,10 +47,13 @@
     <record id="view_rma_line_form" model="ir.ui.view">
         <field name="name">rma.order.line.form</field>
         <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form"/>
+        <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
             <group name="main_info" position="inside">
-                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                <field
+                    name="analytic_account_id"
+                    groups="analytic.group_analytic_accounting"
+                />
             </group>
         </field>
     </record>

rma_analytic/wizards/rma_add_invoice.py

@@ -8,11 +8,7 @@ class RmaAddInvoice(models.TransientModel):
     _inherit = "rma_add_invoice"
 
     def _prepare_rma_line_from_inv_line(self, line):
-        res = super(
-            RmaAddInvoice, self
-        )._prepare_rma_line_from_inv_line(line)
+        res = super(RmaAddInvoice, self)._prepare_rma_line_from_inv_line(line)
         if line.account_analytic_id:
-            res.update(
-                analytic_account_id=line.account_analytic_id.id
-            )
+            res.update(analytic_account_id=line.account_analytic_id.id)
         return res

rma_analytic/wizards/rma_add_stock_move.py

@@ -9,8 +9,6 @@ class RmaAddStockMove(models.TransientModel):
 
     @api.model
     def _prepare_rma_line_from_stock_move(self, sm, lot=False):
-        data = super(
-            RmaAddStockMove, self
-        )._prepare_rma_line_from_stock_move(sm, lot)
+        data = super(RmaAddStockMove, self)._prepare_rma_line_from_stock_move(sm, lot)
         data.update(analytic_account_id=sm.analytic_account_id.id)
         return data

rma_analytic/wizards/rma_make_picking.py

@@ -1,7 +1,7 @@
 # Copyright 2018 Eficent Business and IT Consulting Services S.L.
 # License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html)
 
-from odoo import models, api
+from odoo import api, models
 
 
 class RmaMakePicking(models.TransientModel):
@@ -9,10 +9,8 @@ class RmaMakePicking(models.TransientModel):
 
     @api.model
     def _get_procurement_data(self, item, group, qty, picking_type):
-        procurement_data = super(
-            RmaMakePicking, self
-        )._get_procurement_data(item, group, qty, picking_type)
-        procurement_data.update(
-            analytic_account_id=item.line_id.analytic_account_id.id
+        procurement_data = super(RmaMakePicking, self)._get_procurement_data(
+            item, group, qty, picking_type
         )
+        procurement_data.update(analytic_account_id=item.line_id.analytic_account_id.id)
         return procurement_data

rma_analytic/wizards/rma_refund.py

@@ -11,7 +11,5 @@ class RmaRefund(models.TransientModel):
     def prepare_refund_line(self, item, refund):
         res = super(RmaRefund, self).prepare_refund_line(item, refund)
         if item.line_id.analytic_account_id:
-            res.update(
-                account_analytic_id=item.line_id.analytic_account_id.id
-            )
+            res.update(account_analytic_id=item.line_id.analytic_account_id.id)
         return res

setup/rma_analytic/odoo/addons/rma_analytic

@@ -0,0 +1 @@
+../../../../rma_analytic

setup/rma_analytic/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)