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

[IMP] account: import cut-off entries labels

Browse Source 
Current cut-off entry labels are always "Adjusting Entry", which is unclear, especially when viewing entries from General Ledger.
Adding the Invoice number and adjusting the % recognized within each entry will make the labels easier to understand.
The percentage will be calculated accordingly, the cut-off percentage for the adjusting entry and (100% - cut-off percentage) for the original entry.
Also, the percentage on labels should be rounded.

task-2897292

closes odoo/odoo#97045

Signed-off-by: Olivier Colson (oco) <oco@odoo.com>
This commit is contained in:
aliya
2022-08-25 12:04:57 +02:00
parent 25de7d3193
commit 338a974a2f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_automatic_entry_wizard.py
+8 -7
View File
@@ -213,7 +213,7 @@ class AutomaticEntryWizard(models.TransientModel):
'currency_id': self.journal_id.currency_id.id or self.journal_id.company_id.currency_id.id,
'move_type': 'entry',
'line_ids': [],
'ref': _('Adjusting Entry'),
'ref': self._format_strings(_('{label}: Adjusting Entry of {new_date}'), self.move_line_ids[0].move_id),
'date': fields.Date.to_string(self.date),
'journal_id': self.journal_id.id,
}}
@@ -225,7 +225,7 @@ class AutomaticEntryWizard(models.TransientModel):
'currency_id': self.journal_id.currency_id.id or self.journal_id.company_id.currency_id.id,
'move_type': 'entry',
'line_ids': [],
'ref': self._format_strings(_('Adjusting Entry of {date} ({percent:.2f}% recognized on {new_date})'), grouped_lines[0].move_id, amount),
'ref': self._format_strings(_('{label}: Adjusting Entry of {date}'), grouped_lines[0].move_id, amount),
'date': fields.Date.to_string(date),
'journal_id': self.journal_id.id,
}
@@ -248,7 +248,7 @@ class AutomaticEntryWizard(models.TransientModel):
'partner_id': aml.partner_id.id,
}),
(0, 0, {
'name': _('Adjusting Entry'),
'name': self._format_strings(_('{percent:0.2f}% recognized on {new_date}'), aml.move_id),
'debit': reported_credit,
'credit': reported_debit,
'amount_currency': -reported_amount_currency,
@@ -268,7 +268,7 @@ class AutomaticEntryWizard(models.TransientModel):
'partner_id': aml.partner_id.id,
}),
(0, 0, {
'name': _('Adjusting Entry'),
'name': self._format_strings(_('{percent:0.2f}% to recognize on {new_date}'), aml.move_id),
'debit': reported_debit,
'credit': reported_credit,
'amount_currency': reported_amount_currency,
@@ -436,13 +436,14 @@ class AutomaticEntryWizard(models.TransientModel):
def _format_move_link(self, move):
return move._get_html_link()
def _format_strings(self, string, move, amount):
def _format_strings(self, string, move, amount=None):
return string.format(
label=move.name or 'Adjusting Entry',
percent=self.percentage,
name=move.name,
id=move.id,
amount=formatLang(self.env, abs(amount), currency_obj=self.company_id.currency_id),
debit_credit=amount < 0 and _('C') or _('D'),
amount=formatLang(self.env, abs(amount), currency_obj=self.company_id.currency_id) if amount else '',
debit_credit=amount < 0 and _('C') or _('D') if amount else None,
link=self._format_move_link(move),
date=format_date(self.env, move.date),
new_date=self.date and format_date(self.env, self.date) or _('[Not set]'),