From cff9044692bfbfc683dd306f1b36140354da86cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Thu, 18 Feb 2021 12:19:26 +0100 Subject: [PATCH] [IMP] stock_available_immediately: black, isort, prettier --- .../odoo/addons/stock_available_immediately | 1 + setup/stock_available_immediately/setup.py | 6 + stock_available_immediately/__manifest__.py | 2 +- .../models/product_product.py | 14 ++- .../tests/test_stock_available_immediately.py | 112 ++++++++++-------- 5 files changed, 78 insertions(+), 57 deletions(-) create mode 120000 setup/stock_available_immediately/odoo/addons/stock_available_immediately create mode 100644 setup/stock_available_immediately/setup.py diff --git a/setup/stock_available_immediately/odoo/addons/stock_available_immediately b/setup/stock_available_immediately/odoo/addons/stock_available_immediately new file mode 120000 index 000000000..8ab3a1f19 --- /dev/null +++ b/setup/stock_available_immediately/odoo/addons/stock_available_immediately @@ -0,0 +1 @@ +../../../../stock_available_immediately \ No newline at end of file diff --git a/setup/stock_available_immediately/setup.py b/setup/stock_available_immediately/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/stock_available_immediately/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_available_immediately/__manifest__.py b/stock_available_immediately/__manifest__.py index 85fca7b1b..9fe70564e 100644 --- a/stock_available_immediately/__manifest__.py +++ b/stock_available_immediately/__manifest__.py @@ -11,5 +11,5 @@ "author": "Camptocamp,Sodexis,Odoo Community Association (OCA),Sergio Díaz", "license": "AGPL-3", "category": "Hidden", - 'installable': True, + "installable": True, } diff --git a/stock_available_immediately/models/product_product.py b/stock_available_immediately/models/product_product.py index 05987c215..7c63e7c95 100644 --- a/stock_available_immediately/models/product_product.py +++ b/stock_available_immediately/models/product_product.py @@ -7,17 +7,19 @@ from odoo import api, models class ProductProduct(models.Model): - _inherit = 'product.product' + _inherit = "product.product" @api.multi def _compute_available_quantities_dict(self): - res, stock_dict = \ - super(ProductProduct, self)._compute_available_quantities_dict() + res, stock_dict = super( + ProductProduct, self + )._compute_available_quantities_dict() for product in self: - res[product.id]['immediately_usable_qty'] -= \ - stock_dict[product.id]['incoming_qty'] + res[product.id]["immediately_usable_qty"] -= stock_dict[product.id][ + "incoming_qty" + ] return res, stock_dict - @api.depends('virtual_available', 'incoming_qty') + @api.depends("virtual_available", "incoming_qty") def _compute_available_quantities(self): return super(ProductProduct, self)._compute_available_quantities() diff --git a/stock_available_immediately/tests/test_stock_available_immediately.py b/stock_available_immediately/tests/test_stock_available_immediately.py index a1e9d2c56..26405d2eb 100644 --- a/stock_available_immediately/tests/test_stock_available_immediately.py +++ b/stock_available_immediately/tests/test_stock_available_immediately.py @@ -8,58 +8,67 @@ from odoo.tests.common import TransactionCase class TestStockLogisticsWarehouse(TransactionCase): - def test01_stock_levels(self): """ Checking that immediately_usable_qty actually reflects the variations in stock, both on product and template. """ - moveObj = self.env['stock.move'] - productObj = self.env['product.product'] - templateObj = self.env['product.template'] - supplier_location = self.env.ref('stock.stock_location_suppliers') - stock_location = self.env.ref('stock.stock_location_stock') - customer_location = self.env.ref('stock.stock_location_customers') - uom_unit = self.env.ref('uom.product_uom_unit') + moveObj = self.env["stock.move"] + productObj = self.env["product.product"] + templateObj = self.env["product.template"] + supplier_location = self.env.ref("stock.stock_location_suppliers") + stock_location = self.env.ref("stock.stock_location_stock") + customer_location = self.env.ref("stock.stock_location_customers") + uom_unit = self.env.ref("uom.product_uom_unit") # Create product template - templateAB = templateObj.create({ - 'name': 'templAB', - 'uom_id': uom_unit.id}) + templateAB = templateObj.create({"name": "templAB", "uom_id": uom_unit.id}) # Create product A and B - productA = productObj.create({ - 'name': 'product A', - 'standard_price': 1, - 'type': 'product', - 'uom_id': uom_unit.id, - 'default_code': 'A', - 'product_tmpl_id': templateAB.id}) + productA = productObj.create( + { + "name": "product A", + "standard_price": 1, + "type": "product", + "uom_id": uom_unit.id, + "default_code": "A", + "product_tmpl_id": templateAB.id, + } + ) - productB = productObj.create({ - 'name': 'product B', - 'standard_price': 1, - 'type': 'product', - 'uom_id': uom_unit.id, - 'default_code': 'B', - 'product_tmpl_id': templateAB.id}) + productB = productObj.create( + { + "name": "product B", + "standard_price": 1, + "type": "product", + "uom_id": uom_unit.id, + "default_code": "B", + "product_tmpl_id": templateAB.id, + } + ) # Create a stock move from INCOMING to STOCK - stockMoveInA = moveObj.create({ - 'location_id': supplier_location.id, - 'location_dest_id': stock_location.id, - 'name': 'MOVE INCOMING -> STOCK ', - 'product_id': productA.id, - 'product_uom': productA.uom_id.id, - 'product_uom_qty': 2}) + stockMoveInA = moveObj.create( + { + "location_id": supplier_location.id, + "location_dest_id": stock_location.id, + "name": "MOVE INCOMING -> STOCK ", + "product_id": productA.id, + "product_uom": productA.uom_id.id, + "product_uom_qty": 2, + } + ) - stockMoveInB = moveObj.create({ - 'location_id': supplier_location.id, - 'location_dest_id': stock_location.id, - 'name': 'MOVE INCOMING -> STOCK ', - 'product_id': productB.id, - 'product_uom': productB.uom_id.id, - 'product_uom_qty': 3}) + stockMoveInB = moveObj.create( + { + "location_id": supplier_location.id, + "location_dest_id": stock_location.id, + "name": "MOVE INCOMING -> STOCK ", + "product_id": productB.id, + "product_uom": productB.uom_id.id, + "product_uom_qty": 3, + } + ) def compare_product_usable_qty(product, value): # Refresh, because the function field is not recalculated between @@ -78,7 +87,7 @@ class TestStockLogisticsWarehouse(TransactionCase): compare_product_usable_qty(productA, 0) compare_product_usable_qty(templateAB, 0) - stockMoveInA.move_line_ids.write({'qty_done': 2.0}) + stockMoveInA.move_line_ids.write({"qty_done": 2.0}) stockMoveInA._action_done() compare_product_usable_qty(productA, 2) compare_product_usable_qty(templateAB, 2) @@ -86,25 +95,28 @@ class TestStockLogisticsWarehouse(TransactionCase): # will directly trigger action_done on productB stockMoveInB._action_confirm() stockMoveInB._action_assign() - stockMoveInB.move_line_ids.write({'qty_done': 3.0}) + stockMoveInB.move_line_ids.write({"qty_done": 3.0}) stockMoveInB._action_done() compare_product_usable_qty(productA, 2) compare_product_usable_qty(productB, 3) compare_product_usable_qty(templateAB, 5) # Create a stock move from STOCK to CUSTOMER - stockMoveOutA = moveObj.create({ - 'location_id': stock_location.id, - 'location_dest_id': customer_location.id, - 'name': ' STOCK --> CUSTOMER ', - 'product_id': productA.id, - 'product_uom': productA.uom_id.id, - 'product_uom_qty': 1, - 'state': 'confirmed'}) + stockMoveOutA = moveObj.create( + { + "location_id": stock_location.id, + "location_dest_id": customer_location.id, + "name": " STOCK --> CUSTOMER ", + "product_id": productA.id, + "product_uom": productA.uom_id.id, + "product_uom_qty": 1, + "state": "confirmed", + } + ) stockMoveOutA._action_confirm() stockMoveOutA._action_assign() - stockMoveOutA.move_line_ids.write({'qty_done': 1.0}) + stockMoveOutA.move_line_ids.write({"qty_done": 1.0}) stockMoveOutA._action_done() compare_product_usable_qty(productA, 1) compare_product_usable_qty(templateAB, 4)