From 8767ecc693d83564faf084805aeae6ec4793b773 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@odoo.com>
Date: Thu, 1 Mar 2018 14:40:16 +0100
Subject: [PATCH] [FIX] account: support of multi-company in reconciliation
widget
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Make sure that all propositions/created data will be linked to the company of the processed statement line.
+ adapted QUnit tests
Closes PR #23070.
Co-authored-by: Miquel Raïch (Eficent) <miquel.raich@eficent.com>
---
.../account/models/reconciliation_widget.py | 34 +++++++-----
.../reconciliation/reconciliation_renderer.js | 3 ++
.../static/tests/reconciliation_tests.js | 53 ++++++++++++-------
3 files changed, 58 insertions(+), 32 deletions(-)
diff --git a/addons/account/models/reconciliation_widget.py b/addons/account/models/reconciliation_widget.py
index ea8a77d22f56..d41143a0b2b9 100644
--- a/addons/account/models/reconciliation_widget.py
+++ b/addons/account/models/reconciliation_widget.py
@@ -115,7 +115,7 @@ class AccountReconciliation(models.AbstractModel):
if partner_id is None:
partner_id = st_line.partner_id.id
- domain = self._domain_move_lines_for_reconciliation(aml_accounts, partner_id, excluded_ids=excluded_ids, search_str=search_str)
+ domain = self._domain_move_lines_for_reconciliation(st_line, aml_accounts, partner_id, excluded_ids=excluded_ids, search_str=search_str)
aml_recs = self.env['account.move.line'].search(domain, offset=offset, limit=limit, order="date_maturity desc, id desc")
target_currency = st_line.currency_id or st_line.journal_id.currency_id or st_line.journal_id.company_id.currency_id
return self._prepare_move_lines(aml_recs, target_currency=target_currency, target_date=st_line.date)
@@ -163,12 +163,14 @@ class AccountReconciliation(models.AbstractModel):
sql_query = """SELECT stl.id
FROM account_bank_statement_line stl
WHERE account_id IS NULL AND stl.amount != 0.0 AND not exists (select 1 from account_move_line aml where aml.statement_line_id = stl.id)
- AND company_id = %s
"""
- params = (self.env.user.company_id.id,)
+ params = []
if bank_statements:
sql_query += ' AND stl.statement_id IN %s'
params += (tuple(bank_statements.ids),)
+ else:
+ sql_query += ' AND stl.company_id = %s'
+ params += [self.env.user.company_id.id]
sql_query += ' ORDER BY stl.id'
self.env.cr.execute(sql_query, params)
st_lines_left = Bank_statement_line.browse([line.get('id') for line in self.env.cr.dictfetchall()])
@@ -184,16 +186,16 @@ class AccountReconciliation(models.AbstractModel):
FROM account_move_line aml
JOIN account_account acc ON acc.id = aml.account_id
JOIN account_bank_statement_line stl ON aml.ref = stl.name
- WHERE (aml.company_id = %s
- AND aml.partner_id IS NOT NULL)
+ WHERE (aml.company_id = stl.company_id
+ AND aml.partner_id IS NOT NULL)
AND (
- (aml.statement_id IS NULL AND aml.account_id IN %s)
- OR
+ (aml.statement_id IS NULL AND aml.account_id IN %s)
+ OR
(acc.internal_type IN ('payable', 'receivable') AND aml.reconciled = false)
)
AND aml.ref IN %s
"""
- params = (self.env.user.company_id.id, (st_lines_left[0].journal_id.default_credit_account_id.id, st_lines_left[0].journal_id.default_debit_account_id.id), tuple(refs))
+ params = ((st_lines_left[0].journal_id.default_credit_account_id.id, st_lines_left[0].journal_id.default_debit_account_id.id), tuple(refs))
if bank_statements:
sql_query += 'AND stl.id IN %s'
params += (tuple(stl_to_assign.ids),)
@@ -402,9 +404,7 @@ class AccountReconciliation(models.AbstractModel):
'|', ('amount_residual', '=', -amount),
'|', ('amount_residual_currency', '=', -amount),
'&', ('account_id.internal_type', '=', 'liquidity'),
- '|', '|', '|', ('debit', '=', amount), ('credit', '=', amount),
- ('amount_currency', '=', amount),
- ('amount_currency', '=', -amount),
+ '|', '|', '|', ('debit', '=', amount), ('credit', '=', amount), ('amount_currency', '=', amount), ('amount_currency', '=', -amount),
]
str_domain = expression.OR([str_domain, amount_domain])
except:
@@ -412,7 +412,7 @@ class AccountReconciliation(models.AbstractModel):
return str_domain
@api.model
- def _domain_move_lines_for_reconciliation(self, aml_accounts, partner_id, excluded_ids=None, search_str=False):
+ def _domain_move_lines_for_reconciliation(self, st_line, aml_accounts, partner_id, excluded_ids=None, search_str=False):
""" Return the domain for account.move.line records which can be used for bank statement reconciliation.
:param aml_accounts:
@@ -465,6 +465,8 @@ class AccountReconciliation(models.AbstractModel):
[('id', 'not in', excluded_ids)],
domain
])
+ # filter on account.move.line having the same company as the statement line
+ domain = expression.AND([domain, [('company_id', '=', st_line.company_id.id)]])
return domain
@api.model
@@ -478,6 +480,9 @@ class AccountReconciliation(models.AbstractModel):
if search_str:
str_domain = self._domain_move_lines(search_str=search_str)
domain = expression.AND([domain, str_domain])
+ # filter on account.move.line having the same company as the given account
+ account = self.env['account.account'].browse(account_id)
+ domain = expression.AND([domain, [('company_id', '=', account.company_id.id)]])
return domain
@api.model
@@ -615,6 +620,7 @@ class AccountReconciliation(models.AbstractModel):
'amount_currency_str': amount_currency_str, # Amount in the statement currency
'amount_currency': amount_currency, # Amount in the statement currency
'has_no_partner': not st_line.partner_id.id,
+ 'company_id': st_line.company_id.id,
}
if st_line.partner_id:
if amount > 0:
@@ -638,7 +644,7 @@ class AccountReconciliation(models.AbstractModel):
st_line_currency = st_line.currency_id or st_line.journal_id.currency_id
currency = (st_line_currency and st_line_currency != company_currency) and st_line_currency.id or False
precision = st_line_currency and st_line_currency.decimal_places or company_currency.decimal_places
- params = {'company_id': self.env.user.company_id.id,
+ params = {'company_id': st_line.company_id.id,
'account_payable_receivable': (st_line.journal_id.default_credit_account_id.id, st_line.journal_id.default_debit_account_id.id),
'amount': float_repr(float_round(amount, precision_digits=precision), precision_digits=precision),
'partner_id': st_line.partner_id.id,
@@ -663,7 +669,7 @@ class AccountReconciliation(models.AbstractModel):
liquidity_field = currency and 'amount_currency' or amount > 0 and 'debit' or 'credit'
liquidity_amt_clause = currency and '%(amount)s::numeric' or 'abs(%(amount)s::numeric)'
sql_query = st_line._get_common_sql_query(excluded_ids=excluded_ids) + \
- " AND ("+field+" = %(amount)s::numeric OR (acc.internal_type = 'liquidity' AND "+liquidity_field+" = " + liquidity_amt_clause + ")) \
+ " AND (" + field + " = %(amount)s::numeric OR (acc.internal_type = 'liquidity' AND " + liquidity_field + " = " + liquidity_amt_clause + ")) \
ORDER BY date_maturity desc, aml.id desc LIMIT 1"
self.env.cr.execute(sql_query, params)
results = self.env.cr.fetchone()
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
index d68d4e9d693a..8108b0efa096 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js
@@ -496,14 +496,17 @@ var LineRenderer = Widget.extend(FieldManagerMixin, {
relation: 'account.account',
type: 'many2one',
name: 'account_id',
+ domain: [['company_id', '=', state.st_line.company_id]],
}, {
relation: 'account.journal',
type: 'many2one',
name: 'journal_id',
+ domain: [['company_id', '=', state.st_line.company_id]],
}, {
relation: 'account.tax',
type: 'many2one',
name: 'tax_id',
+ domain: [['company_id', '=', state.st_line.company_id]],
}, {
relation: 'account.analytic.account',
type: 'many2one',
diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js
index 809830b09fd6..6a26ad45f2aa 100644
--- a/addons/account/static/tests/reconciliation_tests.js
+++ b/addons/account/static/tests/reconciliation_tests.js
@@ -4,6 +4,15 @@ odoo.define('account.reconciliation_tests.data', function () {
var Datas = {};
var db = {
+ 'res.company': {
+ fields: {
+ id: {string: "ID", type: 'integer'},
+ display_name: {string: "Displayed name", type: 'char'},
+ },
+ records: [
+ {id: 1, display_name: "company 1"},
+ ],
+ },
'res.partner': {
fields: {
id: {string: "ID", type: 'integer'},
@@ -35,16 +44,17 @@ var db = {
id: {string: "ID", type: 'integer'},
code: {string: "code", type: 'integer'},
display_name: {string: "Displayed name", type: 'char'},
+ company_id: {string: "Company", type: 'many2one', relation: 'res.company'},
},
records: [
- {id: 282, code: 100000, display_name: "100000 Fixed Asset Account"},
- {id: 283, code: 101000, display_name: "101000 Current Assets"},
- {id: 284, code: 101110, display_name: "101110 Stock Valuation Account"},
- {id: 285, code: 101120, display_name: "101120 Stock Interim Account (Received)"},
- {id: 286, code: 101130, display_name: "101130 Stock Interim Account (Delivered)"},
- {id: 287, code: 101200, display_name: "101200 Account Receivable"},
- {id: 288, code: 101300, display_name: "101300 Tax Paid"},
- {id: 308, code: 101401, display_name: "101401 Bank"},
+ {id: 282, code: 100000, display_name: "100000 Fixed Asset Account", company_id: 1},
+ {id: 283, code: 101000, display_name: "101000 Current Assets", company_id: 1},
+ {id: 284, code: 101110, display_name: "101110 Stock Valuation Account", company_id: 1},
+ {id: 285, code: 101120, display_name: "101120 Stock Interim Account (Received)", company_id: 1},
+ {id: 286, code: 101130, display_name: "101130 Stock Interim Account (Delivered)", company_id: 1},
+ {id: 287, code: 101200, display_name: "101200 Account Receivable", company_id: 1},
+ {id: 288, code: 101300, display_name: "101300 Tax Paid", company_id: 1},
+ {id: 308, code: 101401, display_name: "101401 Bank", company_id: 1},
],
mark_as_reconciled: function () {
return $.when();
@@ -57,10 +67,11 @@ var db = {
amount: {string: "amout", type: 'float'},
price_include: {string: "Included in Price", type: 'boolean'},
account_id: {string: "partner", type: 'many2one', relation: 'account.account'},
+ company_id: {string: "Company", type: 'many2one', relation: 'res.company'},
},
records: [
- {id: 6, display_name: "Tax 20.00%", amount: 20, price_include: false},
- {id: 7, display_name: "Tax 10.00% include", amount: 10, price_include: true, account_id: 288},
+ {id: 6, display_name: "Tax 20.00%", amount: 20, price_include: false, company_id: 1},
+ {id: 7, display_name: "Tax 10.00% include", amount: 10, price_include: true, account_id: 288, company_id: 1},
],
json_friendly_compute_all: function (args) {
var tax = _.find(db['account.tax'].records, {'id': args[0][0]});
@@ -86,6 +97,7 @@ var db = {
fields: {
id: {string: "ID", type: 'integer'},
display_name: {string: "Displayed name", type: 'char'},
+ company_id: {string: "Company", type: 'many2one', relation: 'res.company'},
},
records: []
},
@@ -117,12 +129,13 @@ var db = {
id: {string: "ID", type: 'integer'},
display_name: {string: "Displayed name", type: 'char'},
partner_id: {string: "partner", type: 'many2one', relation: 'res.partner'},
+ company_id: {string: "Company", type: 'many2one', relation: 'res.company'},
},
records: [
- {id: 5, display_name: "SAJ/2014/002 and SAJ/2014/003"},
- {id: 6, display_name: "Bank fees"},
- {id: 7, display_name: "Prepayment"},
- {id: 8, display_name: "First 2000 \u20ac of SAJ/2014/001"},
+ {id: 5, display_name: "SAJ/2014/002 and SAJ/2014/003", company_id: 1},
+ {id: 6, display_name: "Bank fees", company_id: 1},
+ {id: 7, display_name: "Prepayment", company_id: 1},
+ {id: 8, display_name: "First 2000 \u20ac of SAJ/2014/001", company_id: 1},
],
},
'account.move.line': {
@@ -252,7 +265,8 @@ var data_widget = [
'account_code': "101401",
'ref': "",
'id': 5,
- 'statement_id': 2
+ 'statement_id': 2,
+ 'company_id': 1,
},
'reconciliation_proposition': []
},
@@ -274,7 +288,8 @@ var data_widget = [
'account_code': "101401",
'ref': "",
'id': 6,
- 'statement_id': 2
+ 'statement_id': 2,
+ 'company_id': 1,
},
'reconciliation_proposition': []
},
@@ -297,7 +312,8 @@ var data_widget = [
'account_code': "101401",
'ref': "",
'id': 7,
- 'statement_id': 2
+ 'statement_id': 2,
+ 'company_id': 1,
},
'reconciliation_proposition': [
{
@@ -343,7 +359,8 @@ var data_widget = [
'account_code': "101401",
'ref': "",
'id': 8,
- 'statement_id': 2
+ 'statement_id': 2,
+ 'company_id': 1,
},
'reconciliation_proposition': []
},
--
GitLab