Merge PR #1173 into 13.0

Signed-off-by JordiBForgeFlow

account_move_line_sale_info/README.rst

@@ -0,0 +1,65 @@
+.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg
+   :target: https://www.gnu.org/licenses/agpl.html
+   :alt: License: AGPL-3
+
+===========================
+Account Move Line Sale Info
+===========================
+
+This module will add the sale order line to journal items.
+
+The ultimate goal is to establish the purchase order line as one of the key
+fields to reconcile the Goods Delivered Not Invoiced accrual account.
+
+
+Usage
+=====
+
+The sale order line will be automatically copied to the journal items.
+
+* When a supplier invoice is created referencing sales orders, the
+  sale order line will be copied to the corresponding journal item.
+
+* When a stock move is validated and generates a journal entry, the sale
+  order line is copied to the account move line.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/92/11.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/account-financial-tools/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.
+
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Aaron Henriquez <ahenriquez@forgeflow.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.

account_move_line_sale_info/__init__.py

@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from .hooks import post_init_hook

account_move_line_sale_info/__manifest__.py

@@ -0,0 +1,20 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Account Move Line Sale Info",
+    "summary": "Introduces the purchase order line to the journal items",
+    "version": "13.0.1.0.0",
+    "author": "ForgeFlow S.L., " "Odoo Community Association (OCA)",
+    "website": "http://www.github.com/OCA/account-financial-tools",
+    "category": "Generic",
+    "depends": [
+        "account_move_line_stock_info",
+        "sale_stock",
+        "stock_account_prepare_anglo_saxon_out_lines_hook",
+    ],
+    "license": "AGPL-3",
+    "data": ["security/account_security.xml", "views/account_move_view.xml"],
+    "installable": True,
+    "post_init_hook": "post_init_hook",
+}

account_move_line_sale_info/hooks.py

@@ -0,0 +1,70 @@
+# Copyright 2019 ForgeFlow S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+
+def post_init_hook(cr, registry):
+
+    """ INIT sale references in acount move line """
+    # FOR stock moves
+    cr.execute(
+        """
+        UPDATE account_move_line aml SET sale_line_id = sm.sale_line_id
+        FROM account_move_line aml2
+        INNER JOIN stock_move sm ON
+        aml2.stock_move_id = sm.id
+        WHERE aml.id = aml2.id;
+    """
+    )
+    # FOR invoices
+    cr.execute(
+        """
+        UPDATE account_move_line aml SET sale_line_id = sol.id
+        FROM account_move_line aml2
+        INNER JOIN account_move am ON
+        am.id = aml2.move_id
+        INNER JOIN sale_order_line_invoice_rel rel ON
+        rel.invoice_line_id = aml2.id
+        INNER JOIN sale_order_line sol ON
+        rel.order_line_id = sol.id
+        AND sol.product_id = aml2.product_id
+        WHERE aml.id = aml2.id;
+    """
+    )
+
+    # NOW we can fill the SO
+    cr.execute(
+        """
+        UPDATE account_move_line aml
+        SET sale_order_id = sol.order_id
+        FROM sale_order_line AS sol
+        WHERE aml.sale_line_id = sol.id
+        RETURNING aml.move_id
+    """
+    )
+
+    # NOW we can fill the lines without invoice_id (Odoo put it very
+    # complicated)
+
+    cr.execute(
+        """
+        UPDATE account_move_line aml
+        SET sale_order_id = so.id
+        FROM sale_order so
+        LEFT JOIN account_move_line aml2
+        ON aml2.sale_order_id = so.id
+        WHERE aml2.move_id = aml.move_id
+    """
+    )
+
+    cr.execute(
+        """
+        update account_move_line aml set sale_line_id = sol.id
+        FROM account_move_line aml2
+        INNER JOIN sale_order so ON
+        so.id = aml2.sale_order_id
+        INNER JOIN sale_order_line sol ON
+        so.id = sol.order_id
+        AND sol.product_id = aml2.product_id
+        WHERE aml.id = aml2.id;
+    """
+    )

account_move_line_sale_info/migrations/13.0.1.0.0/pre-migration.py

@@ -0,0 +1,12 @@
+# Copyright 2020 ForgeFlow <http://www.forgeflow.com>
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from openupgradelib import openupgrade
+
+_field_renames = [
+    ("account.move.line", "account_move_line", "sale_id", "sale_order_id",),
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_fields(env, _field_renames)

account_move_line_sale_info/models/__init__.py

@@ -0,0 +1,5 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import account_move
+from . import sale_order_line
+from . import stock_move

account_move_line_sale_info/models/account_move.py

@@ -0,0 +1,68 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+
+    _inherit = "account.move"
+
+    def _prepare_interim_account_line_vals(self, line, move, debit_interim_account):
+        res = super()._prepare_interim_account_line_vals(
+            line, move, debit_interim_account
+        )
+        if (
+            not res.get("move_id", False)
+            or not res.get("product_id", False)
+            or not res.get("quantity", False)
+        ):
+            return res
+        am = self.env["account.move"].browse(res["move_id"])
+        sale_line_id = am.invoice_line_ids.filtered(
+            lambda il: il.product_id.id == res["product_id"]
+            and il.quantity == res["quantity"]
+        ).mapped("sale_line_id")
+        if sale_line_id and len(sale_line_id) == 1:
+            res["sale_line_id"] = sale_line_id.id
+        return res
+
+    def _prepare_expense_account_line_vals(self, line, move, debit_interim_account):
+        res = super()._prepare_expense_account_line_vals(
+            line, move, debit_interim_account
+        )
+        if (
+            not res.get("move_id", False)
+            or not res.get("product_id", False)
+            or not res.get("quantity", False)
+        ):
+            return res
+        am = self.env["account.move"].browse(res["move_id"])
+        sale_line_id = am.invoice_line_ids.filtered(
+            lambda il: il.product_id.id == res["product_id"]
+            and il.quantity == res["quantity"]
+        ).mapped("sale_line_id")
+        if sale_line_id and len(sale_line_id) == 1:
+            res["sale_line_id"] = sale_line_id.id
+        return res
+
+
+class AccountMoveLine(models.Model):
+
+    _inherit = "account.move.line"
+
+    sale_line_id = fields.Many2one(
+        comodel_name="sale.order.line",
+        string="Sale Order Line",
+        ondelete="set null",
+        index=True,
+    )
+
+    sale_order_id = fields.Many2one(
+        comodel_name="sale.order",
+        related="sale_line_id.order_id",
+        string="Sales Order",
+        ondelete="set null",
+        store=True,
+        index=True,
+    )

account_move_line_sale_info/models/sale_order_line.py

@@ -0,0 +1,25 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class SaleOrderLine(models.Model):
+    _inherit = "sale.order.line"
+
+    def name_get(self):
+        result = []
+        orig_name = dict(super(SaleOrderLine, self).name_get())
+        for line in self:
+            name = orig_name[line.id]
+            if self.env.context.get("so_line_info", False):
+                name = "[{}] {} - ({})".format(
+                    line.order_id.name, line.product_id.name, line.order_id.state
+                )
+            result.append((line.id, name))
+        return result
+
+    def _prepare_invoice_line(self):
+        res = super(SaleOrderLine, self)._prepare_invoice_line()
+        res["sale_line_id"] = self.id
+        return res

account_move_line_sale_info/models/stock_move.py

@@ -0,0 +1,18 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import api, models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    @api.model
+    def _prepare_account_move_line(
+        self, qty, cost, credit_account_id, debit_account_id, description
+    ):
+        res = super(StockMove, self)._prepare_account_move_line(
+            qty, cost, credit_account_id, debit_account_id, description
+        )
+        for line in res:
+            line[2]["sale_line_id"] = self.sale_line_id.id
+        return res

account_move_line_sale_info/security/account_security.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="group_account_move_sale_info" model="res.groups">
+        <field name="name">Sale info in Journal Items</field>
+        <field name="category_id" ref="base.module_category_hidden" />
+        <field name="users" eval="[(4, ref('base.user_admin'))]" />
+    </record>
+</odoo>

account_move_line_sale_info/tests/__init__.py

@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import test_account_move_line_sale_info

account_move_line_sale_info/tests/test_account_move_line_sale_info.py

@@ -0,0 +1,244 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo.tests import common
+
+
+class TestAccountMoveLineSaleInfo(common.TransactionCase):
+    def setUp(self):
+        super(TestAccountMoveLineSaleInfo, self).setUp()
+        self.sale_model = self.env["sale.order"]
+        self.sale_line_model = self.env["sale.order.line"]
+        self.product_model = self.env["product.product"]
+        self.product_ctg_model = self.env["product.category"]
+        self.acc_type_model = self.env["account.account.type"]
+        self.account_model = self.env["account.account"]
+        self.aml_model = self.env["account.move.line"]
+        self.res_users_model = self.env["res.users"]
+
+        self.partner1 = self.env.ref("base.res_partner_1")
+        self.location_stock = self.env.ref("stock.stock_location_stock")
+        self.company = self.env.ref("base.main_company")
+        self.group_sale_user = self.env.ref("sales_team.group_sale_salesman")
+        self.group_account_invoice = self.env.ref("account.group_account_invoice")
+        self.group_account_manager = self.env.ref("account.group_account_manager")
+
+        # Create account for Goods Received Not Invoiced
+        acc_type = self._create_account_type("equity", "other")
+        name = "Goods Received Not Invoiced"
+        code = "grni"
+        self.account_grni = self._create_account(acc_type, name, code, self.company)
+
+        # Create account for Cost of Goods Sold
+        acc_type = self._create_account_type("expense", "other")
+        name = "Cost of Goods Sold"
+        code = "cogs"
+        self.account_cogs = self._create_account(acc_type, name, code, self.company)
+        # Create account for Inventory
+        acc_type = self._create_account_type("asset", "other")
+        name = "Inventory"
+        code = "inventory"
+        self.account_inventory = self._create_account(
+            acc_type, name, code, self.company
+        )
+        # Create Product
+        self.product = self._create_product()
+
+        # Create users
+        self.sale_user = self._create_user(
+            "sale_user",
+            [self.group_sale_user, self.group_account_invoice],
+            self.company,
+        )
+        self.account_invoice = self._create_user(
+            "account_invoice", [self.group_account_invoice], self.company
+        )
+        self.account_manager = self._create_user(
+            "account_manager", [self.group_account_manager], self.company
+        )
+        self.JournalObj = self.env["account.journal"]
+        self.journal_sale = self.JournalObj.create(
+            {
+                "name": "Test journal sale",
+                "code": "TST-JRNL-S",
+                "type": "sale",
+                "company_id": self.company.id,
+            }
+        )
+
+    def _create_user(self, login, groups, company):
+        """ Create a user."""
+        group_ids = [group.id for group in groups]
+        user = self.res_users_model.with_context({"no_reset_password": True}).create(
+            {
+                "name": "Test User",
+                "login": login,
+                "password": "demo",
+                "email": "test@yourcompany.com",
+                "company_id": company.id,
+                "company_ids": [(4, company.id)],
+                "groups_id": [(6, 0, group_ids)],
+            }
+        )
+        return user.id
+
+    def _create_account_type(self, name, atype):
+        acc_type = self.acc_type_model.create(
+            {"name": name, "type": atype, "internal_group": name}
+        )
+        return acc_type
+
+    def _create_account(self, acc_type, name, code, company):
+        """Create an account."""
+        account = self.account_model.create(
+            {
+                "name": name,
+                "code": code,
+                "user_type_id": acc_type.id,
+                "company_id": company.id,
+            }
+        )
+        return account
+
+    def _create_product(self):
+        """Create a Product."""
+        #        group_ids = [group.id for group in groups]
+        product_ctg = self.product_ctg_model.create(
+            {
+                "name": "test_product_ctg",
+                "property_stock_valuation_account_id": self.account_inventory.id,
+                "property_valuation": "real_time",
+                "property_stock_account_input_categ_id": self.account_grni.id,
+                "property_stock_account_output_categ_id": self.account_cogs.id,
+            }
+        )
+        product = self.product_model.create(
+            {
+                "name": "test_product",
+                "categ_id": product_ctg.id,
+                "type": "product",
+                "standard_price": 1.0,
+                "list_price": 1.0,
+            }
+        )
+        return product
+
+    def _create_sale(self, line_products):
+        """ Create a sale order.
+
+        ``line_products`` is a list of tuple [(product, qty)]
+        """
+        lines = []
+        for product, qty in line_products:
+            line_values = {
+                "name": product.name,
+                "product_id": product.id,
+                "product_uom_qty": qty,
+                "product_uom": product.uom_id.id,
+                "price_unit": 500,
+            }
+            lines.append((0, 0, line_values))
+        return self.sale_model.create(
+            {"partner_id": self.partner1.id, "order_line": lines}
+        )
+
+    def _get_balance(self, domain):
+        """
+        Call read_group method and return the balance of particular account.
+        """
+        aml_rec = self.aml_model.read_group(
+            domain, ["debit", "credit", "account_id"], ["account_id"]
+        )
+        if aml_rec:
+            return aml_rec[0].get("debit", 0) - aml_rec[0].get("credit", 0)
+        else:
+            return 0.0
+
+    def _check_account_balance(self, account_id, sale_line=None, expected_balance=0.0):
+        """
+        Check the balance of the account
+        """
+        domain = [("account_id", "=", account_id)]
+        if sale_line:
+            domain.extend([("sale_line_id", "=", sale_line.id)])
+
+        balance = self._get_balance(domain)
+        if sale_line:
+            self.assertEqual(
+                balance,
+                expected_balance,
+                "Balance is not %s for sale Line %s."
+                % (str(expected_balance), sale_line.name),
+            )
+
+    def test_sale_invoice(self):
+        """Test that the po line moves from the sale order to the
+        account move line and to the invoice line.
+        """
+        sale = self._create_sale([(self.product, 1)])
+        so_line = False
+        for line in sale.order_line:
+            so_line = line
+            break
+        sale.action_confirm()
+        picking = sale.picking_ids[0]
+        picking.move_lines.write({"quantity_done": 1.0})
+        picking.button_validate()
+
+        expected_balance = -1.0
+        self._check_account_balance(
+            self.account_inventory.id,
+            sale_line=so_line,
+            expected_balance=expected_balance,
+        )
+        self.context = {
+            "active_model": "sale.order",
+            "active_ids": [sale.id],
+            "active_id": sale.id,
+            "default_journal_id": self.journal_sale.id,
+        }
+        payment = (
+            self.env["sale.advance.payment.inv"]
+            .with_context(self.context)
+            .create({"advance_payment_method": "delivered"})
+        )
+        payment.create_invoices()
+        invoice = sale.invoice_ids[0]
+        invoice.post()
+
+        for aml in invoice.line_ids:
+            if aml.product_id == so_line.product_id and aml.move_id:
+                self.assertEqual(
+                    aml.sale_line_id,
+                    so_line,
+                    "sale Order line has not been copied "
+                    "from the invoice to the account move line.",
+                )
+
+    def test_name_get(self):
+        sale = self._create_sale([(self.product, 1)])
+        so_line = sale.order_line[0]
+        name_get = so_line.with_context({"so_line_info": True}).name_get()
+        self.assertEqual(
+            name_get,
+            [
+                (
+                    so_line.id,
+                    "[%s] %s - (%s)"
+                    % (
+                        so_line.order_id.name,
+                        so_line.product_id.name,
+                        so_line.order_id.state,
+                    ),
+                )
+            ],
+        )
+        name_get_no_ctx = so_line.with_context({}).name_get()
+        self.assertEqual(
+            name_get_no_ctx,
+            [
+                (
+                    so_line.id,
+                    "{} - {}".format(so_line.order_id.name, so_line.product_id.name),
+                )
+            ],
+        )

account_move_line_sale_info/views/account_move_view.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_move_line_form" model="ir.ui.view">
+        <field name="name">account.move.line.form</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_form" />
+        <field name="arch" type="xml">
+            <field name="quantity" position="before">
+                <field
+                    name="sale_order_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+                <field
+                    name="sale_line_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+            </field>
+        </field>
+    </record>
+    <record id="view_move_line_tree" model="ir.ui.view">
+        <field name="name">account.move.line.tree</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field
+                    name="sale_order_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+                <field
+                    name="sale_line_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+            </field>
+        </field>
+    </record>
+    <record id="view_account_move_line_filter" model="ir.ui.view">
+        <field name="name">Journal Items</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_account_move_line_filter" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field
+                    name="sale_order_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+                <field
+                    name="sale_line_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+            </field>
+            <filter name="group_by_partner" position="after">
+                <filter
+                    name="group_by_sale_order"
+                    string="sale Order"
+                    domain="[]"
+                    context="{'group_by':'sale_order_id'}"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+                <filter
+                    name="group_by_sale_order_line"
+                    string="sale Order Line"
+                    domain="[]"
+                    context="{'group_by':'sale_line_id','so_line_info':True}"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+            </filter>
+        </field>
+    </record>
+    <record id="view_move_form" model="ir.ui.view">
+        <field name="name">account.move.form</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form" />
+        <field name="arch" type="xml">
+            <xpath
+                expr="//field[@name='line_ids']/tree//field[@name='partner_id']"
+                position="after"
+            >
+                <field
+                    name="sale_line_id"
+                    context="{'so_line_info': True}"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+                <field
+                    name="sale_order_id"
+                    groups="account_move_line_sale_info.group_account_move_sale_info"
+                />
+            </xpath>
+        </field>
+    </record>
+</odoo>

oca_dependencies.txt

@@ -1,2 +1,3 @@
 server-ux
 reporting-engine
+stock-logistics-warehouse

stock_account_prepare_anglo_saxon_out_lines_hook/README.rst

@@ -0,0 +1,63 @@
+.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg
+   :target: https://www.gnu.org/licenses/agpl.html
+   :alt: License: AGPL-3
+
+=============================
+Account Move Anglo Saxon Hook
+=============================
+
+This module introduces a hook that allows to customize the criteria why
+anglosaxon entries for COGS are created
+
+Standard Odoo will not create those entries for Kits where those are
+consumables. But they should be considered because of the interim output
+account is hit in the invoice.
+
+References: https://github.com/odoo/odoo/issues/60679
+Proposal to Odoo: https://github.com/odoo/odoo/pull/68511
+
+It also introduces a hook in order to add/modify the values on the
+anglo saxon journal entries creation. For example, the sales order information
+
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/92/11.0
+   
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/account-financial-tools/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.
+
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Aaron Henriquez <ahenriquez@forgeflow.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+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.
+
+To contribute to this module, please visit https://odoo-community.org.

stock_account_prepare_anglo_saxon_out_lines_hook/__init__.py

@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import models
+from .hooks import post_load_hook

stock_account_prepare_anglo_saxon_out_lines_hook/__manifest__.py

@@ -0,0 +1,15 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Stock Account Prepare Anglo Saxon Oout Lines Hook",
+    "summary": "Modify when and how anglo saxon journal items are created",
+    "version": "13.0.1.0.0",
+    "author": "ForgeFlow, Odoo Community Association (OCA)",
+    "website": "http://www.github.com/OCA/account-financial-tools",
+    "category": "Generic",
+    "depends": ["stock_account"],
+    "post_load": "post_load_hook",
+    "license": "AGPL-3",
+    "installable": True,
+}

stock_account_prepare_anglo_saxon_out_lines_hook/hooks.py

@@ -0,0 +1,67 @@
+# Copyright 2020 ForgeFlow, S.L.
+# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
+
+from odoo.addons.stock_account.models.account_move import AccountMove
+
+
+def post_load_hook():
+    def new_stock_account_prepare_anglo_saxon_out_lines_vals(self):
+        lines_vals_list = []
+        for move in self:
+            if (
+                not move.is_sale_document(include_receipts=True)
+                or not move.company_id.anglo_saxon_accounting
+            ):
+                continue
+
+            for line in move.invoice_line_ids:
+
+                # Filter out lines being not eligible for COGS.
+                # FIRST HOOK STARTS
+                if not line._eligible_for_cogs():
+                    continue
+                # FIRST HOOK ENDS
+
+                # Retrieve accounts needed to generate the COGS.
+                accounts = line.product_id.product_tmpl_id.with_context(
+                    force_company=line.company_id.id
+                ).get_product_accounts(fiscal_pos=move.fiscal_position_id)
+                debit_interim_account = accounts["stock_output"]
+                credit_expense_account = accounts["expense"]
+                if not credit_expense_account:
+                    if self.type == "out_refund":
+                        credit_expense_account = (
+                            self.journal_id.default_credit_account_id
+                        )
+                    else:  # out_invoice/out_receipt
+                        credit_expense_account = (
+                            self.journal_id.default_debit_account_id
+                        )
+                if not debit_interim_account or not credit_expense_account:
+                    continue
+
+                # Add interim account line.
+                # SECOND HOOK STARTS
+                if not debit_interim_account or not credit_expense_account:
+                    continue
+                interim_account_line_vals = self._prepare_interim_account_line_vals(
+                    line, move, debit_interim_account
+                )
+                lines_vals_list.append(interim_account_line_vals)
+                expense_account_line_vals = self._prepare_expense_account_line_vals(
+                    line, move, credit_expense_account
+                )
+                lines_vals_list.append(expense_account_line_vals)
+                # SECOND HOOK ENDS
+        return lines_vals_list
+
+    if not hasattr(
+        AccountMove, "stock_account_prepare_anglo_saxon_out_lines_vals_original"
+    ):
+        AccountMove.stock_account_prepare_anglo_saxon_out_lines_vals_original = (
+            AccountMove._stock_account_prepare_anglo_saxon_out_lines_vals
+        )
+
+    AccountMove._stock_account_prepare_anglo_saxon_out_lines_vals = (
+        new_stock_account_prepare_anglo_saxon_out_lines_vals
+    )

stock_account_prepare_anglo_saxon_out_lines_hook/models/__init__.py

@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import account_move
+from . import account_move_line

stock_account_prepare_anglo_saxon_out_lines_hook/models/account_move.py

@@ -0,0 +1,49 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class AccountMove(models.Model):
+
+    _inherit = "account.move"
+
+    def _prepare_interim_account_line_vals(self, line, move, debit_interim_account):
+        # Compute accounting fields.
+        sign = -1 if move.type == "out_refund" else 1
+        price_unit = line._stock_account_get_anglo_saxon_price_unit()
+        balance = sign * line.quantity * price_unit
+        return {
+            "name": line.name[:64],
+            "move_id": move.id,
+            "product_id": line.product_id.id,
+            "product_uom_id": line.product_uom_id.id,
+            "quantity": line.quantity,
+            "price_unit": price_unit,
+            "debit": balance < 0.0 and -balance or 0.0,
+            "credit": balance > 0.0 and balance or 0.0,
+            "account_id": debit_interim_account.id,
+            "exclude_from_invoice_tab": True,
+            "is_anglo_saxon_line": True,
+        }
+
+    def _prepare_expense_account_line_vals(self, line, move, credit_expense_account):
+        # Compute accounting fields.
+        sign = -1 if move.type == "out_refund" else 1
+        price_unit = line._stock_account_get_anglo_saxon_price_unit()
+        balance = sign * line.quantity * price_unit
+        return {
+            "name": line.name[:64],
+            "move_id": move.id,
+            "product_id": line.product_id.id,
+            "product_uom_id": line.product_uom_id.id,
+            "quantity": line.quantity,
+            "price_unit": -price_unit,
+            "debit": balance > 0.0 and balance or 0.0,
+            "credit": balance < 0.0 and -balance or 0.0,
+            "account_id": credit_expense_account.id,
+            "analytic_account_id": line.analytic_account_id.id,
+            "analytic_tag_ids": [(6, 0, line.analytic_tag_ids.ids)],
+            "exclude_from_invoice_tab": True,
+            "is_anglo_saxon_line": True,
+        }

stock_account_prepare_anglo_saxon_out_lines_hook/models/account_move_line.py

@@ -0,0 +1,15 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    def _eligible_for_cogs(self):
+        self.ensure_one()
+        return (
+            self.product_id.type == "product"
+            and self.product_id.valuation == "real_time"
+        )