pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: fix liquidity journal currency

Browse Source 
Currently, if a liquidity journal has a currency set (e.g. Bank) the amount_currency shows lines according to the journal currency, which is correct. However, if the journal currency is the same as the company currency, the amount_currency shows the amount in the foreign currency that is not in fact held in the Bank.
Should be: follow the same logic for liquidity journals that have the same currency as the company (or set company currency by default) and show amount in journal/company currency.

closes odoo/odoo#85975

Task: 2779310
X-original-commit: 2e7a8e8200a4666baad74c9b596208841501c225
Signed-off-by: Laurent Smet <las@odoo.com>
This commit is contained in:
aliya
2022-03-08 11:03:43 +00:00
parent 356e6aa4f3
commit 631212c895
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_bank_statement.py
+1 -1
View File
@@ -586,7 +586,7 @@ class AccountBankStatementLine(models.Model):
statement = self.statement_id
journal = statement.journal_id
company_currency = journal.company_id.currency_id
journal_currency = journal.currency_id if journal.currency_id != company_currency else False
journal_currency = journal.currency_id or company_currency
if self.foreign_currency_id and journal_currency:
currency_id = journal_currency.id
addons/account/tests/test_account_bank_statement.py
+21 -15
View File
@@ -334,11 +334,11 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
cls.expected_bank_line = {
'name': cls.statement_line.payment_ref,
'partner_id': cls.statement_line.partner_id.id,
'currency_id': cls.currency_2.id,
'currency_id': cls.currency_1.id,
'account_id': cls.statement.journal_id.default_account_id.id,
'debit': 1250.0,
'credit': 0.0,
'amount_currency': 2500.0,
'amount_currency': 1250.0,
}
cls.expected_counterpart_line = {
@@ -513,9 +513,10 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
def test_edition_journal_curr_1_statement_curr_2(self):
self._test_edition_customer_and_supplier_flows(
# pylint: disable=C0326
80.0, 120.0,
self.currency_1, self.currency_2,
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 120.0, 'currency_id': self.currency_2.id},
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 80.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 80.0, 'amount_currency': -120.0, 'currency_id': self.currency_2.id},
)
@@ -555,7 +556,8 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
})
self.assertRecordValues(statement.line_ids.move_id.line_ids, [
{'debit': 0.0, 'credit': 0.0, 'amount_currency': 10.0, 'currency_id': self.currency_2.id},
# pylint: disable=C0326
{'debit': 0.0, 'credit': 0.0, 'amount_currency': 0.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 0.0, 'amount_currency': -10.0, 'currency_id': self.currency_2.id},
])
@@ -579,7 +581,8 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
})
self.assertRecordValues(statement.line_ids.move_id.line_ids, [
{'debit': 10.0, 'credit': 0.0, 'amount_currency': 0.0, 'currency_id': self.currency_2.id},
# pylint: disable=C0326
{'debit': 10.0, 'credit': 0.0, 'amount_currency': 10.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 10.0, 'amount_currency': 0.0, 'currency_id': self.currency_2.id},
])
@@ -775,8 +778,8 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
**self.expected_bank_line,
'debit': 0.0,
'credit': 2000.0,
'amount_currency': -4000.0,
'currency_id': self.currency_3.id,
'amount_currency': -2000.0,
'currency_id': self.currency_1.id,
},
{
**self.expected_counterpart_line,
@@ -807,8 +810,8 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
'partner_id': self.statement_line.partner_id.id,
'debit': 0.0,
'credit': 2000.0,
'amount_currency': -4000.0,
'currency_id': self.currency_3.id,
'amount_currency': -2000.0,
'currency_id': self.currency_1.id,
},
{
**self.expected_counterpart_line,
@@ -1057,17 +1060,19 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
def test_reconciliation_journal_curr_1_statement_curr_2_counterpart_curr_2(self):
self._test_reconciliation_customer_and_supplier_flows(
# pylint: disable=C0326
80.0, 120.0, -120.0,
self.currency_1, self.currency_2, self.currency_2,
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 120.0, 'currency_id': self.currency_2.id},
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 80.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 80.0, 'amount_currency': -120.0, 'currency_id': self.currency_2.id},
)
def test_reconciliation_journal_curr_1_statement_curr_2_counterpart_curr_3(self):
self._test_reconciliation_customer_and_supplier_flows(
# pylint: disable=C0326
80.0, 120.0, -480.0,
self.currency_1, self.currency_2, self.currency_3,
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 120.0, 'currency_id': self.currency_2.id},
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 80.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 80.0, 'amount_currency': -120.0, 'currency_id': self.currency_2.id},
)
@@ -1113,9 +1118,10 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
def test_reconciliation_journal_curr_1_statement_curr_2_counterpart_curr_1(self):
self._test_reconciliation_customer_and_supplier_flows(
# pylint: disable=C0326
80.0, 120.0, -80.0,
self.currency_1, self.currency_2, self.currency_1,
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 120.0, 'currency_id': self.currency_2.id},
{'debit': 80.0, 'credit': 0.0, 'amount_currency': 80.0, 'currency_id': self.currency_1.id},
{'debit': 0.0, 'credit': 80.0, 'amount_currency': -120.0, 'currency_id': self.currency_2.id},
)
@@ -1267,7 +1273,7 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
{
**self.expected_bank_line,
'amount_residual': 1250.0,
'amount_residual_currency': 2500.0,
'amount_residual_currency': 1250.0,
},
])
@@ -1309,7 +1315,7 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
{
**self.expected_bank_line,
'amount_residual': 1250.0,
'amount_residual_currency': 2500.0,
'amount_residual_currency': 1250.0,
},
])
@@ -1347,7 +1353,7 @@ class TestAccountBankStatementLine(TestAccountBankStatementCommon):
{
**self.expected_bank_line,
'amount_residual': 1250.0,
'amount_residual_currency': 2500.0,
'amount_residual_currency': 1250.0,
},
])