audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

[15.0][MIG]purchase_unreconciled

Browse Source
This commit is contained in:
AaronHForgeFlow
2021-12-29 13:34:20 +01:00
committed by JasminSForgeFlow
parent 9b4a553d10
commit ac27f09732
15 changed files with 477 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
purchase_unreconciled/README.rst
View File

@@ -2,28 +2,31 @@
Purchase Unreconciled
=====================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8134013d5d37fe8931266d6f916bbc160f48212ac4a9faa43b4efe39d03e6b4c
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
:alt: Alpha
.. |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%2Faccount--financial--tools-lightgray.png?logo=github
:target: https://github.com/OCA/account-financial-tools/tree/14.0/purchase_unreconciled
:target: https://github.com/OCA/account-financial-tools/tree/15.0/purchase_unreconciled
:alt: OCA/account-financial-tools
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/account-financial-tools-14-0/account-financial-tools-14-0-purchase_unreconciled
:target: https://translation.odoo-community.org/projects/account-financial-tools-15-0/account-financial-tools-15-0-purchase_unreconciled
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/92/14.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/account-financial-tools&target_branch=15.0
:alt: Try me on Runboat
|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|
This module adds a new fields "Unreconciled" on Purchase Orders, that allows
to find PO's with unreconciled journal items related.
@@ -31,6 +34,11 @@ to find PO's with unreconciled journal items related.
This module allows to reconcile those PO in a single click. In accounting
settings users will be able to set up a specific account for write-off.
.. IMPORTANT::
This is an alpha version, the data model and design can change at any time without warning.
Only for development or testing purpose, do not use in production.
`More details on development status <https://odoo-community.org/page/development-status>`_
**Table of contents**
.. contents::
@@ -51,8 +59,8 @@ 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 <https://github.com/OCA/account-financial-tools/issues/new?body=module:%20purchase_unreconciled%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/account-financial-tools/issues/new?body=module:%20purchase_unreconciled%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
@@ -88,6 +96,14 @@ 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/account-financial-tools <https://github.com/OCA/account-financial-tools/tree/14.0/purchase_unreconciled>`_ project on GitHub.
.. |maintainer-AaronHForgeFlow| image:: https://github.com/AaronHForgeFlow.png?size=40px
:target: https://github.com/AaronHForgeFlow
:alt: AaronHForgeFlow
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
|maintainer-AaronHForgeFlow|
This module is part of the `OCA/account-financial-tools <https://github.com/OCA/account-financial-tools/tree/15.0/purchase_unreconciled>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

1
purchase_unreconciled/__init__.py
View File

@@ -1 +1,2 @@
from . import models
from . import wizards

12
purchase_unreconciled/__manifest__.py
View File

@@ -1,15 +1,19 @@
# Copyright 2019 ForgeFlow S.L.
# - Lois Rilo Antelo
# Copyright 2019-22 ForgeFlow S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
{
"name": "Purchase Unreconciled",
"version": "14.0.1.0.0",
"version": "15.0.1.0.0",
"author": "ForgeFlow S.L., Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-financial-tools",
"category": "Purchases",
"depends": ["account_move_line_purchase_info", "purchase_stock"],
"data": ["views/purchase_order_view.xml", "views/res_config_settings_view.xml"],
"data": [
"security/ir.model.access.csv",
"views/purchase_order_view.xml",
"views/res_config_settings_view.xml",
"wizards/purchase_unreconciled_exceeded_view.xml",
],
"license": "AGPL-3",
"installable": True,
"development_status": "Alpha",

32
purchase_unreconciled/models/account_move_line.py
View File

@@ -1,4 +1,4 @@
# Copyright 2019 ForgeFlow S.L.
# Copyright 2019-21 ForgeFlow S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from datetime import datetime
@@ -18,7 +18,9 @@ class AccountMoveLine(models.Model):
writeoff_amount_curr = round(
sum(line["amount_residual_currency"] for line in self), precision
)
if writeoff_amount_curr and not writeoff_amount:
# Data inconsistency, do not create the write-off
return (0.0, 0.0, True)
first_currency = self[0]["currency_id"]
if all([line["currency_id"] == first_currency for line in self]):
same_curr = True
@@ -37,7 +39,10 @@ class AccountMoveLine(models.Model):
amount_writeoff_curr,
same_curr,
) = self._get_writeoff_amounts()
if not amount_writeoff:
return self.env["account.move.line"]
partners = self.mapped("partner_id")
move_date = writeoff_vals.get("date", datetime.now())
write_off_vals = {
"name": _("Automatic writeoff"),
"amount_currency": same_curr and amount_writeoff_curr or amount_writeoff,
@@ -45,13 +50,16 @@ class AccountMoveLine(models.Model):
"credit": amount_writeoff < 0.0 and -amount_writeoff or 0.0,
"partner_id": len(partners) == 1 and partners.id or False,
"account_id": writeoff_vals["account_id"],
"purchase_order_id": writeoff_vals["purchase_order_id"],
"date": move_date,
"journal_id": writeoff_vals["journal_id"],
"currency_id": writeoff_vals["currency_id"],
"currency_id": writeoff_vals.get("currency_id", False),
"product_id": writeoff_vals["product_id"],
"purchase_order_id": writeoff_vals["purchase_order_id"],
"purchase_line_id": writeoff_vals["purchase_line_id"],
}
counterpart_account = self.mapped("account_id")
if len(counterpart_account) != 1:
raise ValidationError(_("CAnnot write-off more than one account"))
raise ValidationError(_("Cannot write-off more than one account"))
counter_part = write_off_vals.copy()
counter_part["debit"] = write_off_vals["credit"]
counter_part["credit"] = write_off_vals["debit"]
@@ -60,12 +68,22 @@ class AccountMoveLine(models.Model):
move = self.env["account.move"].create(
{
"date": datetime.now(),
"date": move_date,
"journal_id": writeoff_vals["journal_id"],
"currency_id": writeoff_vals["currency_id"],
"currency_id": writeoff_vals.get("currency_id", False),
"line_ids": [(0, 0, write_off_vals), (0, 0, counter_part)],
}
)
if writeoff_vals.get("purchase_order_id", False):
# done this way because purchase_order_id is a related field and will
# not being assign on create. Cannot assign purchase_line_id because
# it is a generic write-off for the whole PO
self.env.cr.execute(
"""UPDATE account_move_line SET purchase_order_id = %s
WHERE id in %s
""",
(writeoff_vals["purchase_order_id"], tuple(move.line_ids.ids)),
)
move.action_post()
return move.line_ids.filtered(
lambda l: l.account_id.id == counterpart_account.id

9
purchase_unreconciled/models/company.py
View File

@@ -1,4 +1,4 @@
# Copyright 2019 ForgeFlow S.L.
# Copyright 2019-21 ForgeFlow S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import fields, models
@@ -18,3 +18,10 @@ class ResCompany(models.Model):
purchase_reconcile_journal_id = fields.Many2one(
"account.journal", string="WriteOff Journal for Purchases"
)
purchase_lock_auto_reconcile = fields.Boolean()
purchase_reconcile_tolerance = fields.Float(
string="Purchase Reconcile Tolerance (%)",
default=0.0,
help="Percentage of tolerance of residual amount vs total amount of the "
"Purchase Order. Leave zero to accept all discrepancies",
)

238
purchase_unreconciled/models/purchase_order.py
View File

@@ -1,8 +1,9 @@
# Copyright 2019 ForgeFlow S.L.
# Copyright 2019-21 ForgeFlow S.L..
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import _, api, exceptions, fields, models
from odoo.osv import expression
from odoo.tools import float_is_zero
class PurchaseOrder(models.Model):
@@ -16,57 +17,60 @@ class PurchaseOrder(models.Model):
"everything is reconciled or that the related accounts do not "
"allow reconciliation",
)
is_shipped = fields.Boolean(search="_search_is_shipped")
amount_unreconciled = fields.Float(compute="_compute_unreconciled")
@api.model
def _get_purchase_unreconciled_base_domain(self):
def _get_account_domain(self):
self.ensure_one()
included_accounts = (
(
self.env["product.category"].search(
[("property_valuation", "=", "real_time")]
)
self.env["product.category"]
.with_company(self.company_id.id)
.search([("property_valuation", "=", "real_time")])
)
.mapped("property_stock_account_input_categ_id")
.ids
)
return [("account_id", "in", included_accounts)]
@api.model
def _get_purchase_unreconciled_base_domain(self):
unreconciled_domain = [
("account_id.reconcile", "=", True),
("account_id", "in", included_accounts),
("account_id.internal_type", "not in", ["receivable", "payable"]),
("move_id.state", "=", "posted"),
# for some reason when amount_residual is zero
# is marked as reconciled, this is better check
("full_reconcile_id", "=", False),
("company_id", "in", self.env.companies.ids),
# same condition than Odoo Unreconciled filter
("full_reconcile_id", "=", False),
("balance", "!=", 0.0),
]
return unreconciled_domain
def _search_is_shipped(self, operator, value):
if operator != "=" or not isinstance(value, bool):
raise ValueError(_("Unsupported search operator"))
is_shipped_pos = self.search([("picking_ids.state", "in", ("done", "cancel"))])
if value:
return [("id", "in", is_shipped_pos.ids)]
else:
return [("id", "not in", is_shipped_pos.ids)]
def _compute_unreconciled(self):
acc_item = self.env["account.move.line"]
for rec in self:
domain = rec._get_purchase_unreconciled_base_domain()
domain = rec.with_company(
rec.company_id
)._get_purchase_unreconciled_base_domain()
domain_account = rec._get_account_domain()
unreconciled_domain = expression.AND([domain, domain_account])
unreconciled_domain = expression.AND(
[domain, [("purchase_order_id", "=", rec.id)]]
[unreconciled_domain, [("purchase_order_id", "=", rec.id)]]
)
unreconciled_items = acc_item.search(unreconciled_domain)
rec.unreconciled = len(unreconciled_items) > 0
rec.amount_unreconciled = sum(unreconciled_items.mapped("amount_residual"))
def _search_unreconciled(self, operator, value):
if operator != "=" or not isinstance(value, bool):
if operator not in ("=", "!=") or not isinstance(value, bool):
raise ValueError(_("Unsupported search operator"))
acc_item = self.env["account.move.line"]
domain = self._get_purchase_unreconciled_base_domain()
unreconciled_domain = expression.AND(
[domain, [("purchase_order_id", "!=", False)]]
)
unreconciled_domain = expression.AND(
[unreconciled_domain, [("company_id", "in", self.env.companies.ids)]]
)
unreconciled_items = acc_item.search(unreconciled_domain)
unreconciled_pos = unreconciled_items.mapped("purchase_order_id")
if value:
@@ -77,10 +81,16 @@ class PurchaseOrder(models.Model):
def action_view_unreconciled(self):
self.ensure_one()
acc_item = self.env["account.move.line"]
domain = self._get_purchase_unreconciled_base_domain()
domain = self.with_company(
self.company_id.id
)._get_purchase_unreconciled_base_domain()
domain_account = self._get_account_domain()
unreconciled_domain = expression.AND([domain, domain_account])
unreconciled_domain = expression.AND(
[domain, [("purchase_order_id", "=", self.id)]]
[unreconciled_domain, [("purchase_order_id", "=", self.id)]]
)
unreconciled_domain.remove(("full_reconcile_id", "=", False))
unreconciled_domain.remove("&")
unreconciled_items = acc_item.search(unreconciled_domain)
action = self.env.ref("account.action_account_moves_all")
action_dict = action.read()[0]
@@ -99,59 +109,169 @@ class PurchaseOrder(models.Model):
)
)
self.ensure_one()
res = {}
domain = self._get_purchase_unreconciled_base_domain()
domain_account = self._get_account_domain()
unreconciled_domain = expression.AND([domain, domain_account])
unreconciled_domain = expression.AND(
[domain, [("purchase_order_id", "=", self.id)]]
)
unreconciled_domain = expression.AND(
[unreconciled_domain, [("company_id", "=", self.company_id.id)]]
)
writeoff_to_reconcile = self.env["account.move.line"]
all_writeoffs = self.env["account.move.line"]
reconciling_groups = self.env["account.move.line"].read_group(
domain=unreconciled_domain,
fields=["account_id", "product_id", "purchase_line_id"],
groupby=["account_id", "product_id", "purchase_line_id"],
lazy=False,
)
unreconciled_items = self.env["account.move.line"].search(unreconciled_domain)
writeoff_to_reconcile = False
for account in unreconciled_items.mapped("account_id"):
acc_unrec_items = unreconciled_items.filtered(
lambda ml: ml.account_id == account
for group in reconciling_groups:
account_id = group["account_id"][0]
product_id = group["product_id"][0] if group["product_id"] else False
purchase_line_id = (
group["purchase_line_id"][0] if group["purchase_line_id"] else False
)
all_aml_share_same_currency = all(
[x.currency_id == self[0].currency_id for x in acc_unrec_items]
)
writeoff_vals = {
"account_id": self.company_id.purchase_reconcile_account_id.id,
"journal_id": self.company_id.purchase_reconcile_journal_id.id,
"purchase_order_id": self.id,
"currency_id": self.currency_id.id,
}
if not all_aml_share_same_currency:
writeoff_vals["amount_currency"] = False
if writeoff_to_reconcile:
writeoff_to_reconcile += unreconciled_items._create_writeoff(
writeoff_vals
unreconciled_items_group = unreconciled_items.filtered(
lambda l: (
l.account_id.id == account_id and l.product_id.id == product_id
)
)
# Check which type of force reconciling we are doing:
# - Force reconciling amount_residual
# - Force reconciling amount_residual_currency
amount_residual_currency_reconcile = any(
unreconciled_items_group.filtered(
lambda l: l.amount_residual_currency != 0.0
and l.account_id.id == account_id
)
)
if amount_residual_currency_reconcile:
residual_field = "amount_residual_currency"
else:
writeoff_to_reconcile = unreconciled_items._create_writeoff(
residual_field = "amount_residual"
if float_is_zero(
sum(unreconciled_items_group.mapped(residual_field)),
precision_rounding=self.company_id.currency_id.rounding,
):
moves_to_reconcile = unreconciled_items_group
else:
writeoff_vals = self._get_purchase_writeoff_vals(
unreconciled_items_group, purchase_line_id, product_id
)
writeoff_to_reconcile = unreconciled_items_group._create_writeoff(
writeoff_vals
)
# add writeoff line to reconcile algorithm and finish the reconciliation
if writeoff_to_reconcile:
remaining_moves = unreconciled_items + writeoff_to_reconcile
else:
remaining_moves = unreconciled_items
# Check if reconciliation is total or needs an exchange rate entry to be created
if remaining_moves:
remaining_moves.filtered(lambda l: not l.reconciled).reconcile()
return {
all_writeoffs |= writeoff_to_reconcile
# add writeoff line to reconcile algorithm and finish the reconciliation
moves_to_reconcile = unreconciled_items_group | writeoff_to_reconcile
# Check if reconciliation is total or needs an exchange rate entry to be
# created
if moves_to_reconcile:
moves_to_reconcile.filtered(lambda l: not l.reconciled).reconcile()
reconciled_ids = unreconciled_items | all_writeoffs
res = {
"name": _("Reconciled journal items"),
"type": "ir.actions.act_window",
"view_type": "form",
"view_mode": "tree,form",
"res_model": "account.move.line",
"domain": [
("id", "in", unreconciled_items.ids + writeoff_to_reconcile.ids)
],
"domain": [("id", "in", reconciled_ids.ids)],
}
if self.env.context.get("bypass_unreconciled", False):
# When calling the method from the wizard, lock after reconciling
self.button_done()
return res
def _get_purchase_writeoff_vals(self, amls, purchase_line_id, product_id):
writeoff_date = self.env.context.get("writeoff_date", False)
aml_date = max(amls.mapped("move_id.date"))
res = {
"account_id": self.company_id.purchase_reconcile_account_id.id,
"journal_id": self.company_id.purchase_reconcile_journal_id.id,
"purchase_order_id": self.id,
"purchase_line_id": purchase_line_id or False,
"product_id": product_id,
"currency_id": self.currency_id.id or self.env.company.currency_id.id,
"date": aml_date,
}
# hook for custom date:
if writeoff_date:
res.update({"date": writeoff_date})
return res
def reconcile_criteria(self):
"""Gets the criteria where POs are locked or not, by default uses the company
configuration"""
self.ensure_one()
return self.unreconciled and self.company_id.purchase_lock_auto_reconcile
def button_done(self):
for rec in self:
if rec.unreconciled:
rec.action_reconcile()
return super(PurchaseOrder, self).button_done()
criteria = rec.reconcile_criteria()
if criteria:
if rec.unreconciled:
exception_msg = rec.unreconciled_exception_msg()
if exception_msg:
res = rec.purchase_unreconciled_exception(exception_msg)
return res
else:
rec.action_reconcile()
return super(PurchaseOrder, rec).button_done()
else:
return super(PurchaseOrder, rec).button_done()
else:
return super(PurchaseOrder, rec).button_done()
def purchase_unreconciled_exception(self, exception_msg=None):
"""This mean to be run when the SO cannot be reconciled because it is over
tolerance"""
self.ensure_one()
if exception_msg:
return (
self.env["purchase.unreconciled.exceeded.wiz"]
.create(
{
"exception_msg": exception_msg,
"purchase_id": self.id,
"origin_reference": "{},{}".format("purchase.order", self.id),
"continue_method": "action_reconcile",
}
)
.action_show()
)
def unreconciled_exception_msg(self):
self.ensure_one()
exception_msg = ""
amount_total = self.amount_total
if self.currency_id and self.company_id.currency_id != self.currency_id:
amount_total = self.currency_id._convert(
amount_total,
self.company_id.currency_id,
self.company_id,
fields.Date.today(),
)
if (
self.company_id.purchase_reconcile_tolerance
and amount_total
and abs(self.amount_unreconciled / amount_total)
>= self.company_id.purchase_reconcile_tolerance / 100.0
):
params = {
"amount_unreconciled": self.amount_unreconciled,
"amount_allowed": self.amount_total
* self.company_id.purchase_reconcile_tolerance
/ 100.0,
}
exception_msg = (
_(
"Finance Warning: \nUnreconciled amount is too high. Total "
"unreconciled amount: %(amount_unreconciled)s Maximum unreconciled"
" amount accepted: %(amount_allowed)s "
)
% params
)
return exception_msg

11
purchase_unreconciled/models/res_config_settings.py
View File

@@ -1,6 +1,5 @@
# Copyright 2016 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
# Copyright 2018 Tecnativa - Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
# Copyright 2019-21 ForgeFlow S.L..
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import fields, models
@@ -14,3 +13,9 @@ class ResConfigSettings(models.TransientModel):
purchase_reconcile_journal_id = fields.Many2one(
related="company_id.purchase_reconcile_journal_id", readonly=False
)
purchase_lock_auto_reconcile = fields.Boolean(
related="company_id.purchase_lock_auto_reconcile", readonly=False
)
purchase_reconcile_tolerance = fields.Float(
related="company_id.purchase_reconcile_tolerance", readonly=False
)

2
purchase_unreconciled/security/ir.model.access.csv Normal file
View File

@@ -0,0 +1,2 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
purchase.unreconciled.exceeded.wiz,purchase.unreconciled.exceeded.wiz,purchase_unreconciled.model_purchase_unreconciled_exceeded_wiz,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 purchase.unreconciled.exceeded.wiz purchase.unreconciled.exceeded.wiz purchase_unreconciled.model_purchase_unreconciled_exceeded_wiz base.group_user 1 1 1 1

50
purchase_unreconciled/static/description/index.html
View File

@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<title>Purchase Unreconciled</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
@@ -366,27 +366,35 @@ ul.auto-toc {
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8134013d5d37fe8931266d6f916bbc160f48212ac4a9faa43b4efe39d03e6b4c
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/account-financial-tools/tree/14.0/purchase_unreconciled"><img alt="OCA/account-financial-tools" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/account-financial-tools-14-0/account-financial-tools-14-0-purchase_unreconciled"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/92/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/account-financial-tools/tree/15.0/purchase_unreconciled"><img alt="OCA/account-financial-tools" src="https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/account-financial-tools-15-0/account-financial-tools-15-0-purchase_unreconciled"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/account-financial-tools&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds a new fields “Unreconciled” on Purchase Orders, that allows
to find PO’s with unreconciled journal items related.</p>
<p>This module allows to reconcile those PO in a single click. In accounting
settings users will be able to set up a specific account for write-off.</p>
<div class="admonition important">
<p class="first admonition-title">Important</p>
<p class="last">This is an alpha version, the data model and design can change at any time without warning.
Only for development or testing purpose, do not use in production.
<a class="reference external" href="https://odoo-community.org/page/development-status">More details on development status</a></p>
</div>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p>Accountants will be able to find a filters in Purchase Orders that shows
outstanding balances in interim accounts. Also there is a link in the PO
to those outstanding journal items.</p>
@@ -394,23 +402,23 @@ to those outstanding journal items.</p>
stock iterim accounts.</p>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/account-financial-tools/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/account-financial-tools/issues/new?body=module:%20purchase_unreconciled%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/account-financial-tools/issues/new?body=module:%20purchase_unreconciled%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<ul class="simple">
<li>ForgeFlow S.L.</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li>ForgeFlow S.L. &lt;<a class="reference external" href="mailto:contact&#64;forgeflow.com">contact&#64;forgeflow.com</a>&gt;<ul>
<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
@@ -421,13 +429,15 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-tools/tree/14.0/purchase_unreconciled">OCA/account-financial-tools</a> project on GitHub.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
<p><a class="reference external image-reference" href="https://github.com/AaronHForgeFlow"><img alt="AaronHForgeFlow" src="https://github.com/AaronHForgeFlow.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/account-financial-tools/tree/15.0/purchase_unreconciled">OCA/account-financial-tools</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>

93
purchase_unreconciled/tests/test_purchase_unreconciled.py
View File

@@ -1,4 +1,4 @@
# Copyright 2019 ForgeFlow S.L.
# Copyright 2019-21 ForgeFlow S.L.
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from datetime import datetime
@@ -91,7 +91,14 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
"categ_id": cls.product_categ.id,
}
)
cls.product_to_reconcile2 = cls.product_obj.create(
{
"name": "Purchased Product 2 (To reconcile)",
"type": "product",
"standard_price": 100.0,
"categ_id": cls.product_categ.id,
}
)
# Create PO's:
cls.po = cls.po_obj.create(
{
@@ -132,6 +139,7 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
}
)
# company settings for automated valuation
cls.company.purchase_lock_auto_reconcile = True
cls.company.purchase_reconcile_account_id = cls.writeoff_acc
cls.company.purchase_reconcile_journal_id = cls.stock_journal
@@ -186,7 +194,8 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
def _do_picking(self, picking, date):
"""Do picking with only one move on the given date."""
picking.action_confirm()
picking.move_lines.quantity_done = picking.move_lines.product_uom_qty
for ml in picking.move_lines:
ml.quantity_done = ml.product_uom_qty
picking._action_done()
for move in picking.move_lines:
move.date = date
@@ -199,8 +208,9 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
self.assertTrue(po.unreconciled)
# Invoice created and validated:
po.action_create_invoice()
po.invoice_ids.invoice_date = datetime.now()
po.invoice_ids.action_post()
invoice_ids = po.invoice_ids.filtered(lambda i: i.move_type == "in_invoice")
invoice_ids.invoice_date = datetime.now()
invoice_ids.action_post()
self.assertEqual(po.state, "purchase")
# odoo does it automatically
po._compute_unreconciled()
@@ -225,7 +235,9 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
po = self.po_2
self.assertTrue(po.unreconciled)
po.action_create_invoice()
invoice_form = Form(po.invoice_ids[0])
invoice_form = Form(
po.invoice_ids.filtered(lambda i: i.move_type == "in_invoice")[0]
)
# v14 reconciles automatically so here we force discrepancy
# with invoice_form.edit(0) as inv_form:
invoice_form.invoice_date = datetime.now()
@@ -247,7 +259,9 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
# Invoice created and validated:
# Odoo reconciles automatically so here we force discrepancy
po.action_create_invoice()
invoice_form = Form(po.invoice_ids[0])
invoice_form = Form(
po.invoice_ids.filtered(lambda i: i.move_type == "in_invoice")[0]
)
invoice_form.invoice_date = datetime.now()
with invoice_form.invoice_line_ids.edit(0) as line_form:
line_form.price_unit = 99
@@ -325,6 +339,11 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
"company_id": self.ref("stock.res_company_1"),
}
)
invoice.write(
{
"name": "/",
}
)
invoice.write(
{
"company_id": self.ref("stock.res_company_1"),
@@ -343,3 +362,63 @@ class TestPurchaseUnreconciled(SingleTransactionCase):
[("purchase_order_id", "=", po.id), ("move_id", "!=", invoice.id)]
)
self.assertEqual(po.company_id, ji.mapped("company_id"))
def test_08_reconcile_by_product(self):
"""
Create a write-off by product
"""
po = self.po.copy()
po.write(
{
"order_line": [
(
0,
0,
{
"product_id": self.product_to_reconcile2.id,
"name": self.product_to_reconcile2.name,
"product_qty": 5.0,
"price_unit": 100.0,
"product_uom": self.product_to_reconcile.uom_id.id,
"date_planned": fields.Datetime.now(),
},
)
],
}
)
po.button_confirm()
self._do_picking(po.picking_ids, fields.Datetime.now())
# Invoice created and validated:
move_form = Form(self.invoice_obj.with_context(default_type="in_invoice"))
move_form.partner_id = self.partner
move_form.purchase_id = po
# force discrepancies
with move_form.invoice_line_ids.edit(0) as line_form:
line_form.price_unit = 99
with move_form.invoice_line_ids.edit(0) as line_form:
line_form.price_unit = 99
invoice = move_form.save()
invoice._post()
# The bill is different price so this is unreconciled
po._compute_unreconciled()
self.assertTrue(po.unreconciled)
po.button_done()
po._compute_unreconciled()
self.assertFalse(po.unreconciled)
# we check all the journals are balanced by product
ji_p1 = self.env["account.move.line"].search(
[
("purchase_order_id", "=", po.id),
("product_id", "=", self.product_to_reconcile.id),
("account_id", "=", self.account_grni.id),
]
)
ji_p2 = self.env["account.move.line"].search(
[
("purchase_order_id", "=", po.id),
("product_id", "=", self.product_to_reconcile2.id),
("account_id", "=", self.account_grni.id),
]
)
self.assertEqual(sum(ji_p1.mapped("balance")), 0.0)
self.assertEqual(sum(ji_p2.mapped("balance")), 0.0)

18
purchase_unreconciled/views/purchase_order_view.xml
View File

@@ -45,14 +45,18 @@
groups="account.group_account_manager"
help="Purchase orders with unreconciled journal items."
/>
<filter
name="accounting_review"
string="To Review By Accounting"
domain="[('unreconciled','=', True), ('invoice_status', '=', 'invoiced'), ('is_shipped', '=', True)]"
groups="account.group_account_manager"
help="No unreconciled journal items should remain after receive and bill"
/>
</filter>
</field>
</record>
<record id="unreconciled_amount_purchase_order_view_tree" model="ir.ui.view">
<field name="name">unreconciled.amount.purchase.order.tree</field>
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_view_tree" />
<field name="arch" type="xml">
<field name="invoice_status" position="after">
<field name="amount_unreconciled" sum="sum_ar" optional="hide" />
</field>
</field>
</record>
</odoo>

30
purchase_unreconciled/views/res_config_settings_view.xml
View File

@@ -13,9 +13,28 @@
>
<div
class="col-xs-12 col-md-6 o_setting_box"
id="account_check_deposit_offsetting_account"
id="purchase_reconcile_account"
>
<div class="o_setting_left_pane" />
<div>
<div class="o_setting_left_pane">
<field name="purchase_lock_auto_reconcile" />
</div>
<div class="o_setting_right_pane">
<label for="purchase_lock_auto_reconcile" />
<span
class="fa fa-lg fa-building-o"
title="Values set here are company-specific."
role="img"
aria-label="Values set here are company-specific."
groups="base.group_multi_company"
/>
<div class="text-muted">
Reconcile PO upon locking
</div>
</div>
<br />
</div>
<div class="o_setting_right_pane">
<label for="purchase_reconcile_account_id" />
<div class="content-group">
@@ -31,6 +50,13 @@
class="o_light_label mt16"
/>
</div>
<label for="purchase_reconcile_tolerance" />
<div class="content-group">
<field
name="purchase_reconcile_tolerance"
class="o_light_label mt16"
/>
</div>
</div>
</div>
</div>

1
purchase_unreconciled/wizards/__init__.py Normal file
View File

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

36
purchase_unreconciled/wizards/purchase_unreconciled_exceeded.py Normal file
View File

@@ -0,0 +1,36 @@
from odoo import _, fields, models
class PurchaseUnreconciledExceededWiz(models.TransientModel):
_name = "purchase.unreconciled.exceeded.wiz"
_description = "Purchase Unreconciled Exceeded Wizard"
purchase_id = fields.Many2one(
comodel_name="purchase.order", readonly=True, string="Order Number"
)
exception_msg = fields.Text(readonly=True)
origin_reference = fields.Reference(
lambda self: [
(m.model, m.name) for m in self.env["ir.model"].sudo().search([])
],
string="Object",
)
continue_method = fields.Char()
def action_show(self):
self.ensure_one()
return {
"type": "ir.actions.act_window",
"name": _("Purchase unreconciled exceeded"),
"res_model": self._name,
"res_id": self.id,
"view_mode": "form",
"target": "new",
}
def button_continue(self):
self.ensure_one()
return getattr(
self.origin_reference.with_context(bypass_unreconciled=True),
self.continue_method,
)()

26
purchase_unreconciled/wizards/purchase_unreconciled_exceeded_view.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="purchase_unreconciled_exceeded_wizard" model="ir.ui.view">
<field name="name">purchase unreconciled exceeded</field>
<field name="model">purchase.unreconciled.exceeded.wiz</field>
<field name="arch" type="xml">
<form string="Amount Unreconciled exceeded">
<p>The order has exceeded its amount unreconciled</p>
<field name="exception_msg" colspan="2" nolabel="1" />
<group>
<field name="purchase_id" />
</group>
<footer>
<button
string="Lock and Reconcile"
class="oe_highlight"
name="button_continue"
type="object"
groups="account.group_account_user"
/>
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</form>
</field>
</record>
</odoo>