From b53d4e5856d467a5b7c38b2bc39eab5ba33f4eab Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 11 Jan 2019 11:08:23 +0100 Subject: [PATCH 1/5] [11.0][ADD] stock_inventory_foce_date --- .../__init__.py | 1 + .../__manifest__.py | 20 ++ .../models/__init__.py | 4 + .../models/res_company.py | 16 + .../models/stock_inventory.py | 114 ++++++ .../models/stock_move.py | 130 +++++++ .../models/stock_move_line.py | 25 ++ ..._account_inventory_force_date_security.xml | 13 + .../tests/__init__.py | 1 + .../tests/test_stock_inventory_force_date.py | 328 ++++++++++++++++++ .../views/res_company_view.xml | 16 + .../views/stock_inventory_view.xml | 26 ++ 12 files changed, 694 insertions(+) create mode 100644 stock_account_inventory_force_date/__init__.py create mode 100644 stock_account_inventory_force_date/__manifest__.py create mode 100644 stock_account_inventory_force_date/models/__init__.py create mode 100644 stock_account_inventory_force_date/models/res_company.py create mode 100644 stock_account_inventory_force_date/models/stock_inventory.py create mode 100644 stock_account_inventory_force_date/models/stock_move.py create mode 100644 stock_account_inventory_force_date/models/stock_move_line.py create mode 100644 stock_account_inventory_force_date/security/stock_account_inventory_force_date_security.xml create mode 100644 stock_account_inventory_force_date/tests/__init__.py create mode 100644 stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py create mode 100644 stock_account_inventory_force_date/views/res_company_view.xml create mode 100644 stock_account_inventory_force_date/views/stock_inventory_view.xml diff --git a/stock_account_inventory_force_date/__init__.py b/stock_account_inventory_force_date/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/stock_account_inventory_force_date/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_account_inventory_force_date/__manifest__.py b/stock_account_inventory_force_date/__manifest__.py new file mode 100644 index 000000000..56c638d60 --- /dev/null +++ b/stock_account_inventory_force_date/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2019 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +{ + "name": "Stock Account Inventory Force Date", + "summary": "Force the inventory adjustments to a date in the past.", + "version": "11.0.1.0.0", + "category": "Warehouse Management", + "license": "AGPL-3", + "author": "Eficent, " + "Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-warehouse", + "depends": ["stock_account", "stock"], + "data": [ + "security/stock_account_inventory_force_date_security.xml", + "views/stock_inventory_view.xml", + "views/res_company_view.xml", + ], + "installable": True, +} diff --git a/stock_account_inventory_force_date/models/__init__.py b/stock_account_inventory_force_date/models/__init__.py new file mode 100644 index 000000000..edda74fce --- /dev/null +++ b/stock_account_inventory_force_date/models/__init__.py @@ -0,0 +1,4 @@ +from . import res_company +from . import stock_inventory +from . import stock_move +from . import stock_move_line diff --git a/stock_account_inventory_force_date/models/res_company.py b/stock_account_inventory_force_date/models/res_company.py new file mode 100644 index 000000000..02e75c40a --- /dev/null +++ b/stock_account_inventory_force_date/models/res_company.py @@ -0,0 +1,16 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 Aleph Objects, Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = 'res.company' + + standard_cost_change_account_id = fields.Many2one( + 'account.account', string='Standard Cost Change Offsetting Account') + force_inventory_lock_date = fields.Date( + string="Force Inventory Lock Date", + help="If set, it won't be possible for any user to force an inventory," + "adjustment using a date earlier than this one.") diff --git a/stock_account_inventory_force_date/models/stock_inventory.py b/stock_account_inventory_force_date/models/stock_inventory.py new file mode 100644 index 000000000..451715986 --- /dev/null +++ b/stock_account_inventory_force_date/models/stock_inventory.py @@ -0,0 +1,114 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 Aleph Objects, Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models, _ +from odoo.exceptions import ValidationError + + +class StockInventory(models.Model): + _inherit = 'stock.inventory' + + force_inventory_date = fields.Boolean( + help="Force the inventory moves and accounting entries to a given date" + "in the past.", + readonly=True, + states={'draft': [('readonly', False)]}, + ) + + @api.onchange('date') + def _onchange_force_inventory_date(self): + if self.force_inventory_date: + self.accounting_date = self.date + + @api.multi + def write(self, vals): + """For inventories with `force_inventory_date` we only allow to + change `date` if they are in draft and not being confirmed.""" + force_date = self.filtered(lambda l: l.force_inventory_date) + if not force_date or not vals.get('date'): + return super().write(vals) + res = super(StockInventory, self - force_date).write(vals) + if vals.get('state'): + vals.pop('date') + res &= super(StockInventory, force_date).write(vals) + else: + draft = force_date.filtered(lambda i: i.state == 'draft') + res &= super(StockInventory, draft).write(vals) + vals.pop('date') + res &= super(StockInventory, force_date - draft).write(vals) + return res + + @api.multi + def _generate_lines_at_date(self, location, product_ids): + lines = [] + products_at_date = self.env['product.product'].with_context({ + 'to_date': self.date, + 'location': location.id, + 'compute_child': False, + }).search([('id', 'in', product_ids)]).filtered( + lambda p: p.qty_available) + for p in products_at_date: + line = { + 'product_id': p.id, + 'product_qty': p.qty_available, + 'location_id': location.id, + } + lines.append(line) + return lines + + def _get_inventory_lines_values(self): + if not self.force_inventory_date: + return super()._get_inventory_lines_values() + locations = self.env['stock.location'].search( + [('id', 'child_of', [self.location_id.id])]) + lines = [] + if self.filter == 'none': + for loc in locations: + # To improve performance, we only considered product + # moved in/out of the location any time in history: + products = self.env['stock.move'].read_group([ + '|', + ('location_id', '=', loc.id), + ('location_dest_id', '=', loc.id), + ('product_id.type', '=', 'product'), + ('state', '=', 'done'), + ], ['product_id'], ['product_id']) + product_ids = [x['product_id'][0] for x in products] + + if product_ids: + lines.extend(self._generate_lines_at_date(loc, + product_ids)) + + elif self.filter == 'product': + for loc in locations: + lines.extend(self._generate_lines_at_date( + loc, self.product_id.ids)) + elif self.filter == 'category': + product_ids = self.env['product.product'].search([ + ('category_id', '=', self.category_id.id)]).ids + for loc in locations: + lines.extend(self._generate_lines_at_date(loc, product_ids)) + else: + raise ValidationError(_( + 'Option %s not available when forcing Inventory Date.', + self.filter)) + return lines + + @api.multi + def post_inventory(self): + forced_inventories = self.filtered( + lambda inventory: inventory.force_inventory_date) + for inventory in forced_inventories: + lock_date = fields.Date.from_string( + inventory.company_id.force_inventory_lock_date) + inventory_date = fields.Datetime.from_string(inventory.date).date() + if lock_date and inventory_date < lock_date: + raise ValidationError(_( + 'It is not possible to force an inventory adjustment to ' + 'a date before %s') % lock_date) + super(StockInventory, inventory.with_context( + forced_inventory_date=inventory.date)).post_inventory() + other_inventories = self - forced_inventories + if other_inventories: + super(StockInventory, other_inventories).post_inventory() diff --git a/stock_account_inventory_force_date/models/stock_move.py b/stock_account_inventory_force_date/models/stock_move.py new file mode 100644 index 000000000..e5a23c5fd --- /dev/null +++ b/stock_account_inventory_force_date/models/stock_move.py @@ -0,0 +1,130 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 Aleph Objects, Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models, _ +from odoo.exceptions import ValidationError +from odoo.tools import float_round + + +class StockMove(models.Model): + _inherit = 'stock.move' + + def _get_valued_quantity(self): + valued_move_lines = self.env['stock.move.line'] + if self._is_in(): + valued_move_lines = self.move_line_ids.filtered( + lambda ml: not ml.location_id._should_be_valued() and + ml.location_dest_id._should_be_valued() and + not ml.owner_id) + elif self._is_out(): + valued_move_lines = self.move_line_ids.filtered( + lambda ml: ml.location_id._should_be_valued() and not + ml.location_dest_id._should_be_valued() and not ml.owner_id) + valued_quantity = 0 + for valued_move_line in valued_move_lines: + valued_quantity += \ + valued_move_line.product_uom_id._compute_quantity( + valued_move_line.qty_done, self.product_id.uom_id) + return valued_quantity + + def _prepare_move_price_history(self, history, diff): + valued_quantity = self._get_valued_quantity() + account_id = self.company_id.standard_cost_change_account_id.id + if not account_id: + raise ValidationError(_( + 'Please define a Standard Cost Change Offsetting Account ' + 'in the company settings.')) + # Accounting Entries + product = self.product_id + product_accounts = product.product_tmpl_id.get_product_accounts() + if diff * valued_quantity < 0: + debit_account_id = account_id + credit_account_id = product_accounts['stock_valuation'].id + else: + debit_account_id = product_accounts['stock_valuation'].id + credit_account_id = account_id + description = _('Standard Price revalued for %s from %s') % ( + self.product_id.display_name, self.inventory_id.name) + move_vals = { + 'journal_id': product_accounts['stock_journal'].id, + 'company_id': self.company_id.id, + 'date': history.datetime, + 'stock_move_id': self.id, + 'line_ids': [(0, 0, { + 'name': description, + 'account_id': debit_account_id, + 'debit': abs(diff * valued_quantity), + 'credit': 0, + 'product_id': self.product_id.id, + }), (0, 0, { + 'name': description, + 'account_id': credit_account_id, + 'debit': 0, + 'credit': abs(diff * valued_quantity), + 'product_id': self.product_id.id, + })], + } + return move_vals + + def _create_move_price_history(self, history, old_cost): + diff = history.cost - old_cost + if not diff: + return + move_vals = self._prepare_move_price_history(history, diff) + move = self.env['account.move'].create(move_vals) + move.post() + + @api.multi + def _replay_product_price_history_moves(self, forced_inventory_date): + recs = self.env['product.price.history'].search([ + ('product_id', '=', self.product_id.id), + ('company_id', '=', self.company_id.id), + ('datetime', '>', forced_inventory_date), + ], order="datetime asc") + old_cost = self.price_unit + for rec in recs: + self._create_move_price_history(rec, old_cost) + old_cost = rec.cost + + def _run_valuation(self, quantity=None): + forced_inventory_date = self.env.context.get( + 'forced_inventory_date', False) + super(StockMove, self)._run_valuation(quantity=quantity) + valued_quantity = self._get_valued_quantity() + if self.product_id.cost_method == 'standard' and forced_inventory_date: + price_used = self.product_id.get_history_price( + self.env.user.company_id.id, + date=forced_inventory_date, + ) + curr_rounding = self.company_id.currency_id.rounding + value = float_round(price_used * (quantity or valued_quantity), + precision_rounding=curr_rounding) + if valued_quantity: + price_unit = value / valued_quantity + elif quantity: + price_unit = value / quantity + else: + price_unit = 0.0 + if self._is_out() or self._is_dropshipped_returned(): + value *= -1 + price_unit *= -1 + self.write({ + 'value': value, + 'price_unit': price_unit, + }) + + @api.multi + def _action_done(self): + moves = super(StockMove, self)._action_done() + forced_inventory_date = self.env.context.get( + 'forced_inventory_date', False) + if forced_inventory_date: + moves.write({'date': forced_inventory_date}) + for move in moves.filtered( + lambda m: m.product_id.valuation == 'real_time' and ( + m._is_in() or m._is_out() or m._is_dropshipped() or + m._is_dropshipped_returned())): + move._replay_product_price_history_moves( + forced_inventory_date) + return moves diff --git a/stock_account_inventory_force_date/models/stock_move_line.py b/stock_account_inventory_force_date/models/stock_move_line.py new file mode 100644 index 000000000..7f5e16d62 --- /dev/null +++ b/stock_account_inventory_force_date/models/stock_move_line.py @@ -0,0 +1,25 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 Aleph Objects, Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class StockMoveLine(models.Model): + _inherit = 'stock.move.line' + + @api.multi + def write(self, vals): + forced_inventory_date = self.env.context.get( + 'forced_inventory_date', False) + if 'date' in vals and forced_inventory_date: + vals['date'] = forced_inventory_date + return super(StockMoveLine, self).write(vals) + + @api.model + def create(self, vals): + forced_inventory_date = self.env.context.get( + 'forced_inventory_date', False) + if 'date' in vals and forced_inventory_date: + vals['date'] = forced_inventory_date + return super(StockMoveLine, self).create(vals) diff --git a/stock_account_inventory_force_date/security/stock_account_inventory_force_date_security.xml b/stock_account_inventory_force_date/security/stock_account_inventory_force_date_security.xml new file mode 100644 index 000000000..ebc9dd0f5 --- /dev/null +++ b/stock_account_inventory_force_date/security/stock_account_inventory_force_date_security.xml @@ -0,0 +1,13 @@ + + + + + + + Force Inventory Adjustment Date + + + + + diff --git a/stock_account_inventory_force_date/tests/__init__.py b/stock_account_inventory_force_date/tests/__init__.py new file mode 100644 index 000000000..8f0fc8364 --- /dev/null +++ b/stock_account_inventory_force_date/tests/__init__.py @@ -0,0 +1 @@ +from . import test_stock_inventory_force_date diff --git a/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py new file mode 100644 index 000000000..f5b056c75 --- /dev/null +++ b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py @@ -0,0 +1,328 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo.tools import float_round +from odoo.tests.common import TransactionCase +from odoo.exceptions import ValidationError + + +class TestStockInventoryForceDate(TransactionCase): + + def setUp(self): + super(TestStockInventoryForceDate, self).setUp() + # Models + self.obj_wh = self.env['stock.warehouse'] + self.obj_location = self.env['stock.location'] + self.obj_inventory = self.env['stock.inventory'] + self.obj_product = self.env['product.product'] + self.obj_product_categ = self.env['product.category'] + self.obj_warehouse = self.env['stock.warehouse'] + self.obj_account = self.env['account.account'] + self.obj_upd_qty_wizard = self.env['stock.change.product.qty'] + # Refs + self.picking_type_id = self.env.ref('stock.picking_type_out') + self.loc_customer = self.env.ref('stock.stock_location_customers') + # Records + self.stock_input_account = self.obj_account.create({ + 'name': 'Stock Input', + 'code': 'StockIn', + 'user_type_id': self.env.ref( + 'account.data_account_type_current_liabilities').id, + }) + self.stock_output_account = self.obj_account.create({ + 'name': 'COGS', + 'code': 'cogs', + 'user_type_id': self.env.ref( + 'account.data_account_type_expenses').id, + }) + self.stock_valuation_account = self.obj_account.create({ + 'name': 'Stock Valuation', + 'code': 'Stock Valuation', + 'user_type_id': self.env.ref( + 'account.data_account_type_current_assets').id, + }) + self.expense_account = self.env['account.account'].create({ + 'code': 'INVEXP', + 'name': 'inventory adjustments', + 'user_type_id': + self.env.ref('account.data_account_type_expenses').id, + }) + self.cost_change_account = self.env['account.account'].create({ + 'code': 'COACC', + 'name': 'cost change', + 'user_type_id': + self.env.ref('account.data_account_type_expenses').id, + }) + self.stock_journal = self.env['account.journal'].create({ + 'name': 'Stock Journal', + 'code': 'STJTEST', + 'type': 'general', + }) + self.categ_standard = self.env['product.category'].create( + {'name': 'STANDARD', + 'property_cost_method': 'standard', + 'property_valuation': 'real_time', + 'property_stock_account_input_categ_id': + self.stock_input_account.id, + 'property_stock_account_output_categ_id': + self.stock_output_account.id, + 'property_stock_valuation_account_id': + self.stock_valuation_account.id, + 'property_stock_journal': self.stock_journal.id, + }, + ) + self.env.ref('stock.location_inventory').write({ + 'valuation_in_account_id': + self.expense_account.id, + 'valuation_out_account_id': + self.expense_account.id, + + }) + self.product1 = self.obj_product.create({ + 'name': 'Test Product 1', + 'type': 'product', + 'default_code': 'PROD1', + 'standard_price': 1.0, + 'categ_id': self.categ_standard.id, + }) + self.product2 = self.obj_product.create({ + 'name': 'Test Product 2', + 'type': 'product', + 'default_code': 'PROD2', + 'standard_price': 1.0, + 'categ_id': self.categ_standard.id, + }) + self.test_loc = self.obj_location.create({ + 'name': 'Test Location', + 'usage': 'internal', + }) + self.test_bin = self.obj_location.create({ + 'name': 'Test Bin Location', + 'usage': 'internal', + 'location_id': self.test_loc.id, + }) + self.test_wh = self.obj_warehouse.create({ + 'name': 'Test WH', + 'code': 'T', + + }) + self.obj_location._parent_store_compute() + group_stock_man = self.env.ref('stock.group_stock_manager') + self.manager = self.env['res.users'].create({ + 'name': 'Test Manager', + 'login': 'manager', + 'email': 'test.manager@example.com', + 'groups_id': [(6, 0, [group_stock_man.id])] + }) + group_stock_user = self.env.ref('stock.group_stock_user') + self.user = self.env['res.users'].create({ + 'name': 'Test User', + 'login': 'user', + 'email': 'test.user@example.com', + 'groups_id': [(6, 0, [group_stock_user.id])] + }) + self.env.user.company_id.standard_cost_change_account_id = \ + self.cost_change_account + + def test_01(self): + """Tests if creating inventory adjustments in the past produce correct + results forward in history. + """ + # Create a fake history of changes to the standard price + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': '2013-01-01 00:00:00', + 'cost': 100, + 'company_id': self.env.user.company_id.id, + }) + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': '2014-01-01 00:00:00', + 'cost': 50, + 'company_id': self.env.user.company_id.id, + }) + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': '2015-01-01 00:00:00', + 'cost': 25, + 'company_id': self.env.user.company_id.id, + }) + to_date = '2013-02-01 00:00:00' + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 1.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory.action_done() + # Check that the stock valuation is correct + price_used = self.product1.get_history_price( + self.env.user.company_id.id, + date=to_date, + ) + qty_available = self.product1.with_context( + company_owned=True, owner_id=False, to_date=to_date).qty_available + value = price_used * qty_available + round_curr = self.env.user.company_id.currency_id.rounding + inventory_valuation = float_round(value, precision_rounding=round_curr) + # Check that the accounting valuation for this product is correct + accounting_valuation = sum(self.env['account.move.line'].search([ + ('account_id', '=', self.stock_valuation_account.id), + ('product_id', '=', self.product1.id), + ('date', '<=', '2013-04-01'), + ]).mapped('balance')) + self.assertEqual(inventory_valuation, accounting_valuation) + self.assertEqual(inventory_valuation, 100.00) + # Check in 2014 + to_date = '2014-02-01 00:00:00' + # Check that the stock valuation is correct + price_used = self.product1.get_history_price( + self.env.user.company_id.id, + date=to_date, + ) + qty_available = self.product1.with_context( + company_owned=True, owner_id=False, to_date=to_date).qty_available + value = price_used * qty_available + round_curr = self.env.user.company_id.currency_id.rounding + inventory_valuation = float_round(value, precision_rounding=round_curr) + # Check that the accounting valuation for this product is correct + accounting_valuation = sum(self.env['account.move.line'].search([ + ('account_id', '=', self.stock_valuation_account.id), + ('product_id', '=', self.product1.id), + ('date', '<=', '2014-04-01'), + ]).mapped('balance')) + self.assertEqual(inventory_valuation, accounting_valuation) + self.assertEqual(inventory_valuation, 50.00) + # Check that the current quantity available is 1 + qty_available = self.product1.with_context( + company_owned=True, owner_id=False).qty_available + self.assertEqual(qty_available, 1.00) + # Check in 2015 + to_date = '2015-02-01 00:00:00' + # Check that the stock valuation is correct + price_used = self.product1.get_history_price( + self.env.user.company_id.id, + date=to_date, + ) + qty_available = self.product1.with_context( + company_owned=True, owner_id=False, to_date=to_date).qty_available + value = price_used * qty_available + round_curr = self.env.user.company_id.currency_id.rounding + inventory_valuation = float_round(value, precision_rounding=round_curr) + # Check that the accounting valuation for this product is correct + accounting_valuation = sum(self.env['account.move.line'].search([ + ('account_id', '=', self.stock_valuation_account.id), + ('product_id', '=', self.product1.id), + ('date', '<=', '2015-04-01'), + ]).mapped('balance')) + self.assertEqual(inventory_valuation, accounting_valuation) + self.assertEqual(inventory_valuation, 25.00) + # Check that the stock move line has the correct date + ml = self.env['stock.move.line'].search([ + ('product_id', '=', self.product1.id), + ('date', '=', '2013-02-01 00:00:00') + ]) + self.assertEqual(len(ml), 1) + + def test_02(self): + """Test that we cannot post an inventory before the lock date. + """ + self.env.user.company_id.force_inventory_lock_date = '2015-01-01' + to_date = '2013-02-01 00:00:00' + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 1.0, + 'location_id': self.test_loc.id, + }), + ], + }) + with self.assertRaises(ValidationError): + inventory.action_done() + + def test_03(self): + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 100.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory.action_done() + picking = self.env['stock.picking'].with_context( + ).create({ + 'picking_type_id': self.picking_type_id.id, + 'location_id': self.test_loc.id, + 'location_dest_id': self.loc_customer.id + }) + move = self.env['stock.move'].create({ + 'name': 'Test Move', + 'product_id': self.product1.id, + 'product_uom_qty': 50.0, + 'product_uom': self.product1.uom_id.id, + 'picking_id': picking.id, + 'state': 'draft', + 'location_id': self.test_loc.id, + 'location_dest_id': self.loc_customer.id, + }) + picking.action_confirm() + picking.action_assign() + self.assertEqual(move.reserved_availability, 50.0) + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': '2013-01-01 00:00:00', + 'cost': 100, + 'company_id': self.env.user.company_id.id, + }) + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': '2014-01-01 00:00:00', + 'cost': 50, + 'company_id': self.env.user.company_id.id, + }) + to_date = '2013-02-01 00:00:00' + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 0.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory.action_done() + self.assertEqual(move.reserved_availability, 0.0) diff --git a/stock_account_inventory_force_date/views/res_company_view.xml b/stock_account_inventory_force_date/views/res_company_view.xml new file mode 100644 index 000000000..4057320ac --- /dev/null +++ b/stock_account_inventory_force_date/views/res_company_view.xml @@ -0,0 +1,16 @@ + + + + res.company.form + res.company + + + + + + + + + + + diff --git a/stock_account_inventory_force_date/views/stock_inventory_view.xml b/stock_account_inventory_force_date/views/stock_inventory_view.xml new file mode 100644 index 000000000..094932cdf --- /dev/null +++ b/stock_account_inventory_force_date/views/stock_inventory_view.xml @@ -0,0 +1,26 @@ + + + + + + + + stock.inventory.form - stock_inventory_force_date + stock.inventory + + + + + + + + {'readonly': ['|', ('force_inventory_date', '!=', True), ('state', '!=', 'draft')]} + + + True + + + + + From 91f13173a298ea8968114592482cd266326495dc Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Tue, 12 Feb 2019 15:35:08 +0100 Subject: [PATCH 2/5] [11.0][FIX] stock_account_inventory_force_date: * remove readonly in accounting_date * fix computation of the theoretical quantity --- .../models/__init__.py | 1 + .../models/stock_inventory_line.py | 31 +++++++ .../tests/test_stock_inventory_force_date.py | 81 ++++++++++++++++++- .../views/stock_inventory_view.xml | 3 - 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 stock_account_inventory_force_date/models/stock_inventory_line.py diff --git a/stock_account_inventory_force_date/models/__init__.py b/stock_account_inventory_force_date/models/__init__.py index edda74fce..8b574d37c 100644 --- a/stock_account_inventory_force_date/models/__init__.py +++ b/stock_account_inventory_force_date/models/__init__.py @@ -1,4 +1,5 @@ from . import res_company from . import stock_inventory +from . import stock_inventory_line from . import stock_move from . import stock_move_line diff --git a/stock_account_inventory_force_date/models/stock_inventory_line.py b/stock_account_inventory_force_date/models/stock_inventory_line.py new file mode 100644 index 000000000..35ed70e10 --- /dev/null +++ b/stock_account_inventory_force_date/models/stock_inventory_line.py @@ -0,0 +1,31 @@ +# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 Aleph Objects, Inc. +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class StockInventoryLine(models.Model): + _inherit = 'stock.inventory.line' + + @api.one + @api.depends('location_id', 'product_id', 'package_id', + 'product_uom_id', 'company_id', 'prod_lot_id', 'partner_id', + 'inventory_id.force_inventory_date') + def _compute_theoretical_qty(self): + if not self.inventory_id.force_inventory_date: + return super()._compute_theoretical_qty() + if not self.product_id: + self.theoretical_qty = 0 + return + product_at_date = self.env['product.product'].with_context({ + 'to_date': self.inventory_id.date, + 'location': self.location_id.id, + 'compute_child': False, + }).browse(self.product_id.id) + theoretical_qty = product_at_date.qty_available + if theoretical_qty and self.product_uom_id and \ + self.product_id.uom_id != self.product_uom_id: + theoretical_qty = self.product_id.uom_id._compute_quantity( + theoretical_qty, self.product_uom_id) + self.theoretical_qty = theoretical_qty diff --git a/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py index f5b056c75..4ebe84d2a 100644 --- a/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py +++ b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py @@ -260,10 +260,20 @@ class TestStockInventoryForceDate(TransactionCase): inventory.action_done() def test_03(self): + to_date = '2013-02-01 00:00:00' + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': to_date, + 'cost': 25, + 'company_id': self.env.user.company_id.id, + }) inventory = self.obj_inventory.create({ 'name': 'Test past date', 'location_id': self.test_loc.id, 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, 'line_ids': [ (0, 0, { 'product_id': self.product1.id, @@ -306,7 +316,6 @@ class TestStockInventoryForceDate(TransactionCase): 'cost': 50, 'company_id': self.env.user.company_id.id, }) - to_date = '2013-02-01 00:00:00' inventory = self.obj_inventory.create({ 'name': 'Test past date', 'location_id': self.test_loc.id, @@ -326,3 +335,73 @@ class TestStockInventoryForceDate(TransactionCase): }) inventory.action_done() self.assertEqual(move.reserved_availability, 0.0) + + def test_04(self): + # Test introducing 100 units in the past and adjusting to 0 today. + # If we make then an inventory adjustment again in the past the + # theoretical quantity should be 100. + to_date = '2013-02-01 00:00:00' + self.env['product.price.history'].create({ + 'product_id': self.product1.id, + 'datetime': to_date, + 'cost': 25, + 'company_id': self.env.user.company_id.id, + }) + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 100.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory.action_done() + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 0.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory.action_done() + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'accounting_date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "product.product_uom_unit").id, + 'product_qty': 0.0, + 'location_id': self.test_loc.id, + }), + ], + }) + qty_available = self.product1.with_context( + company_owned=True, owner_id=False, to_date=to_date).qty_available + inventory.action_start() + # Check that the quantity back then is correct + for line in inventory.line_ids.filtered( + lambda l: l.product_id == self.product1): + self.assertEqual(line.theoretical_qty, qty_available) + self.assertEqual(line.theoretical_qty, 100) diff --git a/stock_account_inventory_force_date/views/stock_inventory_view.xml b/stock_account_inventory_force_date/views/stock_inventory_view.xml index 094932cdf..ec6fc7692 100644 --- a/stock_account_inventory_force_date/views/stock_inventory_view.xml +++ b/stock_account_inventory_force_date/views/stock_inventory_view.xml @@ -17,9 +17,6 @@ {'readonly': ['|', ('force_inventory_date', '!=', True), ('state', '!=', 'draft')]} - - True - From b5d3ab9ad29e9bff2bcc273da6686ad4d1be147a Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 31 Jul 2019 10:30:16 +0000 Subject: [PATCH 3/5] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 stock_account_inventory_force_date/static/description/icon.png diff --git a/stock_account_inventory_force_date/static/description/icon.png b/stock_account_inventory_force_date/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~! zVpnB`o+K7|Al`Q_U;eD$B zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__ zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_ zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)( z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9 zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz# z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K= z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C zuVl&0duN<;uOsB3%T9Fp8t{ED108<+W(nOZd?gDnfNBC3>M8WE61$So|P zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1 zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_ zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8 zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ> zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD z#z-)AXwSRY?OPefw^iI+ z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$ z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6 zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+ z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC) zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x! zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8 z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n= z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@ zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y< zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6 zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6% z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(| z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6 z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d} z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 45bafe99dc55d53adc28ecc4ba328e72d9fe086c Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 31 Jul 2019 10:42:15 +0000 Subject: [PATCH 4/5] [UPD] Update stock_account_inventory_force_date.pot --- .../stock_account_inventory_force_date.pot | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 stock_account_inventory_force_date/i18n/stock_account_inventory_force_date.pot diff --git a/stock_account_inventory_force_date/i18n/stock_account_inventory_force_date.pot b/stock_account_inventory_force_date/i18n/stock_account_inventory_force_date.pot new file mode 100644 index 000000000..49da4c864 --- /dev/null +++ b/stock_account_inventory_force_date/i18n/stock_account_inventory_force_date.pot @@ -0,0 +1,95 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_account_inventory_force_date +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: stock_account_inventory_force_date +#: model:ir.model,name:stock_account_inventory_force_date.model_res_company +msgid "Companies" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:res.groups,name:stock_account_inventory_force_date.group_stock_account_inventory_force_date +msgid "Force Inventory Adjustment Date" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model.fields,field_description:stock_account_inventory_force_date.field_stock_inventory_force_inventory_date +msgid "Force Inventory Date" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model.fields,field_description:stock_account_inventory_force_date.field_res_company_force_inventory_lock_date +msgid "Force Inventory Lock Date" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model.fields,help:stock_account_inventory_force_date.field_stock_inventory_force_inventory_date +msgid "Force the inventory moves and accounting entries to a given datein the past." +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model.fields,help:stock_account_inventory_force_date.field_res_company_force_inventory_lock_date +msgid "If set, it won't be possible for any user to force an inventory,adjustment using a date earlier than this one." +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model,name:stock_account_inventory_force_date.model_stock_inventory +#: model:ir.ui.view,arch_db:stock_account_inventory_force_date.view_company_form +msgid "Inventory" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model,name:stock_account_inventory_force_date.model_stock_inventory_line +msgid "Inventory Line" +msgstr "" + +#. module: stock_account_inventory_force_date +#: code:addons/stock_account_inventory_force_date/models/stock_inventory.py:107 +#, python-format +msgid "It is not possible to force an inventory adjustment to a date before %s" +msgstr "" + +#. module: stock_account_inventory_force_date +#: code:addons/stock_account_inventory_force_date/models/stock_inventory.py:93 +#, python-format +msgid "Option %s not available when forcing Inventory Date." +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model,name:stock_account_inventory_force_date.model_stock_move_line +msgid "Packing Operation" +msgstr "" + +#. module: stock_account_inventory_force_date +#: code:addons/stock_account_inventory_force_date/models/stock_move.py:35 +#, python-format +msgid "Please define a Standard Cost Change Offsetting Account in the company settings." +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model.fields,field_description:stock_account_inventory_force_date.field_res_company_standard_cost_change_account_id +msgid "Standard Cost Change Offsetting Account" +msgstr "" + +#. module: stock_account_inventory_force_date +#: code:addons/stock_account_inventory_force_date/models/stock_move.py:47 +#, python-format +msgid "Standard Price revalued for %s from %s" +msgstr "" + +#. module: stock_account_inventory_force_date +#: model:ir.model,name:stock_account_inventory_force_date.model_stock_move +msgid "Stock Move" +msgstr "" + From 280315e504301f7a79da2489f4744625710410b2 Mon Sep 17 00:00:00 2001 From: hveficent Date: Fri, 2 Aug 2019 10:57:33 +0200 Subject: [PATCH 5/5] [MIG] stock_account_inventory_force_date: Migration to 12.0 --- stock_account_inventory_force_date/README.rst | 79 ++++ .../__manifest__.py | 2 +- .../models/stock_inventory.py | 2 +- .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 6 + .../static/description/index.html | 424 ++++++++++++++++++ .../tests/test_stock_inventory_force_date.py | 64 ++- 7 files changed, 556 insertions(+), 23 deletions(-) create mode 100644 stock_account_inventory_force_date/README.rst create mode 100644 stock_account_inventory_force_date/readme/CONTRIBUTORS.rst create mode 100644 stock_account_inventory_force_date/readme/DESCRIPTION.rst create mode 100644 stock_account_inventory_force_date/static/description/index.html diff --git a/stock_account_inventory_force_date/README.rst b/stock_account_inventory_force_date/README.rst new file mode 100644 index 000000000..6ff556df6 --- /dev/null +++ b/stock_account_inventory_force_date/README.rst @@ -0,0 +1,79 @@ +================================== +Stock Account Inventory Force Date +================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_account_inventory_force_date + :alt: OCA/stock-logistics-warehouse +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_account_inventory_force_date + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/153/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to post an inventory adjustment using a past date. + +If you use perpetual accounting, and standard cost method, the module will +make sure that any future price changes are going to be revalued for the +quantity that changed. The solution is not yet implemented for average or +fifo costing. + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Eficent + +Contributors +~~~~~~~~~~~~ + +* Lois Rilo +* Jordi Ballester Alomar + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/stock-logistics-warehouse `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_account_inventory_force_date/__manifest__.py b/stock_account_inventory_force_date/__manifest__.py index 56c638d60..b275cb3a3 100644 --- a/stock_account_inventory_force_date/__manifest__.py +++ b/stock_account_inventory_force_date/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Stock Account Inventory Force Date", "summary": "Force the inventory adjustments to a date in the past.", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "category": "Warehouse Management", "license": "AGPL-3", "author": "Eficent, " diff --git a/stock_account_inventory_force_date/models/stock_inventory.py b/stock_account_inventory_force_date/models/stock_inventory.py index 451715986..7b8c814e6 100644 --- a/stock_account_inventory_force_date/models/stock_inventory.py +++ b/stock_account_inventory_force_date/models/stock_inventory.py @@ -19,7 +19,7 @@ class StockInventory(models.Model): @api.onchange('date') def _onchange_force_inventory_date(self): if self.force_inventory_date: - self.accounting_date = self.date + self.accounting_date = self.date.date() @api.multi def write(self, vals): diff --git a/stock_account_inventory_force_date/readme/CONTRIBUTORS.rst b/stock_account_inventory_force_date/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..f06dd5c05 --- /dev/null +++ b/stock_account_inventory_force_date/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Lois Rilo +* Jordi Ballester Alomar diff --git a/stock_account_inventory_force_date/readme/DESCRIPTION.rst b/stock_account_inventory_force_date/readme/DESCRIPTION.rst new file mode 100644 index 000000000..95ddb9461 --- /dev/null +++ b/stock_account_inventory_force_date/readme/DESCRIPTION.rst @@ -0,0 +1,6 @@ +This module allows to post an inventory adjustment using a past date. + +If you use perpetual accounting, and standard cost method, the module will +make sure that any future price changes are going to be revalued for the +quantity that changed. The solution is not yet implemented for average or +fifo costing. \ No newline at end of file diff --git a/stock_account_inventory_force_date/static/description/index.html b/stock_account_inventory_force_date/static/description/index.html new file mode 100644 index 000000000..a9553c6e1 --- /dev/null +++ b/stock_account_inventory_force_date/static/description/index.html @@ -0,0 +1,424 @@ + + + + + + +Stock Account Inventory Force Date + + + +
+

Stock Account Inventory Force Date

+ + +

Beta License: AGPL-3 OCA/stock-logistics-warehouse Translate me on Weblate Try me on Runbot

+

This module allows to post an inventory adjustment using a past date.

+

If you use perpetual accounting, and standard cost method, the module will +make sure that any future price changes are going to be revalued for the +quantity that changed. The solution is not yet implemented for average or +fifo costing.

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Eficent
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/stock-logistics-warehouse project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py index 4ebe84d2a..c96e23b39 100644 --- a/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py +++ b/stock_account_inventory_force_date/tests/test_stock_inventory_force_date.py @@ -1,6 +1,7 @@ # Copyright 2019 Eficent Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tools import float_round +from datetime import datetime from odoo.tests.common import TransactionCase from odoo.exceptions import ValidationError @@ -158,13 +159,13 @@ class TestStockInventoryForceDate(TransactionCase): (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 1.0, 'location_id': self.test_loc.id, }), ], }) - inventory.action_done() + inventory.action_validate() # Check that the stock valuation is correct price_used = self.product1.get_history_price( self.env.user.company_id.id, @@ -238,29 +239,29 @@ class TestStockInventoryForceDate(TransactionCase): """Test that we cannot post an inventory before the lock date. """ self.env.user.company_id.force_inventory_lock_date = '2015-01-01' - to_date = '2013-02-01 00:00:00' + to_date = datetime(2013, 2, 1, 0, 0, 0, 0) inventory = self.obj_inventory.create({ 'name': 'Test past date', 'location_id': self.test_loc.id, 'filter': 'none', 'force_inventory_date': True, 'date': to_date, - 'accounting_date': to_date, + 'accounting_date': to_date.date(), 'line_ids': [ (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 1.0, 'location_id': self.test_loc.id, }), ], }) with self.assertRaises(ValidationError): - inventory.action_done() + inventory.action_validate() def test_03(self): - to_date = '2013-02-01 00:00:00' + to_date = datetime(2013, 2, 1, 0, 0, 0, 0) self.env['product.price.history'].create({ 'product_id': self.product1.id, 'datetime': to_date, @@ -273,18 +274,18 @@ class TestStockInventoryForceDate(TransactionCase): 'filter': 'none', 'force_inventory_date': True, 'date': to_date, - 'accounting_date': to_date, + 'accounting_date': to_date.date(), 'line_ids': [ (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 100.0, 'location_id': self.test_loc.id, }), ], }) - inventory.action_done() + inventory.action_validate() picking = self.env['stock.picking'].with_context( ).create({ 'picking_type_id': self.picking_type_id.id, @@ -322,25 +323,25 @@ class TestStockInventoryForceDate(TransactionCase): 'filter': 'none', 'force_inventory_date': True, 'date': to_date, - 'accounting_date': to_date, + 'accounting_date': to_date.date(), 'line_ids': [ (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 0.0, 'location_id': self.test_loc.id, }), ], }) - inventory.action_done() + inventory.action_validate() self.assertEqual(move.reserved_availability, 0.0) def test_04(self): # Test introducing 100 units in the past and adjusting to 0 today. # If we make then an inventory adjustment again in the past the # theoretical quantity should be 100. - to_date = '2013-02-01 00:00:00' + to_date = datetime(2013, 2, 1, 0, 0, 0, 0) self.env['product.price.history'].create({ 'product_id': self.product1.id, 'datetime': to_date, @@ -353,18 +354,18 @@ class TestStockInventoryForceDate(TransactionCase): 'filter': 'none', 'force_inventory_date': True, 'date': to_date, - 'accounting_date': to_date, + 'accounting_date': to_date.date(), 'line_ids': [ (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 100.0, 'location_id': self.test_loc.id, }), ], }) - inventory.action_done() + inventory.action_validate() inventory = self.obj_inventory.create({ 'name': 'Test past date', 'location_id': self.test_loc.id, @@ -373,25 +374,25 @@ class TestStockInventoryForceDate(TransactionCase): (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 0.0, 'location_id': self.test_loc.id, }), ], }) - inventory.action_done() + inventory.action_validate() inventory = self.obj_inventory.create({ 'name': 'Test past date', 'location_id': self.test_loc.id, 'filter': 'none', 'force_inventory_date': True, 'date': to_date, - 'accounting_date': to_date, + 'accounting_date': to_date.date(), 'line_ids': [ (0, 0, { 'product_id': self.product1.id, 'product_uom_id': self.env.ref( - "product.product_uom_unit").id, + "uom.product_uom_unit").id, 'product_qty': 0.0, 'location_id': self.test_loc.id, }), @@ -405,3 +406,24 @@ class TestStockInventoryForceDate(TransactionCase): lambda l: l.product_id == self.product1): self.assertEqual(line.theoretical_qty, qty_available) self.assertEqual(line.theoretical_qty, 100) + + def test_onchange_accounting_date(self): + to_date = datetime(2013, 2, 1, 0, 0, 0, 0) + inventory = self.obj_inventory.create({ + 'name': 'Test past date', + 'location_id': self.test_loc.id, + 'filter': 'none', + 'force_inventory_date': True, + 'date': to_date, + 'line_ids': [ + (0, 0, { + 'product_id': self.product1.id, + 'product_uom_id': self.env.ref( + "uom.product_uom_unit").id, + 'product_qty': 0.0, + 'location_id': self.test_loc.id, + }), + ], + }) + inventory._onchange_force_inventory_date() + self.assertEqual(inventory.accounting_date, to_date.date())