From 92445cb0a537991f70baffb595eaf92664ccd6ca Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Sat, 22 Jun 2024 08:02:52 +0000 Subject: [PATCH 1/5] [4657][ADD] stock_account_product_fun_fifo_hook --- .../stock_account_product_run_fifo_hook | 1 + .../setup.py | 6 + .../README.rst | 88 ++++ .../__init__.py | 3 + .../__manifest__.py | 15 + stock_account_product_run_fifo_hook/hooks.py | 344 ++++++++++++++ .../i18n/es.po | 29 ++ .../i18n/it.po | 29 ++ .../stock_account_product_run_fifo_hook.pot | 26 ++ .../model/__init__.py | 1 + .../model/product.py | 39 ++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 3 + .../readme/USAGE.rst | 4 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 438 ++++++++++++++++++ 16 files changed, 1029 insertions(+) create mode 120000 setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook create mode 100644 setup/stock_account_product_run_fifo_hook/setup.py create mode 100644 stock_account_product_run_fifo_hook/README.rst create mode 100644 stock_account_product_run_fifo_hook/__init__.py create mode 100644 stock_account_product_run_fifo_hook/__manifest__.py create mode 100644 stock_account_product_run_fifo_hook/hooks.py create mode 100644 stock_account_product_run_fifo_hook/i18n/es.po create mode 100644 stock_account_product_run_fifo_hook/i18n/it.po create mode 100644 stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot create mode 100644 stock_account_product_run_fifo_hook/model/__init__.py create mode 100644 stock_account_product_run_fifo_hook/model/product.py create mode 100644 stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst create mode 100644 stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst create mode 100644 stock_account_product_run_fifo_hook/readme/USAGE.rst create mode 100644 stock_account_product_run_fifo_hook/static/description/icon.png create mode 100644 stock_account_product_run_fifo_hook/static/description/index.html diff --git a/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook b/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook new file mode 120000 index 00000000..b6ef553c --- /dev/null +++ b/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook @@ -0,0 +1 @@ +../../../../stock_account_product_run_fifo_hook \ No newline at end of file diff --git a/setup/stock_account_product_run_fifo_hook/setup.py b/setup/stock_account_product_run_fifo_hook/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/stock_account_product_run_fifo_hook/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_account_product_run_fifo_hook/README.rst b/stock_account_product_run_fifo_hook/README.rst new file mode 100644 index 00000000..15e52b8e --- /dev/null +++ b/stock_account_product_run_fifo_hook/README.rst @@ -0,0 +1,88 @@ +=================================== +Stock Account Product Run FIFO Hook +=================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:ff6788879f9b019db4cc15ff824e449375401e5224dc1a192a79c080071b26a8 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-workflow/tree/16.0/stock_account_product_run_fifo_hook + :alt: OCA/stock-logistics-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-16-0/stock-logistics-workflow-16-0-stock_account_product_run_fifo_hook + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-workflow&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds hook points in product_product._run_fifo in order +to add more flexibility in the information that is stored in the fifo +candidates. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +#. Add dependency of this module +#. Inherit from 'product.product' +#. Change the _run_fifo_prepare_candidate_update function in order to + return an updated logic. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* Forgeflow (https://www.forgeflow.com) + + * 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-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_account_product_run_fifo_hook/__init__.py b/stock_account_product_run_fifo_hook/__init__.py new file mode 100644 index 00000000..aaaf068d --- /dev/null +++ b/stock_account_product_run_fifo_hook/__init__.py @@ -0,0 +1,3 @@ +from . import model + +from .hooks import post_load_hook diff --git a/stock_account_product_run_fifo_hook/__manifest__.py b/stock_account_product_run_fifo_hook/__manifest__.py new file mode 100644 index 00000000..26165066 --- /dev/null +++ b/stock_account_product_run_fifo_hook/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2020 ForgeFlow, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). + +{ + "name": "Stock Account Product Run FIFO Hook", + "summary": "Add more flexibility in the run fifo method.", + "author": "ForgeFlow, Odoo Community Association (OCA)", + "version": "16.0.2.0.0", + "category": "Warehouse Management", + "website": "https://github.com/OCA/stock-logistics-workflow", + "license": "LGPL-3", + "depends": ["stock_account"], + "installable": True, + "post_load": "post_load_hook", +} diff --git a/stock_account_product_run_fifo_hook/hooks.py b/stock_account_product_run_fifo_hook/hooks.py new file mode 100644 index 00000000..17223ae2 --- /dev/null +++ b/stock_account_product_run_fifo_hook/hooks.py @@ -0,0 +1,344 @@ +# Copyright 2020 ForgeFlow, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from collections import defaultdict +from datetime import datetime + +from odoo import _ +from odoo.tools import float_is_zero + +from odoo.addons.stock_account.models.product import ProductProduct +from odoo.addons.stock_account.models.stock_move import StockMove + + +# flake8: noqa: C901 +def post_load_hook(): + def _run_fifo_new(self, quantity, company): + if not hasattr(self, "_run_fifo_prepare_candidate_update"): + return self._run_fifo_original(quantity, company) + + self.ensure_one() + + # Find back incoming stock valuation layers (called candidates here) + # to value `quantity`. + qty_to_take_on_candidates = quantity + # START HOOK Search Candidates + candidates_domain = self._get_candidates_domain(company) + candidates = self.env["stock.valuation.layer"].sudo().search(candidates_domain) + # END HOOK Search Candidates + new_standard_price = 0 + tmp_value = 0 # to accumulate the value taken on the candidates + taken_data = {} + for candidate in candidates: + qty_taken_on_candidate = min( + qty_to_take_on_candidates, candidate.remaining_qty + ) + taken_data[candidate.id] = {"quantity": qty_taken_on_candidate} + candidate_unit_cost = candidate.remaining_value / candidate.remaining_qty + new_standard_price = candidate_unit_cost + value_taken_on_candidate = qty_taken_on_candidate * candidate_unit_cost + value_taken_on_candidate = candidate.currency_id.round( + value_taken_on_candidate + ) + taken_data[candidate.id].update( + { + "value": value_taken_on_candidate, + } + ) + new_remaining_value = candidate.remaining_value - value_taken_on_candidate + candidate_vals = { + "remaining_qty": candidate.remaining_qty - qty_taken_on_candidate, + "remaining_value": new_remaining_value, + } + # Start Hook Prepare Candidate + candidate_vals = self._run_fifo_prepare_candidate_update( + candidate, + qty_taken_on_candidate, + value_taken_on_candidate, + candidate_vals, + ) + # End Hook Prepare Candidate + candidate.write(candidate_vals) + + qty_to_take_on_candidates -= qty_taken_on_candidate + tmp_value += value_taken_on_candidate + if float_is_zero( + qty_to_take_on_candidates, precision_rounding=self.uom_id.rounding + ): + if float_is_zero( + candidate.remaining_qty, precision_rounding=self.uom_id.rounding + ): + next_candidates = candidates.filtered( + lambda svl: svl.remaining_qty > 0 + ) + new_standard_price = ( + next_candidates + and next_candidates[0].unit_cost + or new_standard_price + ) + break + + # Update the standard price with the price of the last used candidate, + # if any. + # START HOOK update standard price + if hasattr(self, "_price_updateable"): + if self._price_updateable(new_standard_price): + self.sudo().with_company(company.id).with_context( + disable_auto_svl=True + ).standard_price = new_standard_price + else: + if new_standard_price and self.cost_method == "fifo": + self.sudo().with_company(company.id).with_context( + disable_auto_svl=True + ).standard_price = new_standard_price + # END HOOK update standard price + # If there's still quantity to value but we're out of candidates, + # we fall in the + # negative stock use case. We chose to value the out move at the price + # of the + # last out and a correction entry will be made once `_fifo_vacuum` + # is called. + vals = {} + if float_is_zero( + qty_to_take_on_candidates, precision_rounding=self.uom_id.rounding + ): + vals = { + "value": -tmp_value, + "unit_cost": tmp_value / quantity, + "taken_data": taken_data, + } + else: + assert qty_to_take_on_candidates > 0 + last_fifo_price = new_standard_price or self.standard_price + negative_stock_value = last_fifo_price * -qty_to_take_on_candidates + tmp_value += abs(negative_stock_value) + vals = { + "remaining_qty": -qty_to_take_on_candidates, + "value": -tmp_value, + "unit_cost": last_fifo_price, + } + return vals + + if not hasattr(ProductProduct, "_run_fifo_original"): + ProductProduct._run_fifo_original = ProductProduct._run_fifo + ProductProduct._run_fifo = _run_fifo_new + + def _run_fifo_vacuum_new(self, company=None): + if not hasattr(self, "_run_fifo_prepare_candidate_update"): + return self._run_fifo_vacuum_original(company=company) + if company is None: + company = self.env.company + ValuationLayer = self.env["stock.valuation.layer"] + svls_to_vacuum_by_product = defaultdict(lambda: ValuationLayer) + res = ValuationLayer.sudo().read_group( + [ + ("product_id", "in", self.ids), + ("remaining_qty", "<", 0), + ("stock_move_id", "!=", False), + ("company_id", "=", company.id), + ], + ["ids:array_agg(id)", "create_date:min"], + ["product_id"], + orderby="create_date, id", + ) + min_create_date = datetime.max + for group in res: + svls_to_vacuum_by_product[group["product_id"][0]] = ValuationLayer.browse( + group["ids"] + ) + min_create_date = min(min_create_date, group["create_date"]) + all_candidates_by_product = defaultdict(lambda: ValuationLayer) + domain = [ + ("product_id", "in", self.ids), + ("remaining_qty", ">", 0), + ("company_id", "=", company.id), + ("create_date", ">=", min_create_date), + ] + if self.env.context.get("use_past_svl", False): + domain = domain[:2] + res = ValuationLayer.sudo().read_group( + domain, + ["ids:array_agg(id)"], + ["product_id"], + orderby="id", + ) + for group in res: + all_candidates_by_product[group["product_id"][0]] = ValuationLayer.browse( + group["ids"] + ) + + new_svl_vals_real_time = [] + new_svl_vals_manual = [] + real_time_svls_to_vacuum = ValuationLayer + + for product in self: + all_candidates = all_candidates_by_product[product.id] + current_real_time_svls = ValuationLayer + for svl_to_vacuum in svls_to_vacuum_by_product[product.id]: + # We don't use search to avoid executing _flush_search and to decrease interaction with DB + candidates = all_candidates.filtered( + lambda r: r.create_date > svl_to_vacuum.create_date + or r.create_date == svl_to_vacuum.create_date + and r.id > svl_to_vacuum.id + ) + if not candidates: + break + qty_to_take_on_candidates = abs(svl_to_vacuum.remaining_qty) + qty_taken_on_candidates = 0 + tmp_value = 0 + taken_data = {} + for candidate in candidates: + qty_taken_on_candidate = min( + candidate.remaining_qty, qty_to_take_on_candidates + ) + qty_taken_on_candidates += qty_taken_on_candidate + + taken_data[candidate.id] = {"quantity": qty_taken_on_candidate} + + candidate_unit_cost = ( + candidate.remaining_value / candidate.remaining_qty + ) + value_taken_on_candidate = ( + qty_taken_on_candidate * candidate_unit_cost + ) + value_taken_on_candidate = candidate.currency_id.round( + value_taken_on_candidate + ) + + taken_data[candidate.id].update( + { + "value": value_taken_on_candidate, + } + ) + + new_remaining_value = ( + candidate.remaining_value - value_taken_on_candidate + ) + + candidate_vals = { + "remaining_qty": candidate.remaining_qty + - qty_taken_on_candidate, + "remaining_value": new_remaining_value, + } + # Start Hook + candidate_vals = self._run_fifo_vacuum_prepare_candidate_update( + svl_to_vacuum, + candidate, + qty_taken_on_candidate, + value_taken_on_candidate, + candidate_vals, + ) + # End Hook + candidate.write(candidate_vals) + if not (candidate.remaining_qty > 0): + all_candidates -= candidate + + qty_to_take_on_candidates -= qty_taken_on_candidate + tmp_value += value_taken_on_candidate + if float_is_zero( + qty_to_take_on_candidates, + precision_rounding=product.uom_id.rounding, + ): + break + + # Get the estimated value we will correct. + remaining_value_before_vacuum = ( + svl_to_vacuum.unit_cost * qty_taken_on_candidates + ) + new_remaining_qty = ( + svl_to_vacuum.remaining_qty + qty_taken_on_candidates + ) + corrected_value = remaining_value_before_vacuum - tmp_value + svl_to_vacuum.with_context(taken_data=taken_data).write( + { + "remaining_qty": new_remaining_qty, + } + ) + + # Don't create a layer or an accounting entry if the corrected value is zero. + if svl_to_vacuum.currency_id.is_zero(corrected_value): + continue + + corrected_value = svl_to_vacuum.currency_id.round(corrected_value) + + move = svl_to_vacuum.stock_move_id + new_svl_vals = ( + new_svl_vals_real_time + if product.valuation == "real_time" + else new_svl_vals_manual + ) + new_svl_vals.append( + { + "product_id": product.id, + "value": corrected_value, + "unit_cost": 0, + "quantity": 0, + "remaining_qty": 0, + "stock_move_id": move.id, + "company_id": move.company_id.id, + "description": "Revaluation of %s (negative inventory)" + % (move.picking_id.name or move.name), + "stock_valuation_layer_id": svl_to_vacuum.id, + } + ) + if product.valuation == "real_time": + current_real_time_svls |= svl_to_vacuum + real_time_svls_to_vacuum |= current_real_time_svls + ValuationLayer.sudo().create(new_svl_vals_manual) + vacuum_svls = ValuationLayer.sudo().create(new_svl_vals_real_time) + + # If some negative stock were fixed, we need to recompute the standard price. + for product in self: + product = product.with_company(company.id) + if product.cost_method == "average" and not float_is_zero( + product.quantity_svl, precision_rounding=product.uom_id.rounding + ): + product.sudo().with_context(disable_auto_svl=True).write( + {"standard_price": product.value_svl / product.quantity_svl} + ) + + vacuum_svls._validate_accounting_entries() + self._create_fifo_vacuum_anglo_saxon_expense_entries( + zip(vacuum_svls, real_time_svls_to_vacuum) + ) + + if not hasattr(ProductProduct, "_run_fifo_vacuum_original"): + ProductProduct._run_fifo_vacuum_original = ProductProduct._run_fifo_vacuum + ProductProduct._run_fifo_vacuum = _run_fifo_vacuum_new + + def _create_out_svl_new(self, forced_quantity=None): + """Create a `stock.valuation.layer` from `self`. + + :param forced_quantity: under some circunstances, the quantity to value is different than + the initial demand of the move (Default value = None) + """ + svl_vals_list = [] + for move in self: + move = move.with_company(move.company_id) + valued_move_lines = move._get_out_move_lines() + 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, move.product_id.uom_id + ) + if float_is_zero( + forced_quantity or valued_quantity, + precision_rounding=move.product_id.uom_id.rounding, + ): + continue + svl_vals = move.product_id.with_context( + move_requestor=move.id + )._prepare_out_svl_vals(forced_quantity or valued_quantity, move.company_id) + svl_vals.update(move._prepare_common_svl_vals()) + if forced_quantity: + svl_vals["description"] = ( + _("Correction of %s (modification of past move)") + % move.picking_id.name + or move.name + ) + svl_vals["description"] += svl_vals.pop("rounding_adjustment", "") + svl_vals_list.append(svl_vals) + return self.env["stock.valuation.layer"].sudo().create(svl_vals_list) + + if not hasattr(StockMove, "_create_out_svl_original"): + StockMove._create_out_svl_original = StockMove._create_out_svl + StockMove._create_out_svl = _create_out_svl_new diff --git a/stock_account_product_run_fifo_hook/i18n/es.po b/stock_account_product_run_fifo_hook/i18n/es.po new file mode 100644 index 00000000..5ecc76a2 --- /dev/null +++ b/stock_account_product_run_fifo_hook/i18n/es.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_account_product_run_fifo_hook +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2024-01-30 13:35+0000\n" +"Last-Translator: Ivorra78 \n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: stock_account_product_run_fifo_hook +#. odoo-python +#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 +#, python-format +msgid "Correction of %s (modification of past move)" +msgstr "Corrección de %s (modificación del movimiento anterior)" + +#. module: stock_account_product_run_fifo_hook +#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product +msgid "Product Variant" +msgstr "Variante del Producto" diff --git a/stock_account_product_run_fifo_hook/i18n/it.po b/stock_account_product_run_fifo_hook/i18n/it.po new file mode 100644 index 00000000..47eb27eb --- /dev/null +++ b/stock_account_product_run_fifo_hook/i18n/it.po @@ -0,0 +1,29 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_account_product_run_fifo_hook +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-11-17 09:33+0000\n" +"Last-Translator: mymage \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: stock_account_product_run_fifo_hook +#. odoo-python +#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 +#, python-format +msgid "Correction of %s (modification of past move)" +msgstr "Correzione di %s (modificha dei vecchi movimenti)" + +#. module: stock_account_product_run_fifo_hook +#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product +msgid "Product Variant" +msgstr "Variante prodotto" diff --git a/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot b/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot new file mode 100644 index 00000000..d1fcb9a7 --- /dev/null +++ b/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * stock_account_product_run_fifo_hook +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.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_product_run_fifo_hook +#. odoo-python +#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 +#, python-format +msgid "Correction of %s (modification of past move)" +msgstr "" + +#. module: stock_account_product_run_fifo_hook +#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product +msgid "Product Variant" +msgstr "" diff --git a/stock_account_product_run_fifo_hook/model/__init__.py b/stock_account_product_run_fifo_hook/model/__init__.py new file mode 100644 index 00000000..9649db77 --- /dev/null +++ b/stock_account_product_run_fifo_hook/model/__init__.py @@ -0,0 +1 @@ +from . import product diff --git a/stock_account_product_run_fifo_hook/model/product.py b/stock_account_product_run_fifo_hook/model/product.py new file mode 100644 index 00000000..b1e9b5ac --- /dev/null +++ b/stock_account_product_run_fifo_hook/model/product.py @@ -0,0 +1,39 @@ +# Copyright 2020 ForgeFlow, S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). +from odoo import models + + +class ProductProduct(models.Model): + _inherit = "product.product" + + def _run_fifo_prepare_candidate_update( + self, + candidate, + qty_taken_on_candidate, + value_taken_on_candidate, + candidate_vals, + ): + self.ensure_one() + return candidate_vals + + def _run_fifo_vacuum_prepare_candidate_update( + self, + svl_to_vacuum, + candidate, + qty_taken_on_candidate, + value_taken_on_candidate, + candidate_vals, + ): + return candidate_vals + + def _get_candidates_domain(self, company): + candidates_domain = [ + ("product_id", "=", self.id), + ("remaining_qty", ">", 0), + ("company_id", "=", company.id), + ] + return candidates_domain + + def _price_updateable(self, new_standard_price=False): + self.ensure_one() + return new_standard_price and self.cost_method == "fifo" diff --git a/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst b/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..54eb248a --- /dev/null +++ b/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Forgeflow (https://www.forgeflow.com) + + * Jordi Ballester Alomar diff --git a/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst b/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst new file mode 100644 index 00000000..b37d36c6 --- /dev/null +++ b/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module adds hook points in product_product._run_fifo in order +to add more flexibility in the information that is stored in the fifo +candidates. diff --git a/stock_account_product_run_fifo_hook/readme/USAGE.rst b/stock_account_product_run_fifo_hook/readme/USAGE.rst new file mode 100644 index 00000000..2f378ad6 --- /dev/null +++ b/stock_account_product_run_fifo_hook/readme/USAGE.rst @@ -0,0 +1,4 @@ +#. Add dependency of this module +#. Inherit from 'product.product' +#. Change the _run_fifo_prepare_candidate_update function in order to + return an updated logic. diff --git a/stock_account_product_run_fifo_hook/static/description/icon.png b/stock_account_product_run_fifo_hook/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/stock_account_product_run_fifo_hook/static/description/index.html b/stock_account_product_run_fifo_hook/static/description/index.html new file mode 100644 index 00000000..503ca448 --- /dev/null +++ b/stock_account_product_run_fifo_hook/static/description/index.html @@ -0,0 +1,438 @@ + + + + + +Stock Account Product Run FIFO Hook + + + +
+

Stock Account Product Run FIFO Hook

+ + +

Beta License: LGPL-3 OCA/stock-logistics-workflow Translate me on Weblate Try me on Runboat

+

This module adds hook points in product_product._run_fifo in order +to add more flexibility in the information that is stored in the fifo +candidates.

+

Table of contents

+ +
+

Usage

+
    +
  1. Add dependency of this module
    2. +
  2. Inherit from ‘product.product’
    3. +
  3. Change the _run_fifo_prepare_candidate_update function in order to +return an updated logic.
    4. +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
+
+
+

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-workflow project on GitHub.

+

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

+
+
+
+ + From 184b703f317ba8dfbde0e113e91a4ee29304a3f2 Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Sat, 22 Jun 2024 08:35:48 +0000 Subject: [PATCH 2/5] add stock_account_fifo_return_origin --- .../addons/stock_account_fifo_return_origin | 1 + .../stock_account_fifo_return_origin/setup.py | 6 + stock_account_fifo_return_origin/README.rst | 70 +++ stock_account_fifo_return_origin/__init__.py | 1 + .../__manifest__.py | 11 + .../models/__init__.py | 3 + .../models/product.py | 19 + .../models/stock_move.py | 19 + .../models/stock_move_line.py | 14 + .../readme/DESCRIPTION.rst | 3 + .../static/description/index.html | 414 ++++++++++++++++++ stock_account_product_run_fifo_hook/hooks.py | 5 +- .../model/product.py | 4 + 13 files changed, 568 insertions(+), 2 deletions(-) create mode 120000 setup/stock_account_fifo_return_origin/odoo/addons/stock_account_fifo_return_origin create mode 100644 setup/stock_account_fifo_return_origin/setup.py create mode 100644 stock_account_fifo_return_origin/README.rst create mode 100644 stock_account_fifo_return_origin/__init__.py create mode 100644 stock_account_fifo_return_origin/__manifest__.py create mode 100644 stock_account_fifo_return_origin/models/__init__.py create mode 100644 stock_account_fifo_return_origin/models/product.py create mode 100644 stock_account_fifo_return_origin/models/stock_move.py create mode 100644 stock_account_fifo_return_origin/models/stock_move_line.py create mode 100644 stock_account_fifo_return_origin/readme/DESCRIPTION.rst create mode 100644 stock_account_fifo_return_origin/static/description/index.html diff --git a/setup/stock_account_fifo_return_origin/odoo/addons/stock_account_fifo_return_origin b/setup/stock_account_fifo_return_origin/odoo/addons/stock_account_fifo_return_origin new file mode 120000 index 00000000..7d12f69a --- /dev/null +++ b/setup/stock_account_fifo_return_origin/odoo/addons/stock_account_fifo_return_origin @@ -0,0 +1 @@ +../../../../stock_account_fifo_return_origin \ No newline at end of file diff --git a/setup/stock_account_fifo_return_origin/setup.py b/setup/stock_account_fifo_return_origin/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/stock_account_fifo_return_origin/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/stock_account_fifo_return_origin/README.rst b/stock_account_fifo_return_origin/README.rst new file mode 100644 index 00000000..f0d2ba10 --- /dev/null +++ b/stock_account_fifo_return_origin/README.rst @@ -0,0 +1,70 @@ +================================ +Stock Account FIFO Return Origin +================================ + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/stock-logistics-workflow/tree/16.0/stock_account_fifo_return_origin + :alt: OCA/stock-logistics-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-16-0/stock-logistics-workflow-16-0-stock_account_fifo_return_origin + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/154/16.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module makes adjustment to the standard behavior with regards to candidate SVLs +that are used in purchase returns; if the SVL linked to the origin move (receipt) has +remaining quantity, that SVL should be consumed first. + +**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 +~~~~~~~ + +* Quartile Limited + +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-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_account_fifo_return_origin/__init__.py b/stock_account_fifo_return_origin/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/stock_account_fifo_return_origin/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/stock_account_fifo_return_origin/__manifest__.py b/stock_account_fifo_return_origin/__manifest__.py new file mode 100644 index 00000000..42fe4fa8 --- /dev/null +++ b/stock_account_fifo_return_origin/__manifest__.py @@ -0,0 +1,11 @@ +# Copyright 2024 Quartile (https://www.quartile.co) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Stock Account FIFO Return Origin", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "Quartile Limited, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/stock-logistics-workflow", + "depends": ["stock_account_product_run_fifo_hook"], +} diff --git a/stock_account_fifo_return_origin/models/__init__.py b/stock_account_fifo_return_origin/models/__init__.py new file mode 100644 index 00000000..b834c96a --- /dev/null +++ b/stock_account_fifo_return_origin/models/__init__.py @@ -0,0 +1,3 @@ +from . import product +from . import stock_move +from . import stock_move_line diff --git a/stock_account_fifo_return_origin/models/product.py b/stock_account_fifo_return_origin/models/product.py new file mode 100644 index 00000000..15b81d19 --- /dev/null +++ b/stock_account_fifo_return_origin/models/product.py @@ -0,0 +1,19 @@ +# Copyright 2024 Quartile (https://www.quartile.co) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class Product(models.Model): + _inherit = "product.product" + + def _get_candidates(self, company): + candidates = super()._get_candidates(company) + returned_moves = self._context.get("origin_returned_moves") + if not returned_moves: + return candidates + origin_svl = returned_moves.filtered( + lambda x: x.product_id == self + ).stock_valuation_layer_ids + candidates = origin_svl | candidates + return candidates diff --git a/stock_account_fifo_return_origin/models/stock_move.py b/stock_account_fifo_return_origin/models/stock_move.py new file mode 100644 index 00000000..ddc109f2 --- /dev/null +++ b/stock_account_fifo_return_origin/models/stock_move.py @@ -0,0 +1,19 @@ +# Copyright 2024 Quartile (https://www.quartile.co) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class StockMove(models.Model): + _inherit = "stock.move" + + def _action_done(self, cancel_backorder=False): + origin_returned_moves = self.browse() + for move in self: + if move._is_out(): + origin_returned_moves |= move.origin_returned_move_id + # We cannot assign origin returned move context to individual moves, therefore + # assign them all to self + if origin_returned_moves: + self = self.with_context(origin_returned_moves=origin_returned_moves) + return super()._action_done(cancel_backorder) diff --git a/stock_account_fifo_return_origin/models/stock_move_line.py b/stock_account_fifo_return_origin/models/stock_move_line.py new file mode 100644 index 00000000..a75398d3 --- /dev/null +++ b/stock_account_fifo_return_origin/models/stock_move_line.py @@ -0,0 +1,14 @@ +# Copyright 2024 Quartile (https://www.quartile.co) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class StockMoveLine(models.Model): + _inherit = "stock.move.line" + + @api.model + def _create_correction_svl(self, move, diff): + if move._is_in() and diff < 0: + move = move.with_context(origin_returned_moves=move) + return super()._create_correction_svl(move, diff) diff --git a/stock_account_fifo_return_origin/readme/DESCRIPTION.rst b/stock_account_fifo_return_origin/readme/DESCRIPTION.rst new file mode 100644 index 00000000..94d5d00a --- /dev/null +++ b/stock_account_fifo_return_origin/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +This module makes adjustment to the standard behavior with regards to candidate SVLs +that are used in purchase returns; if the SVL linked to the origin move (receipt) has +remaining quantity, that SVL should be consumed first. diff --git a/stock_account_fifo_return_origin/static/description/index.html b/stock_account_fifo_return_origin/static/description/index.html new file mode 100644 index 00000000..1633d0e8 --- /dev/null +++ b/stock_account_fifo_return_origin/static/description/index.html @@ -0,0 +1,414 @@ + + + + + + +Stock Account FIFO Return Origin + + + +
+

Stock Account FIFO Return Origin

+ + +

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

+

This module makes adjustment to the standard behavior with regards to candidate SVLs +that are used in purchase returns; if the SVL linked to the origin move (receipt) has +remaining quantity, that SVL should be consumed first.

+

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

+
    +
  • Quartile Limited
    • +
+
+
+

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-workflow project on GitHub.

+

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

+
+
+
+ + diff --git a/stock_account_product_run_fifo_hook/hooks.py b/stock_account_product_run_fifo_hook/hooks.py index 17223ae2..6944d939 100644 --- a/stock_account_product_run_fifo_hook/hooks.py +++ b/stock_account_product_run_fifo_hook/hooks.py @@ -22,8 +22,7 @@ def _run_fifo_new(self, quantity, company): # to value `quantity`. qty_to_take_on_candidates = quantity # START HOOK Search Candidates - candidates_domain = self._get_candidates_domain(company) - candidates = self.env["stock.valuation.layer"].sudo().search(candidates_domain) + candidates = self._get_candidates(company) # END HOOK Search Candidates new_standard_price = 0 tmp_value = 0 # to accumulate the value taken on the candidates @@ -336,6 +335,8 @@ def _create_out_svl_new(self, forced_quantity=None): or move.name ) svl_vals["description"] += svl_vals.pop("rounding_adjustment", "") + # TODO: Find the right way to handle this. + svl_vals.pop("taken_data") svl_vals_list.append(svl_vals) return self.env["stock.valuation.layer"].sudo().create(svl_vals_list) diff --git a/stock_account_product_run_fifo_hook/model/product.py b/stock_account_product_run_fifo_hook/model/product.py index b1e9b5ac..77e9425e 100644 --- a/stock_account_product_run_fifo_hook/model/product.py +++ b/stock_account_product_run_fifo_hook/model/product.py @@ -34,6 +34,10 @@ def _get_candidates_domain(self, company): ] return candidates_domain + def _get_candidates(self, company): + candidates_domain = self._get_candidates_domain(company) + return self.env["stock.valuation.layer"].sudo().search(candidates_domain) + def _price_updateable(self, new_standard_price=False): self.ensure_one() return new_standard_price and self.cost_method == "fifo" From ad7237e40123181a36d249f6429f0481ef3e9853 Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Fri, 5 Jul 2024 06:01:38 +0000 Subject: [PATCH 3/5] adj --- .../stock_account_product_run_fifo_hook | 1 - .../setup.py | 6 - .../__manifest__.py | 4 +- .../models/product.py | 4 +- .../README.rst | 88 ---- .../__init__.py | 3 - .../__manifest__.py | 15 - stock_account_product_run_fifo_hook/hooks.py | 345 -------------- .../i18n/es.po | 29 -- .../i18n/it.po | 29 -- .../stock_account_product_run_fifo_hook.pot | 26 -- .../model/__init__.py | 1 - .../model/product.py | 43 -- .../readme/CONTRIBUTORS.rst | 3 - .../readme/DESCRIPTION.rst | 3 - .../readme/USAGE.rst | 4 - .../static/description/icon.png | Bin 9455 -> 0 bytes .../static/description/index.html | 438 ------------------ 18 files changed, 4 insertions(+), 1038 deletions(-) delete mode 120000 setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook delete mode 100644 setup/stock_account_product_run_fifo_hook/setup.py delete mode 100644 stock_account_product_run_fifo_hook/README.rst delete mode 100644 stock_account_product_run_fifo_hook/__init__.py delete mode 100644 stock_account_product_run_fifo_hook/__manifest__.py delete mode 100644 stock_account_product_run_fifo_hook/hooks.py delete mode 100644 stock_account_product_run_fifo_hook/i18n/es.po delete mode 100644 stock_account_product_run_fifo_hook/i18n/it.po delete mode 100644 stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot delete mode 100644 stock_account_product_run_fifo_hook/model/__init__.py delete mode 100644 stock_account_product_run_fifo_hook/model/product.py delete mode 100644 stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst delete mode 100644 stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst delete mode 100644 stock_account_product_run_fifo_hook/readme/USAGE.rst delete mode 100644 stock_account_product_run_fifo_hook/static/description/icon.png delete mode 100644 stock_account_product_run_fifo_hook/static/description/index.html diff --git a/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook b/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook deleted file mode 120000 index b6ef553c..00000000 --- a/setup/stock_account_product_run_fifo_hook/odoo/addons/stock_account_product_run_fifo_hook +++ /dev/null @@ -1 +0,0 @@ -../../../../stock_account_product_run_fifo_hook \ No newline at end of file diff --git a/setup/stock_account_product_run_fifo_hook/setup.py b/setup/stock_account_product_run_fifo_hook/setup.py deleted file mode 100644 index 28c57bb6..00000000 --- a/setup/stock_account_product_run_fifo_hook/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -import setuptools - -setuptools.setup( - setup_requires=['setuptools-odoo'], - odoo_addon=True, -) diff --git a/stock_account_fifo_return_origin/__manifest__.py b/stock_account_fifo_return_origin/__manifest__.py index 42fe4fa8..c4bb6546 100644 --- a/stock_account_fifo_return_origin/__manifest__.py +++ b/stock_account_fifo_return_origin/__manifest__.py @@ -5,7 +5,7 @@ "name": "Stock Account FIFO Return Origin", "version": "16.0.1.0.0", "license": "AGPL-3", - "author": "Quartile Limited, Odoo Community Association (OCA)", + "author": "Quartile, Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-workflow", - "depends": ["stock_account_product_run_fifo_hook"], + "depends": ["stock_account"], } diff --git a/stock_account_fifo_return_origin/models/product.py b/stock_account_fifo_return_origin/models/product.py index 15b81d19..dffec8e5 100644 --- a/stock_account_fifo_return_origin/models/product.py +++ b/stock_account_fifo_return_origin/models/product.py @@ -7,8 +7,8 @@ class Product(models.Model): _inherit = "product.product" - def _get_candidates(self, company): - candidates = super()._get_candidates(company) + def _get_fifo_candidates(self, company): + candidates = super()._get_fifo_candidates(company) returned_moves = self._context.get("origin_returned_moves") if not returned_moves: return candidates diff --git a/stock_account_product_run_fifo_hook/README.rst b/stock_account_product_run_fifo_hook/README.rst deleted file mode 100644 index 15e52b8e..00000000 --- a/stock_account_product_run_fifo_hook/README.rst +++ /dev/null @@ -1,88 +0,0 @@ -=================================== -Stock Account Product Run FIFO Hook -=================================== - -.. - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! This file is generated by oca-gen-addon-readme !! - !! changes will be overwritten. !! - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:ff6788879f9b019db4cc15ff824e449375401e5224dc1a192a79c080071b26a8 - !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - -.. |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-LGPL--3-blue.png - :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html - :alt: License: LGPL-3 -.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--workflow-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-workflow/tree/16.0/stock_account_product_run_fifo_hook - :alt: OCA/stock-logistics-workflow -.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-16-0/stock-logistics-workflow-16-0-stock_account_product_run_fifo_hook - :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-workflow&target_branch=16.0 - :alt: Try me on Runboat - -|badge1| |badge2| |badge3| |badge4| |badge5| - -This module adds hook points in product_product._run_fifo in order -to add more flexibility in the information that is stored in the fifo -candidates. - -**Table of contents** - -.. contents:: - :local: - -Usage -===== - -#. Add dependency of this module -#. Inherit from 'product.product' -#. Change the _run_fifo_prepare_candidate_update function in order to - return an updated logic. - -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 to smash it by providing a detailed and welcomed -`feedback `_. - -Do not contact contributors directly about support or help with technical issues. - -Credits -======= - -Authors -~~~~~~~ - -* ForgeFlow - -Contributors -~~~~~~~~~~~~ - -* Forgeflow (https://www.forgeflow.com) - - * 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-workflow `_ project on GitHub. - -You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_account_product_run_fifo_hook/__init__.py b/stock_account_product_run_fifo_hook/__init__.py deleted file mode 100644 index aaaf068d..00000000 --- a/stock_account_product_run_fifo_hook/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from . import model - -from .hooks import post_load_hook diff --git a/stock_account_product_run_fifo_hook/__manifest__.py b/stock_account_product_run_fifo_hook/__manifest__.py deleted file mode 100644 index 26165066..00000000 --- a/stock_account_product_run_fifo_hook/__manifest__.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2020 ForgeFlow, S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). - -{ - "name": "Stock Account Product Run FIFO Hook", - "summary": "Add more flexibility in the run fifo method.", - "author": "ForgeFlow, Odoo Community Association (OCA)", - "version": "16.0.2.0.0", - "category": "Warehouse Management", - "website": "https://github.com/OCA/stock-logistics-workflow", - "license": "LGPL-3", - "depends": ["stock_account"], - "installable": True, - "post_load": "post_load_hook", -} diff --git a/stock_account_product_run_fifo_hook/hooks.py b/stock_account_product_run_fifo_hook/hooks.py deleted file mode 100644 index 6944d939..00000000 --- a/stock_account_product_run_fifo_hook/hooks.py +++ /dev/null @@ -1,345 +0,0 @@ -# Copyright 2020 ForgeFlow, S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from collections import defaultdict -from datetime import datetime - -from odoo import _ -from odoo.tools import float_is_zero - -from odoo.addons.stock_account.models.product import ProductProduct -from odoo.addons.stock_account.models.stock_move import StockMove - - -# flake8: noqa: C901 -def post_load_hook(): - def _run_fifo_new(self, quantity, company): - if not hasattr(self, "_run_fifo_prepare_candidate_update"): - return self._run_fifo_original(quantity, company) - - self.ensure_one() - - # Find back incoming stock valuation layers (called candidates here) - # to value `quantity`. - qty_to_take_on_candidates = quantity - # START HOOK Search Candidates - candidates = self._get_candidates(company) - # END HOOK Search Candidates - new_standard_price = 0 - tmp_value = 0 # to accumulate the value taken on the candidates - taken_data = {} - for candidate in candidates: - qty_taken_on_candidate = min( - qty_to_take_on_candidates, candidate.remaining_qty - ) - taken_data[candidate.id] = {"quantity": qty_taken_on_candidate} - candidate_unit_cost = candidate.remaining_value / candidate.remaining_qty - new_standard_price = candidate_unit_cost - value_taken_on_candidate = qty_taken_on_candidate * candidate_unit_cost - value_taken_on_candidate = candidate.currency_id.round( - value_taken_on_candidate - ) - taken_data[candidate.id].update( - { - "value": value_taken_on_candidate, - } - ) - new_remaining_value = candidate.remaining_value - value_taken_on_candidate - candidate_vals = { - "remaining_qty": candidate.remaining_qty - qty_taken_on_candidate, - "remaining_value": new_remaining_value, - } - # Start Hook Prepare Candidate - candidate_vals = self._run_fifo_prepare_candidate_update( - candidate, - qty_taken_on_candidate, - value_taken_on_candidate, - candidate_vals, - ) - # End Hook Prepare Candidate - candidate.write(candidate_vals) - - qty_to_take_on_candidates -= qty_taken_on_candidate - tmp_value += value_taken_on_candidate - if float_is_zero( - qty_to_take_on_candidates, precision_rounding=self.uom_id.rounding - ): - if float_is_zero( - candidate.remaining_qty, precision_rounding=self.uom_id.rounding - ): - next_candidates = candidates.filtered( - lambda svl: svl.remaining_qty > 0 - ) - new_standard_price = ( - next_candidates - and next_candidates[0].unit_cost - or new_standard_price - ) - break - - # Update the standard price with the price of the last used candidate, - # if any. - # START HOOK update standard price - if hasattr(self, "_price_updateable"): - if self._price_updateable(new_standard_price): - self.sudo().with_company(company.id).with_context( - disable_auto_svl=True - ).standard_price = new_standard_price - else: - if new_standard_price and self.cost_method == "fifo": - self.sudo().with_company(company.id).with_context( - disable_auto_svl=True - ).standard_price = new_standard_price - # END HOOK update standard price - # If there's still quantity to value but we're out of candidates, - # we fall in the - # negative stock use case. We chose to value the out move at the price - # of the - # last out and a correction entry will be made once `_fifo_vacuum` - # is called. - vals = {} - if float_is_zero( - qty_to_take_on_candidates, precision_rounding=self.uom_id.rounding - ): - vals = { - "value": -tmp_value, - "unit_cost": tmp_value / quantity, - "taken_data": taken_data, - } - else: - assert qty_to_take_on_candidates > 0 - last_fifo_price = new_standard_price or self.standard_price - negative_stock_value = last_fifo_price * -qty_to_take_on_candidates - tmp_value += abs(negative_stock_value) - vals = { - "remaining_qty": -qty_to_take_on_candidates, - "value": -tmp_value, - "unit_cost": last_fifo_price, - } - return vals - - if not hasattr(ProductProduct, "_run_fifo_original"): - ProductProduct._run_fifo_original = ProductProduct._run_fifo - ProductProduct._run_fifo = _run_fifo_new - - def _run_fifo_vacuum_new(self, company=None): - if not hasattr(self, "_run_fifo_prepare_candidate_update"): - return self._run_fifo_vacuum_original(company=company) - if company is None: - company = self.env.company - ValuationLayer = self.env["stock.valuation.layer"] - svls_to_vacuum_by_product = defaultdict(lambda: ValuationLayer) - res = ValuationLayer.sudo().read_group( - [ - ("product_id", "in", self.ids), - ("remaining_qty", "<", 0), - ("stock_move_id", "!=", False), - ("company_id", "=", company.id), - ], - ["ids:array_agg(id)", "create_date:min"], - ["product_id"], - orderby="create_date, id", - ) - min_create_date = datetime.max - for group in res: - svls_to_vacuum_by_product[group["product_id"][0]] = ValuationLayer.browse( - group["ids"] - ) - min_create_date = min(min_create_date, group["create_date"]) - all_candidates_by_product = defaultdict(lambda: ValuationLayer) - domain = [ - ("product_id", "in", self.ids), - ("remaining_qty", ">", 0), - ("company_id", "=", company.id), - ("create_date", ">=", min_create_date), - ] - if self.env.context.get("use_past_svl", False): - domain = domain[:2] - res = ValuationLayer.sudo().read_group( - domain, - ["ids:array_agg(id)"], - ["product_id"], - orderby="id", - ) - for group in res: - all_candidates_by_product[group["product_id"][0]] = ValuationLayer.browse( - group["ids"] - ) - - new_svl_vals_real_time = [] - new_svl_vals_manual = [] - real_time_svls_to_vacuum = ValuationLayer - - for product in self: - all_candidates = all_candidates_by_product[product.id] - current_real_time_svls = ValuationLayer - for svl_to_vacuum in svls_to_vacuum_by_product[product.id]: - # We don't use search to avoid executing _flush_search and to decrease interaction with DB - candidates = all_candidates.filtered( - lambda r: r.create_date > svl_to_vacuum.create_date - or r.create_date == svl_to_vacuum.create_date - and r.id > svl_to_vacuum.id - ) - if not candidates: - break - qty_to_take_on_candidates = abs(svl_to_vacuum.remaining_qty) - qty_taken_on_candidates = 0 - tmp_value = 0 - taken_data = {} - for candidate in candidates: - qty_taken_on_candidate = min( - candidate.remaining_qty, qty_to_take_on_candidates - ) - qty_taken_on_candidates += qty_taken_on_candidate - - taken_data[candidate.id] = {"quantity": qty_taken_on_candidate} - - candidate_unit_cost = ( - candidate.remaining_value / candidate.remaining_qty - ) - value_taken_on_candidate = ( - qty_taken_on_candidate * candidate_unit_cost - ) - value_taken_on_candidate = candidate.currency_id.round( - value_taken_on_candidate - ) - - taken_data[candidate.id].update( - { - "value": value_taken_on_candidate, - } - ) - - new_remaining_value = ( - candidate.remaining_value - value_taken_on_candidate - ) - - candidate_vals = { - "remaining_qty": candidate.remaining_qty - - qty_taken_on_candidate, - "remaining_value": new_remaining_value, - } - # Start Hook - candidate_vals = self._run_fifo_vacuum_prepare_candidate_update( - svl_to_vacuum, - candidate, - qty_taken_on_candidate, - value_taken_on_candidate, - candidate_vals, - ) - # End Hook - candidate.write(candidate_vals) - if not (candidate.remaining_qty > 0): - all_candidates -= candidate - - qty_to_take_on_candidates -= qty_taken_on_candidate - tmp_value += value_taken_on_candidate - if float_is_zero( - qty_to_take_on_candidates, - precision_rounding=product.uom_id.rounding, - ): - break - - # Get the estimated value we will correct. - remaining_value_before_vacuum = ( - svl_to_vacuum.unit_cost * qty_taken_on_candidates - ) - new_remaining_qty = ( - svl_to_vacuum.remaining_qty + qty_taken_on_candidates - ) - corrected_value = remaining_value_before_vacuum - tmp_value - svl_to_vacuum.with_context(taken_data=taken_data).write( - { - "remaining_qty": new_remaining_qty, - } - ) - - # Don't create a layer or an accounting entry if the corrected value is zero. - if svl_to_vacuum.currency_id.is_zero(corrected_value): - continue - - corrected_value = svl_to_vacuum.currency_id.round(corrected_value) - - move = svl_to_vacuum.stock_move_id - new_svl_vals = ( - new_svl_vals_real_time - if product.valuation == "real_time" - else new_svl_vals_manual - ) - new_svl_vals.append( - { - "product_id": product.id, - "value": corrected_value, - "unit_cost": 0, - "quantity": 0, - "remaining_qty": 0, - "stock_move_id": move.id, - "company_id": move.company_id.id, - "description": "Revaluation of %s (negative inventory)" - % (move.picking_id.name or move.name), - "stock_valuation_layer_id": svl_to_vacuum.id, - } - ) - if product.valuation == "real_time": - current_real_time_svls |= svl_to_vacuum - real_time_svls_to_vacuum |= current_real_time_svls - ValuationLayer.sudo().create(new_svl_vals_manual) - vacuum_svls = ValuationLayer.sudo().create(new_svl_vals_real_time) - - # If some negative stock were fixed, we need to recompute the standard price. - for product in self: - product = product.with_company(company.id) - if product.cost_method == "average" and not float_is_zero( - product.quantity_svl, precision_rounding=product.uom_id.rounding - ): - product.sudo().with_context(disable_auto_svl=True).write( - {"standard_price": product.value_svl / product.quantity_svl} - ) - - vacuum_svls._validate_accounting_entries() - self._create_fifo_vacuum_anglo_saxon_expense_entries( - zip(vacuum_svls, real_time_svls_to_vacuum) - ) - - if not hasattr(ProductProduct, "_run_fifo_vacuum_original"): - ProductProduct._run_fifo_vacuum_original = ProductProduct._run_fifo_vacuum - ProductProduct._run_fifo_vacuum = _run_fifo_vacuum_new - - def _create_out_svl_new(self, forced_quantity=None): - """Create a `stock.valuation.layer` from `self`. - - :param forced_quantity: under some circunstances, the quantity to value is different than - the initial demand of the move (Default value = None) - """ - svl_vals_list = [] - for move in self: - move = move.with_company(move.company_id) - valued_move_lines = move._get_out_move_lines() - 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, move.product_id.uom_id - ) - if float_is_zero( - forced_quantity or valued_quantity, - precision_rounding=move.product_id.uom_id.rounding, - ): - continue - svl_vals = move.product_id.with_context( - move_requestor=move.id - )._prepare_out_svl_vals(forced_quantity or valued_quantity, move.company_id) - svl_vals.update(move._prepare_common_svl_vals()) - if forced_quantity: - svl_vals["description"] = ( - _("Correction of %s (modification of past move)") - % move.picking_id.name - or move.name - ) - svl_vals["description"] += svl_vals.pop("rounding_adjustment", "") - # TODO: Find the right way to handle this. - svl_vals.pop("taken_data") - svl_vals_list.append(svl_vals) - return self.env["stock.valuation.layer"].sudo().create(svl_vals_list) - - if not hasattr(StockMove, "_create_out_svl_original"): - StockMove._create_out_svl_original = StockMove._create_out_svl - StockMove._create_out_svl = _create_out_svl_new diff --git a/stock_account_product_run_fifo_hook/i18n/es.po b/stock_account_product_run_fifo_hook/i18n/es.po deleted file mode 100644 index 5ecc76a2..00000000 --- a/stock_account_product_run_fifo_hook/i18n/es.po +++ /dev/null @@ -1,29 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * stock_account_product_run_fifo_hook -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 16.0\n" -"Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2024-01-30 13:35+0000\n" -"Last-Translator: Ivorra78 \n" -"Language-Team: none\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.17\n" - -#. module: stock_account_product_run_fifo_hook -#. odoo-python -#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 -#, python-format -msgid "Correction of %s (modification of past move)" -msgstr "Corrección de %s (modificación del movimiento anterior)" - -#. module: stock_account_product_run_fifo_hook -#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product -msgid "Product Variant" -msgstr "Variante del Producto" diff --git a/stock_account_product_run_fifo_hook/i18n/it.po b/stock_account_product_run_fifo_hook/i18n/it.po deleted file mode 100644 index 47eb27eb..00000000 --- a/stock_account_product_run_fifo_hook/i18n/it.po +++ /dev/null @@ -1,29 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * stock_account_product_run_fifo_hook -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 16.0\n" -"Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-11-17 09:33+0000\n" -"Last-Translator: mymage \n" -"Language-Team: none\n" -"Language: it\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.17\n" - -#. module: stock_account_product_run_fifo_hook -#. odoo-python -#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 -#, python-format -msgid "Correction of %s (modification of past move)" -msgstr "Correzione di %s (modificha dei vecchi movimenti)" - -#. module: stock_account_product_run_fifo_hook -#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product -msgid "Product Variant" -msgstr "Variante prodotto" diff --git a/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot b/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot deleted file mode 100644 index d1fcb9a7..00000000 --- a/stock_account_product_run_fifo_hook/i18n/stock_account_product_run_fifo_hook.pot +++ /dev/null @@ -1,26 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * stock_account_product_run_fifo_hook -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 16.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_product_run_fifo_hook -#. odoo-python -#: code:addons/stock_account_product_run_fifo_hook/hooks.py:0 -#, python-format -msgid "Correction of %s (modification of past move)" -msgstr "" - -#. module: stock_account_product_run_fifo_hook -#: model:ir.model,name:stock_account_product_run_fifo_hook.model_product_product -msgid "Product Variant" -msgstr "" diff --git a/stock_account_product_run_fifo_hook/model/__init__.py b/stock_account_product_run_fifo_hook/model/__init__.py deleted file mode 100644 index 9649db77..00000000 --- a/stock_account_product_run_fifo_hook/model/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import product diff --git a/stock_account_product_run_fifo_hook/model/product.py b/stock_account_product_run_fifo_hook/model/product.py deleted file mode 100644 index 77e9425e..00000000 --- a/stock_account_product_run_fifo_hook/model/product.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020 ForgeFlow, S.L. -# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html). -from odoo import models - - -class ProductProduct(models.Model): - _inherit = "product.product" - - def _run_fifo_prepare_candidate_update( - self, - candidate, - qty_taken_on_candidate, - value_taken_on_candidate, - candidate_vals, - ): - self.ensure_one() - return candidate_vals - - def _run_fifo_vacuum_prepare_candidate_update( - self, - svl_to_vacuum, - candidate, - qty_taken_on_candidate, - value_taken_on_candidate, - candidate_vals, - ): - return candidate_vals - - def _get_candidates_domain(self, company): - candidates_domain = [ - ("product_id", "=", self.id), - ("remaining_qty", ">", 0), - ("company_id", "=", company.id), - ] - return candidates_domain - - def _get_candidates(self, company): - candidates_domain = self._get_candidates_domain(company) - return self.env["stock.valuation.layer"].sudo().search(candidates_domain) - - def _price_updateable(self, new_standard_price=False): - self.ensure_one() - return new_standard_price and self.cost_method == "fifo" diff --git a/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst b/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst deleted file mode 100644 index 54eb248a..00000000 --- a/stock_account_product_run_fifo_hook/readme/CONTRIBUTORS.rst +++ /dev/null @@ -1,3 +0,0 @@ -* Forgeflow (https://www.forgeflow.com) - - * Jordi Ballester Alomar diff --git a/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst b/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst deleted file mode 100644 index b37d36c6..00000000 --- a/stock_account_product_run_fifo_hook/readme/DESCRIPTION.rst +++ /dev/null @@ -1,3 +0,0 @@ -This module adds hook points in product_product._run_fifo in order -to add more flexibility in the information that is stored in the fifo -candidates. diff --git a/stock_account_product_run_fifo_hook/readme/USAGE.rst b/stock_account_product_run_fifo_hook/readme/USAGE.rst deleted file mode 100644 index 2f378ad6..00000000 --- a/stock_account_product_run_fifo_hook/readme/USAGE.rst +++ /dev/null @@ -1,4 +0,0 @@ -#. Add dependency of this module -#. Inherit from 'product.product' -#. Change the _run_fifo_prepare_candidate_update function in order to - return an updated logic. diff --git a/stock_account_product_run_fifo_hook/static/description/icon.png b/stock_account_product_run_fifo_hook/static/description/icon.png deleted file mode 100644 index 3a0328b516c4980e8e44cdb63fd945757ddd132d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I diff --git a/stock_account_product_run_fifo_hook/static/description/index.html b/stock_account_product_run_fifo_hook/static/description/index.html deleted file mode 100644 index 503ca448..00000000 --- a/stock_account_product_run_fifo_hook/static/description/index.html +++ /dev/null @@ -1,438 +0,0 @@ - - - - - -Stock Account Product Run FIFO Hook - - - -
-

Stock Account Product Run FIFO Hook

- - -

Beta License: LGPL-3 OCA/stock-logistics-workflow Translate me on Weblate Try me on Runboat

-

This module adds hook points in product_product._run_fifo in order -to add more flexibility in the information that is stored in the fifo -candidates.

-

Table of contents

- -
-

Usage

-
    -
  1. Add dependency of this module
    2. -
  2. Inherit from ‘product.product’
    3. -
  3. Change the _run_fifo_prepare_candidate_update function in order to -return an updated logic.
    4. -
-
-
-

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 to smash it by providing a detailed and welcomed -feedback.

-

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

-
-
-

Credits

-
-

Authors

-
    -
  • ForgeFlow
    • -
-
-
-

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-workflow project on GitHub.

-

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

-
-
-
- - From 108593a209cd484152401e13521ee84e6b5cec4d Mon Sep 17 00:00:00 2001 From: Aungkokolin1997 Date: Fri, 5 Jul 2024 08:05:09 +0000 Subject: [PATCH 4/5] fix --- stock_account_fifo_return_origin/models/product.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stock_account_fifo_return_origin/models/product.py b/stock_account_fifo_return_origin/models/product.py index dffec8e5..519c5a9a 100644 --- a/stock_account_fifo_return_origin/models/product.py +++ b/stock_account_fifo_return_origin/models/product.py @@ -12,8 +12,9 @@ def _get_fifo_candidates(self, company): returned_moves = self._context.get("origin_returned_moves") if not returned_moves: return candidates - origin_svl = returned_moves.filtered( - lambda x: x.product_id == self - ).stock_valuation_layer_ids + returned_moves = returned_moves.filtered(lambda x: x.product_id == self) + origin_svl = returned_moves.stock_valuation_layer_ids.filtered( + lambda x: x.remaining_qty > 0.00 + ) candidates = origin_svl | candidates return candidates From 6de3b26c021087eade6dac81031352717654514a Mon Sep 17 00:00:00 2001 From: Yoshi Tashiro Date: Mon, 8 Jul 2024 03:55:07 +0000 Subject: [PATCH 5/5] add tests --- stock_account_fifo_return_origin/README.rst | 17 ++-- .../static/description/index.html | 31 +++---- .../tests/__init__.py | 1 + .../test_stock_account_fifo_return_origin.py | 85 +++++++++++++++++++ 4 files changed, 112 insertions(+), 22 deletions(-) create mode 100644 stock_account_fifo_return_origin/tests/__init__.py create mode 100644 stock_account_fifo_return_origin/tests/test_stock_account_fifo_return_origin.py diff --git a/stock_account_fifo_return_origin/README.rst b/stock_account_fifo_return_origin/README.rst index f0d2ba10..f7aa90b0 100644 --- a/stock_account_fifo_return_origin/README.rst +++ b/stock_account_fifo_return_origin/README.rst @@ -2,10 +2,13 @@ Stock Account FIFO Return Origin ================================ -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:f365b070c877cb49d483654699911d0f9d351de248cfca5a6cdf11258d8a7017 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -19,11 +22,11 @@ Stock Account FIFO Return Origin .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png :target: https://translation.odoo-community.org/projects/stock-logistics-workflow-16-0/stock-logistics-workflow-16-0-stock_account_fifo_return_origin :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/154/16.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/stock-logistics-workflow&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| This module makes adjustment to the standard behavior with regards to candidate SVLs that are used in purchase returns; if the SVL linked to the origin move (receipt) has @@ -39,7 +42,7 @@ 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 +If you spotted it first, help us to smash it by providing a detailed and welcomed `feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -50,7 +53,7 @@ Credits Authors ~~~~~~~ -* Quartile Limited +* Quartile Maintainers ~~~~~~~~~~~ diff --git a/stock_account_fifo_return_origin/static/description/index.html b/stock_account_fifo_return_origin/static/description/index.html index 1633d0e8..912eb241 100644 --- a/stock_account_fifo_return_origin/static/description/index.html +++ b/stock_account_fifo_return_origin/static/description/index.html @@ -1,20 +1,19 @@ - - + Stock Account FIFO Return Origin