mcm-odoo
1c34882478
Changes in account views to make them cleaner and
easier to use and understand.
Invoices/Bills tree view
---
- Distinct Invoices tree view from Bills tree view:
In Invoices:
- invoice_vendor_display_name is "Customer"
- invoice_date is "Invoice Date"
- "Payment Reference" is hidden because it's the same
as "Number"
In Bills:
- invoice_vendor_display_name is "Vendor"
- invoice_date is "Bill Date"
- "Source Document" is moved next to "Number"
- Renamed "Payment Status" to "Payment"
- "Payment Status" value "paid" renamed to "Paid"
- Search filters:
- Renamed "Open" to "Posted"
- Added a separator after "Posted"
- Removed "Linked to revoked mandate"
Invoices/Bills form view
---
- Removed "Original vendor bills" from form but kept it in list
and renamed to "Original Bills"
- Renamed state "Unposted" to "Draft"
- "Draft *" titles are now in h1
- Added placeholders and removed tooltips on Payment Terms
- Removed tooltips of invoice date
- Hid Accounting Date on Customer Invoices
because it's the same as Invoice Date
- Rewamped payment info popup:
- Renamed title to "Payment Info"
- Removed right alignment
- Removed Name info
- Reordered info: Amount, Memo, Date, Method
- Added optional to few fields in tab "Invoice Lines":
- Analytic Account: show
- Analytic Tags: show
- Intrastat: show
- Origin Country of Product: hide (and renamed to "Product Country")
- Unit of Measure: show
- Disc (%): show
- Taxes: show
- Added optional to few fields in tab "Journal Items":
- Label: show
- Analytic Account: hide
- Balance in Currency: hide (renamed to "Amount in currency")
- Taxes Applied: hide (moved before debit and renamed to "Taxes")
- Tax Grids: show (moved after credit)
- Due date: hide (moved before Balance in currency renamed to "Due Date")
- Tab "Other Info":
- Renamed sections:
Sales Information -> Invoice
Accounting Information -> Accounting
Payments Information -> Payments
- Website is now hidden if not set and tracked in chatter
Payment form view and modal
---
- State "Posted" renamed to "Validated"
- State "Cancelled" is hidden while module account_cancel
is not installed
- Renamed "Payment Method Type" to "Payment Method"
- Renamed "Payment Date" to "Date"
- Renamed "Payment Amount" to "Amount"
- Renamed "Payment Journal" to "Journal"
- Reordered fields:
Journal Amount
Payment Method Date
Recipient Bank Account Memo
- Payment Difference is now visible only with
accountant access rights.
Journals form view
---
- Removed Journal Groups
- Changed position of "Bank Account"
it's now the first tab
- In "Advanced Settings":
- Renamed section "Accounting App Options" to "Posting"
and only visible when Accounting rights
- "Post at Bank Reconciliation" was a Boolean field and is now a
Selection field with values pay_val for Payment Validation and bank_rec
for Bank Reconciliation.
In form view it's now a radio button.
Removed tooltip of this field.
- Section "Control-Access" is now visible with Accounting Manager rights
- Renamed "Invoice References" to "Payment References"
- Field "Communication Type" value "Based on Partner" renamed to "Based on Customer"
- Reorder sections:
Payment References
Email your Invoices/Bills
Control Access
Purchase form view
---
- In Purchase Order: Field Billing Status is invisible if the status
of the purchase.order is draft/sent/to approve/cancelled
task-2032586
849 lines
47 KiB
Python
849 lines
47 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from odoo import api, fields, models, _
|
|
from odoo.osv import expression
|
|
from odoo.tools import float_is_zero
|
|
from odoo.tools import float_compare, float_round, float_repr
|
|
from odoo.tools.misc import formatLang, format_date
|
|
from odoo.exceptions import UserError, ValidationError
|
|
|
|
import time
|
|
import math
|
|
import base64
|
|
|
|
class AccountCashboxLine(models.Model):
|
|
""" Cash Box Details """
|
|
_name = 'account.cashbox.line'
|
|
_description = 'CashBox Line'
|
|
_rec_name = 'coin_value'
|
|
_order = 'coin_value'
|
|
|
|
@api.depends('coin_value', 'number')
|
|
def _sub_total(self):
|
|
""" Calculates Sub total"""
|
|
for cashbox_line in self:
|
|
cashbox_line.subtotal = cashbox_line.coin_value * cashbox_line.number
|
|
|
|
coin_value = fields.Float(string='Coin/Bill Value', required=True, digits=0)
|
|
number = fields.Integer(string='#Coins/Bills', help='Opening Unit Numbers')
|
|
subtotal = fields.Float(compute='_sub_total', string='Subtotal', digits=0, readonly=True)
|
|
cashbox_id = fields.Many2one('account.bank.statement.cashbox', string="Cashbox")
|
|
currency_id = fields.Many2one('res.currency', related='cashbox_id.currency_id')
|
|
|
|
|
|
class AccountBankStmtCashWizard(models.Model):
|
|
"""
|
|
Account Bank Statement popup that allows entering cash details.
|
|
"""
|
|
_name = 'account.bank.statement.cashbox'
|
|
_description = 'Bank Statement Cashbox'
|
|
|
|
cashbox_lines_ids = fields.One2many('account.cashbox.line', 'cashbox_id', string='Cashbox Lines')
|
|
start_bank_stmt_ids = fields.One2many('account.bank.statement', 'cashbox_start_id')
|
|
end_bank_stmt_ids = fields.One2many('account.bank.statement', 'cashbox_end_id')
|
|
total = fields.Float(compute='_compute_total')
|
|
currency_id = fields.Many2one('res.currency', compute='_compute_currency')
|
|
|
|
@api.depends('start_bank_stmt_ids', 'end_bank_stmt_ids')
|
|
def _compute_currency(self):
|
|
for cashbox in self:
|
|
if cashbox.end_bank_stmt_ids:
|
|
cashbox.currency_id = cashbox.end_bank_stmt_ids[0].currency_id
|
|
if cashbox.start_bank_stmt_ids:
|
|
cashbox.currency_id = cashbox.start_bank_stmt_ids[0].currency_id
|
|
|
|
@api.depends('cashbox_lines_ids', 'cashbox_lines_ids.coin_value', 'cashbox_lines_ids.number')
|
|
def _compute_total(self):
|
|
for cashbox in self:
|
|
cashbox.total = sum([line.subtotal for line in cashbox.cashbox_lines_ids])
|
|
|
|
@api.model
|
|
def default_get(self, fields):
|
|
vals = super(AccountBankStmtCashWizard, self).default_get(fields)
|
|
balance = self.env.context.get('balance')
|
|
statement_id = self.env.context.get('statement_id')
|
|
if 'start_bank_stmt_ids' in fields and not vals.get('start_bank_stmt_ids') and statement_id and balance == 'start':
|
|
vals['start_bank_stmt_ids'] = [(6, 0, [statement_id])]
|
|
if 'end_bank_stmt_ids' in fields and not vals.get('end_bank_stmt_ids') and statement_id and balance == 'close':
|
|
vals['end_bank_stmt_ids'] = [(6, 0, [statement_id])]
|
|
|
|
return vals
|
|
|
|
def name_get(self):
|
|
result = []
|
|
for cashbox in self:
|
|
result.append((cashbox.id, _("%s")%(cashbox.total)))
|
|
return result
|
|
|
|
@api.model_create_multi
|
|
def create(self, vals):
|
|
cashboxes = super(AccountBankStmtCashWizard, self).create(vals)
|
|
cashboxes._validate_cashbox()
|
|
return cashboxes
|
|
|
|
def write(self, vals):
|
|
res = super(AccountBankStmtCashWizard, self).write(vals)
|
|
self._validate_cashbox()
|
|
return res
|
|
|
|
def _validate_cashbox(self):
|
|
for cashbox in self:
|
|
if self.start_bank_stmt_ids:
|
|
self.start_bank_stmt_ids.write({'balance_start': self.total})
|
|
if self.end_bank_stmt_ids:
|
|
self.end_bank_stmt_ids.write({'balance_end_real': self.total})
|
|
|
|
|
|
class AccountBankStmtCloseCheck(models.TransientModel):
|
|
"""
|
|
Account Bank Statement wizard that check that closing balance is correct.
|
|
"""
|
|
_name = 'account.bank.statement.closebalance'
|
|
_description = 'Bank Statement Closing Balance'
|
|
|
|
def validate(self):
|
|
bnk_stmt_id = self.env.context.get('active_id', False)
|
|
if bnk_stmt_id:
|
|
self.env['account.bank.statement'].browse(bnk_stmt_id).button_confirm_bank()
|
|
return {'type': 'ir.actions.act_window_close'}
|
|
|
|
|
|
class AccountBankStatement(models.Model):
|
|
|
|
@api.depends('line_ids', 'balance_start', 'line_ids.amount', 'balance_end_real')
|
|
def _end_balance(self):
|
|
for statement in self:
|
|
statement.total_entry_encoding = sum([line.amount for line in statement.line_ids])
|
|
statement.balance_end = statement.balance_start + statement.total_entry_encoding
|
|
statement.difference = statement.balance_end_real - statement.balance_end
|
|
|
|
def _is_difference_zero(self):
|
|
for bank_stmt in self:
|
|
bank_stmt.is_difference_zero = float_is_zero(bank_stmt.difference, precision_digits=bank_stmt.currency_id.decimal_places)
|
|
|
|
@api.depends('journal_id')
|
|
def _compute_currency(self):
|
|
for statement in self:
|
|
statement.currency_id = statement.journal_id.currency_id or statement.company_id.currency_id
|
|
|
|
@api.depends('line_ids.journal_entry_ids')
|
|
def _check_lines_reconciled(self):
|
|
for statement in self:
|
|
statement.all_lines_reconciled = all(
|
|
line.journal_entry_ids.ids or line.account_id.id
|
|
for line in statement.line_ids
|
|
if not statement.currency_id.is_zero(line.amount)
|
|
)
|
|
|
|
@api.depends('move_line_ids')
|
|
def _get_move_line_count(self):
|
|
for payment in self:
|
|
payment.move_line_count = len(payment.move_line_ids)
|
|
|
|
@api.model
|
|
def _default_journal(self):
|
|
journal_type = self.env.context.get('journal_type', False)
|
|
company_id = self.env.company.id
|
|
if journal_type:
|
|
journals = self.env['account.journal'].search([('type', '=', journal_type), ('company_id', '=', company_id)])
|
|
if journals:
|
|
return journals[0]
|
|
return self.env['account.journal']
|
|
|
|
def _get_opening_balance(self, journal_id):
|
|
last_bnk_stmt = self.search([('journal_id', '=', journal_id)], limit=1)
|
|
if last_bnk_stmt:
|
|
return last_bnk_stmt.balance_end
|
|
return 0
|
|
|
|
def _set_opening_balance(self, journal_id):
|
|
self.balance_start = self._get_opening_balance(journal_id)
|
|
|
|
@api.model
|
|
def _default_opening_balance(self):
|
|
#Search last bank statement and set current opening balance as closing balance of previous one
|
|
journal_id = self._context.get('default_journal_id', False) or self._context.get('journal_id', False)
|
|
if journal_id:
|
|
return self._get_opening_balance(journal_id)
|
|
return 0
|
|
|
|
_name = "account.bank.statement"
|
|
_description = "Bank Statement"
|
|
_order = "date desc, id desc"
|
|
_inherit = ['mail.thread']
|
|
|
|
name = fields.Char(string='Reference', states={'open': [('readonly', False)]}, copy=False, readonly=True)
|
|
reference = fields.Char(string='External Reference', states={'open': [('readonly', False)]}, copy=False, readonly=True, help="Used to hold the reference of the external mean that created this statement (name of imported file, reference of online synchronization...)")
|
|
date = fields.Date(required=True, states={'confirm': [('readonly', True)]}, index=True, copy=False, default=fields.Date.context_today)
|
|
date_done = fields.Datetime(string="Closed On")
|
|
balance_start = fields.Monetary(string='Starting Balance', states={'confirm': [('readonly', True)]}, default=_default_opening_balance)
|
|
balance_end_real = fields.Monetary('Ending Balance', states={'confirm': [('readonly', True)]})
|
|
accounting_date = fields.Date(string="Accounting Date", help="If set, the accounting entries created during the bank statement reconciliation process will be created at this date.\n"
|
|
"This is useful if the accounting period in which the entries should normally be booked is already closed.")
|
|
state = fields.Selection([('open', 'New'), ('confirm', 'Validated')], string='Status', required=True, readonly=True, copy=False, default='open')
|
|
currency_id = fields.Many2one('res.currency', compute='_compute_currency', string="Currency")
|
|
journal_id = fields.Many2one('account.journal', string='Journal', required=True, states={'confirm': [('readonly', True)]}, default=_default_journal)
|
|
journal_type = fields.Selection(related='journal_id.type', help="Technical field used for usability purposes")
|
|
company_id = fields.Many2one('res.company', related='journal_id.company_id', string='Company', store=True, readonly=True,
|
|
default=lambda self: self.env.company)
|
|
|
|
total_entry_encoding = fields.Monetary('Transactions Subtotal', compute='_end_balance', store=True, help="Total of transaction lines.")
|
|
balance_end = fields.Monetary('Computed Balance', compute='_end_balance', store=True, help='Balance as calculated based on Opening Balance and transaction lines')
|
|
difference = fields.Monetary(compute='_end_balance', store=True, help="Difference between the computed ending balance and the specified ending balance.")
|
|
|
|
line_ids = fields.One2many('account.bank.statement.line', 'statement_id', string='Statement lines', states={'confirm': [('readonly', True)]}, copy=True)
|
|
move_line_ids = fields.One2many('account.move.line', 'statement_id', string='Entry lines', states={'confirm': [('readonly', True)]})
|
|
move_line_count = fields.Integer(compute="_get_move_line_count")
|
|
|
|
all_lines_reconciled = fields.Boolean(compute='_check_lines_reconciled')
|
|
user_id = fields.Many2one('res.users', string='Responsible', required=False, default=lambda self: self.env.user)
|
|
cashbox_start_id = fields.Many2one('account.bank.statement.cashbox', string="Starting Cashbox")
|
|
cashbox_end_id = fields.Many2one('account.bank.statement.cashbox', string="Ending Cashbox")
|
|
is_difference_zero = fields.Boolean(compute='_is_difference_zero', string='Is zero', help="Check if difference is zero.")
|
|
|
|
@api.onchange('journal_id')
|
|
def onchange_journal_id(self):
|
|
self._set_opening_balance(self.journal_id.id)
|
|
|
|
def _balance_check(self):
|
|
for stmt in self:
|
|
if not stmt.currency_id.is_zero(stmt.difference):
|
|
if stmt.journal_type == 'cash':
|
|
if stmt.difference < 0.0:
|
|
account = stmt.journal_id.loss_account_id
|
|
name = _('Loss')
|
|
else:
|
|
# statement.difference > 0.0
|
|
account = stmt.journal_id.profit_account_id
|
|
name = _('Profit')
|
|
if not account:
|
|
raise UserError(_('Please go on the %s journal and define a %s Account. This account will be used to record cash difference.') % (stmt.journal_id.name, name))
|
|
|
|
values = {
|
|
'statement_id': stmt.id,
|
|
'account_id': account.id,
|
|
'amount': stmt.difference,
|
|
'name': _("Cash difference observed during the counting (%s)") % name,
|
|
}
|
|
self.env['account.bank.statement.line'].create(values)
|
|
else:
|
|
balance_end_real = formatLang(self.env, stmt.balance_end_real, currency_obj=stmt.currency_id)
|
|
balance_end = formatLang(self.env, stmt.balance_end, currency_obj=stmt.currency_id)
|
|
raise UserError(_('The ending balance is incorrect !\nThe expected balance (%s) is different from the computed one. (%s)')
|
|
% (balance_end_real, balance_end))
|
|
return True
|
|
|
|
def unlink(self):
|
|
for statement in self:
|
|
if statement.state != 'open':
|
|
raise UserError(_('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
|
|
# Explicitly unlink bank statement lines so it will check that the related journal entries have been deleted first
|
|
statement.line_ids.unlink()
|
|
return super(AccountBankStatement, self).unlink()
|
|
|
|
def open_cashbox_id(self):
|
|
self.ensure_one()
|
|
context = dict(self.env.context or {})
|
|
if context.get('balance'):
|
|
context['statement_id'] = self.id
|
|
if context['balance'] == 'start':
|
|
cashbox_id = self.cashbox_start_id.id
|
|
elif context['balance'] == 'close':
|
|
cashbox_id = self.cashbox_end_id.id
|
|
else:
|
|
cashbox_id = False
|
|
|
|
action = {
|
|
'name': _('Cash Control'),
|
|
'view_mode': 'form',
|
|
'res_model': 'account.bank.statement.cashbox',
|
|
'view_id': self.env.ref('account.view_account_bnk_stmt_cashbox_footer').id,
|
|
'type': 'ir.actions.act_window',
|
|
'res_id': cashbox_id,
|
|
'context': context,
|
|
'target': 'new'
|
|
}
|
|
|
|
return action
|
|
|
|
def check_confirm_bank(self):
|
|
if self.journal_type == 'cash' and not self.currency_id.is_zero(self.difference):
|
|
action_rec = self.env['ir.model.data'].xmlid_to_object('account.action_view_account_bnk_stmt_check')
|
|
if action_rec:
|
|
action = action_rec.read([])[0]
|
|
return action
|
|
return self.button_confirm_bank()
|
|
|
|
def button_confirm_bank(self):
|
|
self._balance_check()
|
|
statements = self.filtered(lambda r: r.state == 'open')
|
|
for statement in statements:
|
|
moves = self.env['account.move']
|
|
# `line.journal_entry_ids` gets invalidated from the cache during the loop
|
|
# because new move lines are being created at each iteration.
|
|
# The below dict is to prevent the ORM to permanently refetch `line.journal_entry_ids`
|
|
line_journal_entries = {line: line.journal_entry_ids for line in statement.line_ids}
|
|
for st_line in statement.line_ids:
|
|
#upon bank statement confirmation, look if some lines have the account_id set. It would trigger a journal entry
|
|
#creation towards that account, with the wanted side-effect to skip that line in the bank reconciliation widget.
|
|
journal_entries = line_journal_entries[st_line]
|
|
st_line.fast_counterpart_creation()
|
|
if not st_line.account_id and not journal_entries.ids and not st_line.statement_id.currency_id.is_zero(st_line.amount):
|
|
raise UserError(_('All the account entries lines must be processed in order to close the statement.'))
|
|
moves = statement.mapped('line_ids.journal_entry_ids.move_id')
|
|
if moves:
|
|
moves.filtered(lambda m: m.state != 'posted').post()
|
|
statement.message_post(body=_('Statement %s confirmed, journal items were created.') % (statement.name,))
|
|
if statement.journal_id.type == 'bank':
|
|
# Attach report to the Bank statement
|
|
content, content_type = self.env.ref('account.action_report_account_statement').render_qweb_pdf(statement.id)
|
|
self.env['ir.attachment'].create({
|
|
'name': statement.name and _("Bank Statement %s.pdf") % statement.name or _("Bank Statement.pdf"),
|
|
'type': 'binary',
|
|
'datas': base64.encodestring(content),
|
|
'res_model': statement._name,
|
|
'res_id': statement.id
|
|
})
|
|
statements.write({'state': 'confirm', 'date_done': time.strftime("%Y-%m-%d %H:%M:%S")})
|
|
|
|
def button_journal_entries(self):
|
|
return {
|
|
'name': _('Journal Entries'),
|
|
'view_mode': 'tree,form',
|
|
'res_model': 'account.move',
|
|
'view_id': False,
|
|
'type': 'ir.actions.act_window',
|
|
'domain': [('id', 'in', self.mapped('move_line_ids').mapped('move_id').ids)],
|
|
'context': {
|
|
'journal_id': self.journal_id.id,
|
|
}
|
|
}
|
|
|
|
def button_open(self):
|
|
""" Changes statement state to Running."""
|
|
for statement in self:
|
|
if not statement.name:
|
|
context = {'ir_sequence_date': statement.date}
|
|
if statement.journal_id.sequence_id:
|
|
st_number = statement.journal_id.sequence_id.with_context(**context).next_by_id()
|
|
else:
|
|
SequenceObj = self.env['ir.sequence']
|
|
st_number = SequenceObj.with_context(**context).next_by_code('account.bank.statement')
|
|
statement.name = st_number
|
|
statement.state = 'open'
|
|
|
|
def action_bank_reconcile_bank_statements(self):
|
|
self.ensure_one()
|
|
bank_stmt_lines = self.mapped('line_ids')
|
|
return {
|
|
'type': 'ir.actions.client',
|
|
'tag': 'bank_statement_reconciliation_view',
|
|
'context': {'statement_line_ids': bank_stmt_lines.ids, 'company_ids': self.mapped('company_id').ids},
|
|
}
|
|
|
|
|
|
class AccountBankStatementLine(models.Model):
|
|
_name = "account.bank.statement.line"
|
|
_description = "Bank Statement Line"
|
|
_order = "statement_id desc, date, sequence, id desc"
|
|
|
|
name = fields.Char(string='Label', required=True)
|
|
date = fields.Date(required=True, default=lambda self: self._context.get('date', fields.Date.context_today(self)))
|
|
amount = fields.Monetary(currency_field='journal_currency_id')
|
|
journal_currency_id = fields.Many2one('res.currency', string="Journal's Currency", related='statement_id.currency_id',
|
|
help='Utility field to express amount currency', readonly=True)
|
|
partner_id = fields.Many2one('res.partner', string='Partner')
|
|
account_number = fields.Char(string='Bank Account Number', help="Technical field used to store the bank account number before its creation, upon the line's processing")
|
|
bank_account_id = fields.Many2one('res.partner.bank', string='Bank Account', help="Bank account that was used in this transaction.")
|
|
account_id = fields.Many2one('account.account', string='Counterpart Account', domain=[('deprecated', '=', False)],
|
|
help="This technical field can be used at the statement line creation/import time in order to avoid the reconciliation"
|
|
" process on it later on. The statement line will simply create a counterpart on this account")
|
|
statement_id = fields.Many2one('account.bank.statement', string='Statement', index=True, required=True, ondelete='cascade')
|
|
journal_id = fields.Many2one('account.journal', related='statement_id.journal_id', string='Journal', store=True, readonly=True)
|
|
partner_name = fields.Char(help="This field is used to record the third party name when importing bank statement in electronic format,"
|
|
" when the partner doesn't exist yet in the database (or cannot be found).")
|
|
ref = fields.Char(string='Reference')
|
|
note = fields.Text(string='Notes')
|
|
transaction_type = fields.Char(string='Transaction Type')
|
|
sequence = fields.Integer(index=True, help="Gives the sequence order when displaying a list of bank statement lines.", default=1)
|
|
company_id = fields.Many2one('res.company', related='statement_id.company_id', string='Company', store=True, readonly=True)
|
|
journal_entry_ids = fields.One2many('account.move.line', 'statement_line_id', 'Journal Items', copy=False, readonly=True)
|
|
amount_currency = fields.Monetary(help="The amount expressed in an optional other currency if it is a multi-currency entry.")
|
|
currency_id = fields.Many2one('res.currency', string='Currency', help="The optional other currency if it is a multi-currency entry.")
|
|
state = fields.Selection(related='statement_id.state', string='Status', readonly=True)
|
|
move_name = fields.Char(string='Journal Entry Name', readonly=True,
|
|
default=False, copy=False,
|
|
help="Technical field holding the number given to the journal entry, automatically set when the statement line is reconciled then stored to set the same number again if the line is cancelled, set to draft and re-processed again.")
|
|
|
|
@api.constrains('amount')
|
|
def _check_amount(self):
|
|
for line in self:
|
|
# Allow to enter bank statement line with an amount of 0,
|
|
# so that user can enter/import the exact bank statement they have received from their bank in Odoo
|
|
currency = line.currency_id or line.journal_currency_id
|
|
if line.journal_id.type != 'bank' and currency.is_zero(line.amount):
|
|
raise ValidationError(_('The amount of a cash transaction cannot be 0.'))
|
|
|
|
@api.constrains('amount', 'amount_currency')
|
|
def _check_amount_currency(self):
|
|
for line in self:
|
|
if line.amount_currency != 0 and line.amount == 0:
|
|
raise ValidationError(_('If "Amount Currency" is specified, then "Amount" must be as well.'))
|
|
|
|
@api.constrains('currency_id', 'journal_id')
|
|
def _check_currency_id(self):
|
|
for line in self:
|
|
if not line.currency_id:
|
|
continue
|
|
|
|
statement_currency = line.journal_id.currency_id or line.company_id.currency_id
|
|
if line.currency_id == statement_currency:
|
|
raise ValidationError(_('The currency of the bank statement line must be different than the statement currency.'))
|
|
|
|
@api.model
|
|
def create(self, vals):
|
|
line = super(AccountBankStatementLine, self).create(vals)
|
|
# The most awesome fix you will ever see is below.
|
|
# Explanation: during a 'create', the 'convert_to_cache' method is not called. Moreover, at
|
|
# that point 'journal_currency_id' is not yet known since it is a related field. It means
|
|
# that the 'amount' field will not be properly rounded. The line below triggers a write on
|
|
# the 'amount' field, which will trigger the 'convert_to_cache' method, and ultimately round
|
|
# the field correctly.
|
|
# This is obviously an awful workaround, but at the time of writing, the ORM does not
|
|
# provide a clean mechanism to fix the issue.
|
|
line.amount = line.amount
|
|
return line
|
|
|
|
def unlink(self):
|
|
for line in self:
|
|
if line.journal_entry_ids.ids:
|
|
raise UserError(_('In order to delete a bank statement line, you must first cancel it to delete related journal items.'))
|
|
return super(AccountBankStatementLine, self).unlink()
|
|
|
|
def button_cancel_reconciliation(self):
|
|
aml_to_unbind = self.env['account.move.line']
|
|
aml_to_cancel = self.env['account.move.line']
|
|
payment_to_unreconcile = self.env['account.payment']
|
|
payment_to_cancel = self.env['account.payment']
|
|
for st_line in self:
|
|
aml_to_unbind |= st_line.journal_entry_ids
|
|
for line in st_line.journal_entry_ids:
|
|
payment_to_unreconcile |= line.payment_id
|
|
if st_line.move_name and line.payment_id.payment_reference == st_line.move_name:
|
|
#there can be several moves linked to a statement line but maximum one created by the line itself
|
|
aml_to_cancel |= line
|
|
payment_to_cancel |= line.payment_id
|
|
aml_to_unbind = aml_to_unbind - aml_to_cancel
|
|
|
|
if aml_to_unbind:
|
|
aml_to_unbind.write({'statement_line_id': False})
|
|
|
|
payment_to_unreconcile = payment_to_unreconcile - payment_to_cancel
|
|
if payment_to_unreconcile:
|
|
payment_to_unreconcile.unreconcile()
|
|
|
|
if aml_to_cancel:
|
|
aml_to_cancel.remove_move_reconcile()
|
|
moves_to_cancel = aml_to_cancel.mapped('move_id')
|
|
moves_to_cancel.button_cancel()
|
|
moves_to_cancel.button_draft()
|
|
moves_to_cancel.unlink()
|
|
if payment_to_cancel:
|
|
payment_to_cancel.unlink()
|
|
|
|
####################################################
|
|
# Reconciliation methods
|
|
####################################################
|
|
|
|
def _get_common_sql_query(self, overlook_partner = False, excluded_ids = None, split = False):
|
|
acc_type = "acc.reconcile = true"
|
|
select_clause = "SELECT aml.id "
|
|
from_clause = "FROM account_move_line aml JOIN account_account acc ON acc.id = aml.account_id "
|
|
account_clause = ''
|
|
if self.journal_id.default_credit_account_id and self.journal_id.default_debit_account_id:
|
|
account_clause = "(aml.statement_id IS NULL AND aml.account_id IN %(account_payable_receivable)s AND aml.payment_id IS NOT NULL) OR"
|
|
where_clause = """WHERE aml.company_id = %(company_id)s
|
|
AND (
|
|
""" + account_clause + """
|
|
("""+acc_type+""" AND aml.reconciled = false)
|
|
)"""
|
|
where_clause = where_clause + ' AND aml.partner_id = %(partner_id)s' if self.partner_id else where_clause
|
|
where_clause = where_clause + ' AND aml.id NOT IN %(excluded_ids)s' if excluded_ids else where_clause
|
|
if split:
|
|
return select_clause, from_clause, where_clause
|
|
return select_clause + from_clause + where_clause
|
|
|
|
def _prepare_reconciliation_move(self, move_ref):
|
|
""" Prepare the dict of values to create the move from a statement line. This method may be overridden to adapt domain logic
|
|
through model inheritance (make sure to call super() to establish a clean extension chain).
|
|
|
|
:param char move_ref: will be used as the reference of the generated account move
|
|
:return: dict of value to create() the account.move
|
|
"""
|
|
ref = move_ref or ''
|
|
if self.ref:
|
|
ref = move_ref + ' - ' + self.ref if move_ref else self.ref
|
|
data = {
|
|
'type': 'entry',
|
|
'journal_id': self.statement_id.journal_id.id,
|
|
'currency_id': self.statement_id.currency_id.id,
|
|
'date': self.statement_id.accounting_date or self.date,
|
|
'ref': ref,
|
|
}
|
|
if self.move_name:
|
|
data.update(name=self.move_name)
|
|
return data
|
|
|
|
def _prepare_reconciliation_move_line(self, move, amount):
|
|
""" Prepare the dict of values to balance the move.
|
|
|
|
:param recordset move: the account.move to link the move line
|
|
:param dict move: a dict of vals of a account.move which will be created later
|
|
:param float amount: the amount of transaction that wasn't already reconciled
|
|
"""
|
|
company_currency = self.journal_id.company_id.currency_id
|
|
statement_currency = self.journal_id.currency_id or company_currency
|
|
st_line_currency = self.currency_id or statement_currency
|
|
amount_currency = False
|
|
st_line_currency_rate = self.currency_id and (self.amount_currency / self.amount) or False
|
|
if isinstance(move, dict):
|
|
amount_sum = sum(x[2].get('amount_currency', 0) for x in move['line_ids'])
|
|
else:
|
|
amount_sum = sum(x.amount_currency for x in move.line_ids)
|
|
# We have several use case here to compare the currency and amount currency of counterpart line to balance the move:
|
|
if st_line_currency != company_currency and st_line_currency == statement_currency:
|
|
# company in currency A, statement in currency B and transaction in currency B
|
|
# counterpart line must have currency B and correct amount is inverse of already existing lines
|
|
amount_currency = -amount_sum
|
|
elif st_line_currency != company_currency and statement_currency == company_currency:
|
|
# company in currency A, statement in currency A and transaction in currency B
|
|
# counterpart line must have currency B and correct amount is inverse of already existing lines
|
|
amount_currency = -amount_sum
|
|
elif st_line_currency != company_currency and st_line_currency != statement_currency:
|
|
# company in currency A, statement in currency B and transaction in currency C
|
|
# counterpart line must have currency B and use rate between B and C to compute correct amount
|
|
amount_currency = -amount_sum/st_line_currency_rate
|
|
elif st_line_currency == company_currency and statement_currency != company_currency:
|
|
# company in currency A, statement in currency B and transaction in currency A
|
|
# counterpart line must have currency B and amount is computed using the rate between A and B
|
|
amount_currency = amount/st_line_currency_rate
|
|
|
|
# last case is company in currency A, statement in currency A and transaction in currency A
|
|
# and in this case counterpart line does not need any second currency nor amount_currency
|
|
|
|
aml_dict = {
|
|
'name': self.name,
|
|
'partner_id': self.partner_id and self.partner_id.id or False,
|
|
'account_id': amount >= 0 \
|
|
and self.statement_id.journal_id.default_credit_account_id.id \
|
|
or self.statement_id.journal_id.default_debit_account_id.id,
|
|
'credit': amount < 0 and -amount or 0.0,
|
|
'debit': amount > 0 and amount or 0.0,
|
|
'statement_line_id': self.id,
|
|
'currency_id': statement_currency != company_currency and statement_currency.id or (st_line_currency != company_currency and st_line_currency.id or False),
|
|
'amount_currency': amount_currency,
|
|
}
|
|
if isinstance(move, self.env['account.move'].__class__):
|
|
aml_dict['move_id'] = move.id
|
|
return aml_dict
|
|
|
|
def fast_counterpart_creation(self):
|
|
"""This function is called when confirming a bank statement and will allow to automatically process lines without
|
|
going in the bank reconciliation widget. By setting an account_id on bank statement lines, it will create a journal
|
|
entry using that account to counterpart the bank account
|
|
"""
|
|
payment_list = []
|
|
move_list = []
|
|
account_type_receivable = self.env.ref('account.data_account_type_receivable')
|
|
already_done_stmt_line_ids = [a['statement_line_id'][0] for a in self.env['account.move.line'].read_group([('statement_line_id', 'in', self.ids)], ['statement_line_id'], ['statement_line_id'])]
|
|
managed_st_line = []
|
|
for st_line in self:
|
|
# Technical functionality to automatically reconcile by creating a new move line
|
|
if st_line.account_id and not st_line.id in already_done_stmt_line_ids:
|
|
managed_st_line.append(st_line.id)
|
|
# Create payment vals
|
|
total = st_line.amount
|
|
payment_methods = (total > 0) and st_line.journal_id.inbound_payment_method_ids or st_line.journal_id.outbound_payment_method_ids
|
|
currency = st_line.journal_id.currency_id or st_line.company_id.currency_id
|
|
partner_type = 'customer' if st_line.account_id.user_type_id == account_type_receivable else 'supplier'
|
|
payment_list.append({
|
|
'payment_method_id': payment_methods and payment_methods[0].id or False,
|
|
'payment_type': total > 0 and 'inbound' or 'outbound',
|
|
'partner_id': st_line.partner_id.id,
|
|
'partner_type': partner_type,
|
|
'journal_id': st_line.statement_id.journal_id.id,
|
|
'payment_date': st_line.date,
|
|
'state': 'reconciled',
|
|
'currency_id': currency.id,
|
|
'amount': abs(total),
|
|
'communication': st_line._get_communication(payment_methods[0] if payment_methods else False),
|
|
'name': st_line.statement_id.name or _("Bank Statement %s") % st_line.date,
|
|
})
|
|
|
|
# Create move and move line vals
|
|
move_vals = st_line._prepare_reconciliation_move(st_line.statement_id.name)
|
|
aml_dict = {
|
|
'name': st_line.name,
|
|
'debit': st_line.amount < 0 and -st_line.amount or 0.0,
|
|
'credit': st_line.amount > 0 and st_line.amount or 0.0,
|
|
'account_id': st_line.account_id.id,
|
|
'partner_id': st_line.partner_id.id,
|
|
'statement_line_id': st_line.id,
|
|
}
|
|
st_line._prepare_move_line_for_currency(aml_dict, st_line.date or fields.Date.context_today())
|
|
move_vals['line_ids'] = [(0, 0, aml_dict)]
|
|
balance_line = self._prepare_reconciliation_move_line(
|
|
move_vals, -aml_dict['debit'] if st_line.amount < 0 else aml_dict['credit'])
|
|
move_vals['line_ids'].append((0, 0, balance_line))
|
|
move_list.append(move_vals)
|
|
|
|
# Creates
|
|
payment_ids = self.env['account.payment'].create(payment_list)
|
|
for payment_id, move_vals in zip(payment_ids, move_list):
|
|
for line in move_vals['line_ids']:
|
|
line[2]['payment_id'] = payment_id.id
|
|
move_ids = self.env['account.move'].create(move_list)
|
|
move_ids.post()
|
|
|
|
for move, st_line, payment in zip(move_ids, self.browse(managed_st_line), payment_ids):
|
|
st_line.write({'move_name': move.name})
|
|
payment.write({'payment_reference': move.name})
|
|
|
|
def _get_communication(self, payment_method_id):
|
|
return self.name or ''
|
|
|
|
def _prepare_payment_vals(self, total):
|
|
""" Prepare the dict of values to create the payment from a statement line. This method may be overridden for update dict
|
|
through model inheritance (make sure to call super() to establish a clean extension chain).
|
|
|
|
:param float total: will be used as the amount of the generated payment
|
|
:return: dict of value to create() the account.payment
|
|
"""
|
|
self.ensure_one()
|
|
partner_type = False
|
|
if self.partner_id:
|
|
if total < 0:
|
|
partner_type = 'supplier'
|
|
else:
|
|
partner_type = 'customer'
|
|
if not partner_type and self.env.context.get('default_partner_type'):
|
|
partner_type = self.env.context['default_partner_type']
|
|
currency = self.journal_id.currency_id or self.company_id.currency_id
|
|
payment_methods = (total > 0) and self.journal_id.inbound_payment_method_ids or self.journal_id.outbound_payment_method_ids
|
|
return {
|
|
'payment_method_id': payment_methods and payment_methods[0].id or False,
|
|
'payment_type': total > 0 and 'inbound' or 'outbound',
|
|
'partner_id': self.partner_id.id,
|
|
'partner_type': partner_type,
|
|
'journal_id': self.statement_id.journal_id.id,
|
|
'payment_date': self.date,
|
|
'state': 'reconciled',
|
|
'currency_id': currency.id,
|
|
'amount': abs(total),
|
|
'communication': self._get_communication(payment_methods[0] if payment_methods else False),
|
|
'name': self.statement_id.name or _("Bank Statement %s") % self.date,
|
|
}
|
|
|
|
def process_reconciliation(self, counterpart_aml_dicts=None, payment_aml_rec=None, new_aml_dicts=None):
|
|
""" Match statement lines with existing payments (eg. checks) and/or payables/receivables (eg. invoices and credit notes) and/or new move lines (eg. write-offs).
|
|
If any new journal item needs to be created (via new_aml_dicts or counterpart_aml_dicts), a new journal entry will be created and will contain those
|
|
items, as well as a journal item for the bank statement line.
|
|
Finally, mark the statement line as reconciled by putting the matched moves ids in the column journal_entry_ids.
|
|
|
|
:param self: browse collection of records that are supposed to have no accounting entries already linked.
|
|
:param (list of dicts) counterpart_aml_dicts: move lines to create to reconcile with existing payables/receivables.
|
|
The expected keys are :
|
|
- 'name'
|
|
- 'debit'
|
|
- 'credit'
|
|
- 'move_line'
|
|
# The move line to reconcile (partially if specified debit/credit is lower than move line's credit/debit)
|
|
|
|
:param (list of recordsets) payment_aml_rec: recordset move lines representing existing payments (which are already fully reconciled)
|
|
|
|
:param (list of dicts) new_aml_dicts: move lines to create. The expected keys are :
|
|
- 'name'
|
|
- 'debit'
|
|
- 'credit'
|
|
- 'account_id'
|
|
- (optional) 'tax_ids'
|
|
- (optional) Other account.move.line fields like analytic_account_id or analytics_id
|
|
- (optional) 'reconcile_model_id'
|
|
|
|
:returns: The journal entries with which the transaction was matched. If there was at least an entry in counterpart_aml_dicts or new_aml_dicts, this list contains
|
|
the move created by the reconciliation, containing entries for the statement.line (1), the counterpart move lines (0..*) and the new move lines (0..*).
|
|
"""
|
|
payable_account_type = self.env.ref('account.data_account_type_payable')
|
|
receivable_account_type = self.env.ref('account.data_account_type_receivable')
|
|
suspense_moves_mode = self._context.get('suspense_moves_mode')
|
|
counterpart_aml_dicts = counterpart_aml_dicts or []
|
|
payment_aml_rec = payment_aml_rec or self.env['account.move.line']
|
|
new_aml_dicts = new_aml_dicts or []
|
|
|
|
aml_obj = self.env['account.move.line']
|
|
|
|
company_currency = self.journal_id.company_id.currency_id
|
|
statement_currency = self.journal_id.currency_id or company_currency
|
|
st_line_currency = self.currency_id or statement_currency
|
|
|
|
counterpart_moves = self.env['account.move']
|
|
|
|
# Check and prepare received data
|
|
if any(rec.statement_id for rec in payment_aml_rec):
|
|
raise UserError(_('A selected move line was already reconciled.'))
|
|
for aml_dict in counterpart_aml_dicts:
|
|
if aml_dict['move_line'].reconciled and not suspense_moves_mode:
|
|
raise UserError(_('A selected move line was already reconciled.'))
|
|
if isinstance(aml_dict['move_line'], int):
|
|
aml_dict['move_line'] = aml_obj.browse(aml_dict['move_line'])
|
|
|
|
account_types = self.env['account.account.type']
|
|
for aml_dict in (counterpart_aml_dicts + new_aml_dicts):
|
|
if aml_dict.get('tax_ids') and isinstance(aml_dict['tax_ids'][0], int):
|
|
# Transform the value in the format required for One2many and Many2many fields
|
|
aml_dict['tax_ids'] = [(4, id, None) for id in aml_dict['tax_ids']]
|
|
|
|
user_type_id = self.env['account.account'].browse(aml_dict.get('account_id')).user_type_id
|
|
if user_type_id in [payable_account_type, receivable_account_type] and user_type_id not in account_types:
|
|
account_types |= user_type_id
|
|
if suspense_moves_mode:
|
|
if any(not line.journal_entry_ids for line in self):
|
|
raise UserError(_('Some selected statement line were not already reconciled with an account move.'))
|
|
else:
|
|
if any(line.journal_entry_ids for line in self):
|
|
raise UserError(_('A selected statement line was already reconciled with an account move.'))
|
|
|
|
# Fully reconciled moves are just linked to the bank statement
|
|
total = self.amount
|
|
currency = self.currency_id or statement_currency
|
|
for aml_rec in payment_aml_rec:
|
|
balance = aml_rec.amount_currency if aml_rec.currency_id else aml_rec.balance
|
|
aml_currency = aml_rec.currency_id or aml_rec.company_currency_id
|
|
total -= aml_currency._convert(balance, currency, aml_rec.company_id, aml_rec.date)
|
|
aml_rec.with_context(check_move_validity=False).write({'statement_line_id': self.id})
|
|
counterpart_moves = (counterpart_moves | aml_rec.move_id)
|
|
if aml_rec.journal_id.post_at == 'bank_rec' and aml_rec.payment_id and aml_rec.move_id.state == 'draft':
|
|
# In case the journal is set to only post payments when performing bank
|
|
# reconciliation, we modify its date and post it.
|
|
aml_rec.move_id.date = self.date
|
|
aml_rec.payment_id.payment_date = self.date
|
|
aml_rec.move_id.post()
|
|
# We check the paid status of the invoices reconciled with this payment
|
|
for invoice in aml_rec.payment_id.reconciled_invoice_ids:
|
|
self._check_invoice_state(invoice)
|
|
|
|
# Create move line(s). Either matching an existing journal entry (eg. invoice), in which
|
|
# case we reconcile the existing and the new move lines together, or being a write-off.
|
|
if counterpart_aml_dicts or new_aml_dicts:
|
|
|
|
# Create the move
|
|
self.sequence = self.statement_id.line_ids.ids.index(self.id) + 1
|
|
move_vals = self._prepare_reconciliation_move(self.statement_id.name)
|
|
if suspense_moves_mode:
|
|
self.button_cancel_reconciliation()
|
|
move = self.env['account.move'].with_context(default_journal_id=move_vals['journal_id']).create(move_vals)
|
|
counterpart_moves = (counterpart_moves | move)
|
|
|
|
# Create The payment
|
|
payment = self.env['account.payment']
|
|
partner_id = self.partner_id or (aml_dict.get('move_line') and aml_dict['move_line'].partner_id) or self.env['res.partner']
|
|
if abs(total)>0.00001:
|
|
payment_vals = self._prepare_payment_vals(total)
|
|
if not payment_vals['partner_id']:
|
|
payment_vals['partner_id'] = partner_id.id
|
|
if payment_vals['partner_id'] and len(account_types) == 1:
|
|
payment_vals['partner_type'] = 'customer' if account_types == receivable_account_type else 'supplier'
|
|
payment = payment.create(payment_vals)
|
|
|
|
# Complete dicts to create both counterpart move lines and write-offs
|
|
to_create = (counterpart_aml_dicts + new_aml_dicts)
|
|
date = self.date or fields.Date.today()
|
|
for aml_dict in to_create:
|
|
aml_dict['move_id'] = move.id
|
|
aml_dict['partner_id'] = self.partner_id.id
|
|
aml_dict['statement_line_id'] = self.id
|
|
self._prepare_move_line_for_currency(aml_dict, date)
|
|
|
|
# Create write-offs
|
|
for aml_dict in new_aml_dicts:
|
|
aml_dict['payment_id'] = payment and payment.id or False
|
|
aml_obj.with_context(check_move_validity=False).create(aml_dict)
|
|
|
|
# Create counterpart move lines and reconcile them
|
|
for aml_dict in counterpart_aml_dicts:
|
|
if aml_dict['move_line'].payment_id:
|
|
aml_dict['move_line'].write({'statement_line_id': self.id})
|
|
if aml_dict['move_line'].partner_id.id:
|
|
aml_dict['partner_id'] = aml_dict['move_line'].partner_id.id
|
|
aml_dict['account_id'] = aml_dict['move_line'].account_id.id
|
|
aml_dict['payment_id'] = payment and payment.id or False
|
|
|
|
counterpart_move_line = aml_dict.pop('move_line')
|
|
new_aml = aml_obj.with_context(check_move_validity=False).create(aml_dict)
|
|
|
|
(new_aml | counterpart_move_line).reconcile()
|
|
|
|
self._check_invoice_state(counterpart_move_line.move_id)
|
|
|
|
# Balance the move
|
|
st_line_amount = -sum([x.balance for x in move.line_ids])
|
|
aml_dict = self._prepare_reconciliation_move_line(move, st_line_amount)
|
|
aml_dict['payment_id'] = payment and payment.id or False
|
|
aml_obj.with_context(check_move_validity=False).create(aml_dict)
|
|
|
|
move.post()
|
|
#record the move name on the statement line to be able to retrieve it in case of unreconciliation
|
|
self.write({'move_name': move.name})
|
|
payment and payment.write({'payment_reference': move.name})
|
|
elif self.move_name:
|
|
raise UserError(_('Operation not allowed. Since your statement line already received a number (%s), you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it.') % (self.move_name))
|
|
|
|
#create the res.partner.bank if needed
|
|
if self.account_number and self.partner_id and not self.bank_account_id:
|
|
# Search bank account without partner to handle the case the res.partner.bank already exists but is set
|
|
# on a different partner.
|
|
bank_account = self.env['res.partner.bank'].search([('acc_number', '=', self.account_number)])
|
|
if not bank_account:
|
|
bank_account = self.env['res.partner.bank'].create({
|
|
'acc_number': self.account_number, 'partner_id': self.partner_id.id
|
|
})
|
|
self.bank_account_id = bank_account
|
|
|
|
counterpart_moves._check_balanced()
|
|
return counterpart_moves
|
|
|
|
def _prepare_move_line_for_currency(self, aml_dict, date):
|
|
self.ensure_one()
|
|
company_currency = self.journal_id.company_id.currency_id
|
|
statement_currency = self.journal_id.currency_id or company_currency
|
|
st_line_currency = self.currency_id or statement_currency
|
|
st_line_currency_rate = self.currency_id and (self.amount_currency / self.amount) or False
|
|
company = self.company_id
|
|
|
|
if st_line_currency.id != company_currency.id:
|
|
aml_dict['amount_currency'] = aml_dict['debit'] - aml_dict['credit']
|
|
aml_dict['currency_id'] = st_line_currency.id
|
|
if self.currency_id and statement_currency.id == company_currency.id and st_line_currency_rate:
|
|
# Statement is in company currency but the transaction is in foreign currency
|
|
aml_dict['debit'] = company_currency.round(aml_dict['debit'] / st_line_currency_rate)
|
|
aml_dict['credit'] = company_currency.round(aml_dict['credit'] / st_line_currency_rate)
|
|
elif self.currency_id and st_line_currency_rate:
|
|
# Statement is in foreign currency and the transaction is in another one
|
|
aml_dict['debit'] = statement_currency._convert(aml_dict['debit'] / st_line_currency_rate, company_currency, company, date)
|
|
aml_dict['credit'] = statement_currency._convert(aml_dict['credit'] / st_line_currency_rate, company_currency, company, date)
|
|
else:
|
|
# Statement is in foreign currency and no extra currency is given for the transaction
|
|
aml_dict['debit'] = st_line_currency._convert(aml_dict['debit'], company_currency, company, date)
|
|
aml_dict['credit'] = st_line_currency._convert(aml_dict['credit'], company_currency, company, date)
|
|
elif statement_currency.id != company_currency.id:
|
|
# Statement is in foreign currency but the transaction is in company currency
|
|
prorata_factor = (aml_dict['debit'] - aml_dict['credit']) / self.amount_currency
|
|
aml_dict['amount_currency'] = prorata_factor * self.amount
|
|
aml_dict['currency_id'] = statement_currency.id
|
|
|
|
def _check_invoice_state(self, invoice):
|
|
invoice._compute_amount()
|
|
|
|
def button_confirm_bank(self):
|
|
self.statement_id.button_confirm_bank()
|