Merge PR #434 into 14.0

Signed-off-by AaronHForgeFlow
This commit is contained in:
OCA-git-bot
2022-02-04 14:09:23 +00:00
15 changed files with 190 additions and 0 deletions

View File

@@ -0,0 +1,63 @@
.. 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 Sale Line
===================================
This module extends the functionality of account_mass_reconcile and
allow an user to reconcile debits and credits of an Account
using the SO 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 'Accounting / Adviser / Mass Automatic Reconcile'.
* Create a new reconciliation profile, and select a new configuration entry
with type 'Advanced. Product, sale 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/11.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 smashing it by providing a detailed and welcomed feedback.
Credits
=======
Images
------
* Odoo Community Association: `Icon <https://odoo-community.org/logo.png>`_.
Contributors
------------
* Aaron Henriquez <ahenriquez@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.

View File

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

View File

@@ -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 Sale Line",
"summary": "Allows to reconcile based on the SO line",
"version": "14.0.1.0.0",
"author": "ForgeFlow S.L., " "Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-reconcile",
"category": "Finance",
"depends": ["account_mass_reconcile", "account_move_line_sale_info"],
"license": "AGPL-3",
"data": ["security/ir.model.access.csv", "views/mass_reconcile.xml"],
"installable": True,
"auto_install": False,
}

View File

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

View File

@@ -0,0 +1,27 @@
# Copyright 2020 ForgeFlow S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import models
class MassReconcileAdvancedBySaleLine(models.TransientModel):
_name = "mass.reconcile.advanced.by.sale.line"
_inherit = "mass.reconcile.advanced"
_description = "Mass Reconcile By Sale 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("sale_line_id"))
@staticmethod
def _matchers(move_line):
return (("sale_line_id", move_line["sale_line_id"]),)
@staticmethod
def _opposite_matchers(move_line):
yield ("sale_line_id", move_line["sale_line_id"])

View File

@@ -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 MassReconcileAdvanced(models.AbstractModel):
_inherit = "mass.reconcile.advanced"
def _selection_columns(self):
aml_cols = super(MassReconcileAdvanced, self)._selection_columns()
aml_cols.append("account_move_line.sale_line_id")
aml_cols.append("account_move_line.product_id")
return aml_cols

View File

@@ -0,0 +1,19 @@
# 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.sale.line",
"Advanced. Product, sale order line.",
),
]
return methods

View File

@@ -0,0 +1 @@
* Aaron Henriquez Quintana <ahenriquez@forgeflow.com>

View File

@@ -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 SO 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 Delivered Not Invoiced*'.

View File

@@ -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, sale order line'.

View File

@@ -0,0 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_mass_reconcile_advanced_by_sale_line,access_mass_reconcile_advanced_by_sale_line,model_mass_reconcile_advanced_by_sale_line,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_mass_reconcile_advanced_by_sale_line access_mass_reconcile_advanced_by_sale_line model_mass_reconcile_advanced_by_sale_line base.group_user 1 1 1 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -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">30</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. Sale 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 SO lines to be reconciled."
colspan="4"
/>
</group>
</page>
</field>
</record>
</odoo>

View File

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

View File

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