Merge PR #398 into 13.0

Signed-off-by AaronHForgeFlow

.travis.yml

@@ -12,6 +12,7 @@ addons:
   apt:
     packages:
       - expect-dev # provides unbuffer utility
+      - swig
 
 stages:
   - linting

account_mass_reconcile/tests/test_scenario_reconcile.py

@@ -125,20 +125,35 @@ class TestScenarioReconcile(common.SavepointCase):
                 "reconcile_method": [(0, 0, {"name": "mass.reconcile.simple.partner"})],
             }
         )
-        # call the automatic reconcilation method
+        # call the automatic reconciliation method
         mass_rec.run_reconcile()
         invoice.invalidate_cache()
         self.assertEqual("paid", invoice.invoice_payment_state)
 
     def test_scenario_reconcile_currency(self):
-        # create currency rate
-        self.env["res.currency.rate"].create(
-            {
-                "name": fields.Date.today().strftime("%Y-%m-%d") + " 00:00:00",
-                "currency_id": self.ref("base.USD"),
-                "rate": 1.5,
-            }
+        currency_rate = (
+            self.env["res.currency.rate"]
+            .sudo()
+            .search(
+                [
+                    ("currency_id", "=", self.ref("base.USD")),
+                    ("company_id", "=", self.ref("base.main_company")),
+                ]
+            )
+            .filtered(lambda r: r.name == fields.Date.today())
         )
+        if not currency_rate:
+            # create currency rate
+            self.env["res.currency.rate"].create(
+                {
+                    "name": fields.Date.today(),
+                    "currency_id": self.ref("base.USD"),
+                    "rate": 1.5,
+                }
+            )
+        else:
+            currency_rate = fields.first(currency_rate)
+            currency_rate.rate = 1.5
         # create invoice
         invoice = self.invoice_obj.with_context(default_type="out_invoice").create(
             {

account_mass_reconcile_by_purchase_line/README.rst

@@ -0,0 +1,65 @@
+.. image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+   :target: https://www.gnu.org/licenses/agpl
+   :alt: License: AGPL-3
+
+=======================================
+Account Mass Reconcile by Purchase Line
+=======================================
+
+This module extends the functionality of account_mass_reconcile and
+allow an user to reconcile debits and credits of an Account
+using the PO Line and Product as key fields. This type of
+reconciliation is to be used in the context of the Perpetual Inventory
+accounting system, with the accrual account '*Goods Received Not Invoiced*'.
+
+Usage
+=====
+
+To use this module, you need to:
+
+* Go to 'Invoicing / Accounting / Actions / Mass Automatic Reconcile'.
+
+* Create a new reconciliation profile, and select a new configuration entry
+  with type 'Advanced. Product, purchase order 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/98/12.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/bank-statement-reconcile/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smash it by providing detailed and welcomed feedback.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://odoo-community.org/logo.png>`_.
+
+Contributors
+------------
+
+* Jordi Ballester Alomar <jordi.ballester@eficent.com>
+* Miquel Raïch <miquel.raich@eficent.com>
+* Lois Rilo <lois.rilo@eficent.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_mass_reconcile_by_purchase_line/__init__.py

@@ -0,0 +1 @@
+from . import models

account_mass_reconcile_by_purchase_line/__manifest__.py

@@ -0,0 +1,16 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Account Mass Reconcile by Purchase Line",
+    "summary": "Allows to reconcile based on the PO line",
+    "version": "13.0.1.0.0",
+    "author": "ForgeFlow, " "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/account-reconcile",
+    "category": "Finance",
+    "depends": ["account_mass_reconcile", "account_move_line_purchase_info"],
+    "license": "AGPL-3",
+    "data": ["views/mass_reconcile.xml"],
+    "installable": True,
+    "auto_install": False,
+}

account_mass_reconcile_by_purchase_line/i18n/account_mass_reconcile_by_purchase_line.pot

@@ -0,0 +1,75 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_mass_reconcile_by_purchase_line
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.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: account_mass_reconcile_by_purchase_line
+#: model:ir.ui.view,arch_db:account_mass_reconcile_by_purchase_line.account_mass_reconcile_form
+msgid "Advanced. Purchase Order Line"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_id
+msgid "ID"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.ui.view,arch_db:account_mass_reconcile_by_purchase_line.account_mass_reconcile_form
+msgid "Match multiple debit vs multiple credit entries. Allow partial reconciliation. The lines should have the same partner, product and PO lines to be reconciled."
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_mass_reconcile_advanced
+msgid "mass.reconcile.advanced"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_mass_reconcile_advanced_by_purchase_line
+msgid "mass.reconcile.advanced.by.purchase.line"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_account_mass_reconcile_method
+msgid "reconcile method for account_mass_reconcile"
+msgstr ""
+

account_mass_reconcile_by_purchase_line/i18n/ar.po

@@ -0,0 +1,80 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_mass_reconcile_by_purchase_line
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2018-08-12 00:01+0000\n"
+"Last-Translator: Osoul <baruni@osoul.ly>\n"
+"Language-Team: none\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 3.1.1\n"
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.ui.view,arch_db:account_mass_reconcile_by_purchase_line.account_mass_reconcile_form
+msgid "Advanced. Purchase Order Line"
+msgstr "متطور. أوامر الشراء"
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_create_date
+msgid "Created on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_id
+msgid "ID"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line___last_update
+msgid "Last Modified on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model.fields,field_description:account_mass_reconcile_by_purchase_line.field_mass_reconcile_advanced_by_purchase_line_write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.ui.view,arch_db:account_mass_reconcile_by_purchase_line.account_mass_reconcile_form
+msgid "Match multiple debit vs multiple credit entries. Allow partial reconciliation. The lines should have the same partner, product and PO lines to be reconciled."
+msgstr ""
+"تسوية مجموعة قيود مدينة ودائنة. السماح بالتسوية الجزئية. القيود يجب ان تحتوي "
+"على نفس الشريك، والمنتج وبند أمر الشراء."
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_mass_reconcile_advanced
+msgid "mass.reconcile.advanced"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_mass_reconcile_advanced_by_purchase_line
+msgid "mass.reconcile.advanced.by.purchase.line"
+msgstr ""
+
+#. module: account_mass_reconcile_by_purchase_line
+#: model:ir.model,name:account_mass_reconcile_by_purchase_line.model_account_mass_reconcile_method
+msgid "reconcile method for account_mass_reconcile"
+msgstr ""

account_mass_reconcile_by_purchase_line/models/__init__.py

@@ -0,0 +1,3 @@
+from . import mass_reconcile
+from . import base_advanced_reconciliation
+from . import advanced_reconciliation

account_mass_reconcile_by_purchase_line/models/advanced_reconciliation.py

@@ -0,0 +1,31 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class MassReconcileAdvancedByPurchaseLine(models.TransientModel):
+    _name = "mass.reconcile.advanced.by.purchase.line"
+    _inherit = "mass.reconcile.advanced"
+    _description = "Mass Reconcile By Purchase Line"
+
+    @staticmethod
+    def _skip_line(move_line):
+        """
+        When True is returned on some conditions, the credit move line
+        will be skipped for reconciliation. Can be inherited to
+        skip on some conditions. ie: ref or partner_id is empty.
+        """
+        return not (move_line.get("product_id") and move_line.get("purchase_line_id"))
+
+    @staticmethod
+    def _matchers(move_line):
+        return (
+            ("product_id", move_line["product_id"]),
+            ("purchase_line_id", move_line["purchase_line_id"]),
+        )
+
+    @staticmethod
+    def _opposite_matchers(move_line):
+        yield ("product_id", move_line["product_id"])
+        yield ("purchase_line_id", move_line["purchase_line_id"])

account_mass_reconcile_by_purchase_line/models/base_advanced_reconciliation.py

@@ -0,0 +1,14 @@
+# Copyright 2020 ForgeFlow S.L.
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import models
+
+
+class MassReconcileAdvanced(models.AbstractModel):
+    _inherit = "mass.reconcile.advanced"
+
+    def _selection_columns(self):
+        aml_cols = super(MassReconcileAdvanced, self)._selection_columns()
+        aml_cols.append("account_move_line.purchase_line_id")
+        aml_cols.append("account_move_line.product_id")
+        return aml_cols

account_mass_reconcile_by_purchase_line/models/mass_reconcile.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 models
+
+
+class AccountMassReconcileMethod(models.Model):
+    _inherit = "account.mass.reconcile.method"
+
+    def _selection_name(self):
+        methods = super(AccountMassReconcileMethod, self)._selection_name()
+        methods += [
+            (
+                "mass.reconcile.advanced.by.purchase.line",
+                "Advanced. Product, purchase order line.",
+            ),
+        ]
+        return methods

account_mass_reconcile_by_purchase_line/readme/CONTRIBUTORS.rst

@@ -0,0 +1,3 @@
+* Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
+* Miquel Raïch <miquel.raich@forgeflow.com>
+* Lois Rilo <lois.rilo@forgeflow.com>

account_mass_reconcile_by_purchase_line/readme/DESCRIPTION.rst

@@ -0,0 +1,5 @@
+This module extends the functionality of account_mass_reconcile and
+allow an user to reconcile debits and credits of an Account
+using the PO Line and Product as key fields. This type of
+reconciliation is to be used in the context of the Perpetual Inventory
+accounting system, with the accrual account '*Goods Received Not Invoiced*'.

account_mass_reconcile_by_purchase_line/readme/USAGE.rst

@@ -0,0 +1,6 @@
+To use this module, you need to:
+
+* Go to 'Invoicing / Accounting / Actions / Mass Automatic Reconcile'.
+
+* Create a new reconciliation profile, and select a new configuration entry
+  with type 'Advanced. Product, purchase order line'.

account_mass_reconcile_by_purchase_line/views/mass_reconcile.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="account_mass_reconcile_form" model="ir.ui.view">
+        <field name="name">account.mass.reconcile.form</field>
+        <field name="priority">20</field>
+        <field name="model">account.mass.reconcile</field>
+        <field
+            name="inherit_id"
+            ref="account_mass_reconcile.account_mass_reconcile_form"
+        />
+        <field name="arch" type="xml">
+            <page name="information" position="inside">
+                <group colspan="2" col="2">
+                    <separator colspan="4" string="Advanced. Purchase Order Line" />
+                    <label
+                        for="reconcile_method"
+                        string="Match multiple debit vs multiple credit entries. Allow partial reconciliation.
+The lines should have the same partner, product and PO lines to be reconciled."
+                        colspan="4"
+                    />
+                </group>
+            </page>
+        </field>
+    </record>
+</odoo>

account_reconcile_model_strict_match_amount/models/account_reconcile_model.py

@@ -45,9 +45,9 @@ class AccountReconcileModel(models.Model):
                 , FALSE)
                 AND
                 CASE
-                    WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100
-                    WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100
-                    ELSE 100
+                    WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100.0
+                    WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100.0
+                    ELSE 100.0
                 END >= {match_total_amount_param} AS communication_flag
             """.format(
                 match_total_amount_param=self.match_total_amount_param
@@ -67,9 +67,9 @@ class AccountReconcileModel(models.Model):
                 , FALSE)
                 AND
                 CASE
-                    WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100
-                    WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100
-                    ELSE 100
+                    WHEN abs(st_line.amount) < abs(aml.balance) THEN abs(st_line.amount) / abs(aml.balance) * 100.0
+                    WHEN abs(st_line.amount) > abs(aml.balance) THEN abs(aml.balance) / abs(st_line.amount) * 100.0
+                    ELSE 100.0
                 END >= {match_total_amount_param} AS payment_reference_flag
             """.format(
                 match_total_amount_param=self.match_total_amount_param

account_reconcile_model_strict_match_amount/tests/test_account_reconcile_model_strict_match_amount.py

@@ -14,9 +14,9 @@ class TestAccountReconcileModelStrictMatchAmount(TestReconciliationMatchingRules
         cls.partner_5 = cls.env["res.partner"].create({"name": "partner_5"})
         cls.partner_6 = cls.env["res.partner"].create({"name": "partner_6"})
         cls.invoice_line_5 = cls._create_invoice_line(150, cls.partner_3, "out_invoice")
-        cls.invoice_line_5.ref = "ABC001XYZ"
+        cls.invoice_line_5.name = "ABC001XYZ"
         cls.invoice_line_6 = cls._create_invoice_line(300, cls.partner_4, "out_invoice")
-        cls.invoice_line_6.name = "ABC002XYZ"
+        cls.invoice_line_6.move_id.name = "ABC002XYZ"
         cls.invoice_line_7 = cls._create_invoice_line(450, cls.partner_5, "out_invoice")
         cls.invoice_line_7.move_id.ref = "ABC003XYZ"
         cls.invoice_line_8 = cls._create_invoice_line(600, cls.partner_6, "out_invoice")

account_reconcile_restrict_partner_mismatch/tests/test_reconciliation.py

@@ -53,12 +53,13 @@ class TestReconciliation(SavepointCase):
             "journal_id": cls.bank_journal.id,
             "line_ids": [(0, 0, debit_line_vals), (0, 0, credit_line_vals)],
         }
-        return (
+        move = (
             cls.env["account.move"]
             .with_context(default_journal_id=cls.bank_journal.id)
             .create(vals)
-            .id
         )
+        move.post()
+        return move.id
 
     @classmethod
     def init_moves(cls):
@@ -95,7 +96,7 @@ class TestReconciliation(SavepointCase):
         self.aml[0].partner_id = self.partner.id
         with self.assertRaises(UserError):
             self.aml.reconcile()
-        # reconciliation forbiden only for certain types of accounts
+        # reconciliation forbidden only for certain types of accounts
         account = self.env["account.account"].create(
             {
                 "code": "CAA1000",

setup/account_mass_reconcile_by_purchase_line/odoo/addons/account_mass_reconcile_by_purchase_line

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

setup/account_mass_reconcile_by_purchase_line/setup.py

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