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

[IMP] account[_check_printing]: Add check number into payment journal item label

Browse Source 
Since 'check_number' is now part of the journal item's label, the account_accountant_check_printing module is no longer necessary.

Task: 2555114
Part-of: odoo/odoo#91448
This commit is contained in:
Laurent Smet
2022-06-07 10:16:13 +02:00
parent 847b1e18f6
commit e79b32a868
3 changed files with 77 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
-19
View File
@@ -3581,25 +3581,6 @@ class AccountMoveLine(models.Model):
# HELPERS
# -------------------------------------------------------------------------
@api.model
def _get_default_line_name(self, document, amount, currency, date, partner=None):
''' Helper to construct a default label to set on journal items.
E.g. Vendor Reimbursement $ 1,555.00 - Azure Interior - 05/14/2020.
:param document: A string representing the type of the document.
:param amount: The document's amount.
:param currency: The document's currency.
:param date: The document's date.
:param partner: The optional partner.
:return: A string.
'''
values = ['%s %s' % (document, formatLang(self.env, amount, currency_obj=currency))]
if partner:
values.append(partner.display_name)
values.append(format_date(self.env, fields.Date.to_string(date)))
return ' - '.join(values)
@api.model
def _get_default_tax_account(self, repartition_line):
tax = repartition_line.invoice_tax_id or repartition_line.refund_tax_id
addons/account/models/account_payment.py
+68 -30
View File
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
from odoo import models, fields, api, _
from odoo.exceptions import UserError, ValidationError
from odoo.tools.misc import format_date, formatLang
class AccountPayment(models.Model):
@@ -202,17 +203,69 @@ class AccountPayment(models.Model):
self.journal_id.outbound_payment_method_line_ids.payment_account_id,
)
def _prepare_payment_display_name(self):
'''
Hook method for inherit
When you want to set a new name for payment, you can extend this method
'''
return {
'outbound-customer': _("Customer Reimbursement"),
'inbound-customer': _("Customer Payment"),
'outbound-supplier': _("Vendor Payment"),
'inbound-supplier': _("Vendor Reimbursement"),
def _get_aml_default_display_name_list(self):
""" Hook allowing custom values when constructing the default label to set on the journal items.
:return: A list of terms to concatenate all together. E.g.
[
('label', "Vendor Reimbursement"),
('sep', ' '),
('amount', "$ 1,555.00"),
('sep', ' - '),
('date', "05/14/2020"),
]
"""
self.ensure_one()
display_map = {
('outbound', 'customer'): _("Customer Reimbursement"),
('inbound', 'customer'): _("Customer Payment"),
('outbound', 'supplier'): _("Vendor Payment"),
('inbound', 'supplier'): _("Vendor Reimbursement"),
}
values = [
('label', _("Internal Transfer") if self.is_internal_transfer else display_map[(self.payment_type, self.partner_type)]),
('sep', ' '),
('amount', formatLang(self.env, self.amount, currency_obj=self.currency_id)),
]
if self.partner_id:
values += [
('sep', ' - '),
('partner', self.partner_id.display_name),
]
values += [
('sep', ' - '),
('date', format_date(self.env, fields.Date.to_string(self.date))),
]
return values
def _get_liquidity_aml_display_name_list(self):
""" Hook allowing custom values when constructing the label to set on the liquidity line.
:return: A list of terms to concatenate all together. E.g.
[('reference', "INV/2018/0001")]
"""
self.ensure_one()
if self.is_internal_transfer:
if self.payment_type == 'inbound':
return [('transfer_to', _('Transfer to %s', self.journal_id.name))]
else: # payment.payment_type == 'outbound':
return [('transfer_from', _('Transfer from %s', self.journal_id.name))]
elif self.payment_reference:
return [('reference', self.payment_reference)]
else:
return self._get_aml_default_display_name_list()
def _get_counterpart_aml_display_name_list(self):
""" Hook allowing custom values when constructing the label to set on the counterpart line.
:return: A list of terms to concatenate all together. E.g.
[('reference', "INV/2018/0001")]
"""
self.ensure_one()
if self.payment_reference:
return [('reference', self.payment_reference)]
else:
return self._get_aml_default_display_name_list()
def _prepare_move_line_default_vals(self, write_off_line_vals=None):
''' Prepare the dictionary to create the default account.move.lines for the current payment.
@@ -259,30 +312,14 @@ class AccountPayment(models.Model):
counterpart_balance = -liquidity_balance - write_off_balance
currency_id = self.currency_id.id
if self.is_internal_transfer:
if self.payment_type == 'inbound':
liquidity_line_name = _('Transfer to %s', self.journal_id.name)
else: # payment.payment_type == 'outbound':
liquidity_line_name = _('Transfer from %s', self.journal_id.name)
else:
liquidity_line_name = self.payment_reference
# Compute a default label to set on the journal items.
payment_display_name = self._prepare_payment_display_name()
default_line_name = self.env['account.move.line']._get_default_line_name(
_("Internal Transfer") if self.is_internal_transfer else payment_display_name['%s-%s' % (self.payment_type, self.partner_type)],
self.amount,
self.currency_id,
self.date,
partner=self.partner_id,
)
liquidity_line_name = ''.join(x[1] for x in self._get_liquidity_aml_display_name_list())
counterpart_line_name = ''.join(x[1] for x in self._get_counterpart_aml_display_name_list())
line_vals_list = [
# Liquidity line.
{
'name': liquidity_line_name or default_line_name,
'name': liquidity_line_name,
'date_maturity': self.date,
'amount_currency': liquidity_amount_currency,
'currency_id': currency_id,
@@ -293,7 +330,7 @@ class AccountPayment(models.Model):
},
# Receivable / Payable.
{
'name': self.payment_reference or default_line_name,
'name': counterpart_line_name,
'date_maturity': self.date,
'amount_currency': counterpart_amount_currency,
'currency_id': currency_id,
@@ -305,6 +342,7 @@ class AccountPayment(models.Model):
]
if not self.currency_id.is_zero(write_off_amount_currency):
# Write-off line.
default_line_name = ''.join(x[1] for x in self._get_aml_default_display_name_list())
line_vals_list.append({
'name': write_off_line_vals.get('name') or default_line_name,
'amount_currency': write_off_amount_currency,
addons/account_check_printing/models/account_payment.py
+9
View File
@@ -115,6 +115,15 @@ class AccountPayment(models.Model):
if record.payment_type == 'outbound' and method_line:
record.payment_method_line_id = method_line[0]
def _get_aml_default_display_name_list(self):
# Extends 'account'
values = super()._get_aml_default_display_name_list()
if self.check_number:
date_index = [i for i, value in enumerate(values) if value[0] == 'date'][0]
values.insert(date_index - 1, ('check_number', self.check_number))
values.insert(date_index - 1, ('sep', ' - '))
return values
def action_post(self):
payment_method_check = self.env.ref('account_check_printing.account_payment_method_check')
for payment in self.filtered(lambda p: p.payment_method_id == payment_method_check and p.check_manual_sequencing):