-
- {txt} - '''.format(txt = _('Scan me with your banking app.'), - qr_code = qr_code) - continue - - record.qr_code = None - - @api.constrains('amount') - def _check_amount(self): - for payment in self: - if payment.amount < 0: - raise ValidationError(_('The payment amount cannot be negative.')) + # The journal entry seems reconciled. + residual_field = 'amount_residual' if pay.currency_id == pay.company_id.currency_id else 'amount_residual_currency' + reconcile_lines = (counterpart_lines + writeoff_lines).filtered(lambda line: line.account_id.reconcile) + pay.is_reconciled = pay.currency_id.is_zero(sum(reconcile_lines.mapped(residual_field))) + pay.is_matched = pay.currency_id.is_zero(sum(liquidity_lines.mapped(residual_field))) @api.model def _get_method_codes_using_bank_account(self): @@ -209,591 +283,464 @@ class account_payment(models.Model): return [] @api.depends('payment_method_code') - def _compute_show_partner_bank(self): + def _compute_show_require_partner_bank(self): """ Computes if the destination bank account must be displayed in the payment form view. By default, it won't be displayed but some modules might change that, depending on the payment type.""" for payment in self: payment.show_partner_bank_account = payment.payment_method_code in self._get_method_codes_using_bank_account() payment.require_partner_bank_account = payment.state == 'draft' and payment.payment_method_code in self._get_method_codes_needing_bank_account() - @api.depends('payment_type', 'journal_id') - def _compute_hide_payment_method(self): - for payment in self: - if not payment.journal_id or payment.journal_id.type not in ['bank', 'cash']: - payment.hide_payment_method = True - continue - journal_payment_methods = payment.payment_type == 'inbound'\ - and payment.journal_id.inbound_payment_method_ids\ - or payment.journal_id.outbound_payment_method_ids - payment.hide_payment_method = len(journal_payment_methods) == 1 and journal_payment_methods[0].code == 'manual' - - @api.depends('invoice_ids', 'amount', 'payment_date', 'currency_id', 'payment_type') - def _compute_payment_difference(self): - draft_payments = self.filtered(lambda p: p.invoice_ids and p.state == 'draft') - for pay in draft_payments: - payment_amount = -pay.amount if pay.payment_type == 'outbound' else pay.amount - pay.payment_difference = pay._compute_payment_amount(pay.invoice_ids, pay.currency_id, pay.journal_id, pay.payment_date) - payment_amount - (self - draft_payments).payment_difference = 0 - - @api.onchange('journal_id') - def _onchange_journal(self): - if not self.journal_id: - return - - if self.journal_id.currency_id: - self.currency_id = self.journal_id.currency_id - - if self.payment_method_id not in self._payment_methods._origin: - self.payment_method_id = self._payment_methods[:1]._origin - - if self.env.context.get('active_model') == 'account.move': - active_ids = self._context.get('active_ids') - invoices = self.env['account.move'].browse(active_ids) - self.amount = abs(self._compute_payment_amount(invoices, self.currency_id, self.journal_id, self.payment_date)) - - @api.onchange('partner_id') - def _onchange_partner_id(self): - if self.invoice_ids and self.invoice_ids[0].invoice_partner_bank_id: - self.partner_bank_account_id = self.invoice_ids[0].invoice_partner_bank_id - elif self.partner_id != self.partner_bank_account_id.partner_id: - # This condition ensures we use the default value provided into - # context for partner_bank_account_id properly when provided with a - # default partner_id. Without it, the onchange recomputes the bank account - # uselessly and might assign a different value to it. - if self.partner_id and len(self.partner_id.bank_ids) > 0: - self.partner_bank_account_id = self.partner_id.bank_ids[0] - elif self.partner_id and len(self.partner_id.commercial_partner_id.bank_ids) > 0: - self.partner_bank_account_id = self.partner_id.commercial_partner_id.bank_ids[0] + @api.depends('partner_id') + def _compute_partner_bank_id(self): + ''' The default partner_bank_id will be the first available on the partner. ''' + for pay in self: + available_partner_bank_accounts = pay.partner_id.bank_ids + if available_partner_bank_accounts: + pay.partner_bank_id = available_partner_bank_accounts[0]._origin else: - self.partner_bank_account_id = False + pay.partner_bank_id = False - @api.onchange('payment_type') - def _onchange_payment_type(self): - if not self.invoice_ids and not self.partner_type: - # Set default partner type for the payment type - if self.payment_type == 'inbound': - self.partner_type = 'customer' - else: # -> self.payment_type == 'outbound' - self.partner_type = 'supplier' - self._onchange_journal() - if self.currency_id.is_zero(self.amount) and self.has_invoices: - self.payment_difference_handling = 'reconcile' + @api.depends('partner_id', 'destination_account_id', 'journal_id') + def _compute_is_internal_transfer(self): + for payment in self: + is_partner_ok = payment.partner_id == payment.journal_id.company_id.partner_id + is_account_ok = payment.destination_account_id and payment.destination_account_id == payment.journal_id.company_id.transfer_account_id + payment.is_internal_transfer = is_partner_ok and is_account_ok - @api.onchange('amount', 'currency_id') - def _onchange_amount(self): - journal_types = ['bank', 'cash'] - if self.currency_id.is_zero(self.amount) and self.has_invoices: - # In case of payment with 0 amount, allow to select a journal of type 'general' like - # 'Miscellaneous Operations' and set this journal by default. - journal_types = ['general'] - self.payment_difference_handling = 'reconcile' - domain_on_types = [('type', 'in', journal_types)] - if self.invoice_ids: - domain_on_types.append(('company_id', '=', self.invoice_ids[0].company_id.id)) - if self.journal_id.type not in journal_types or (self.invoice_ids and self.journal_id.company_id != self.invoice_ids[0].company_id): - self.journal_id = self.env['account.journal'].search(domain_on_types, limit=1) - - @api.onchange('currency_id') - def _onchange_currency(self): - self.amount = abs(self._compute_payment_amount(self.invoice_ids, self.currency_id, self.journal_id, self.payment_date)) - - if self.journal_id: # TODO: only return if currency differ? - return - - # Set by default the first liquidity journal having this currency if exists. - domain = [('type', 'in', ('bank', 'cash')), ('currency_id', '=', self.currency_id.id)] - if self.invoice_ids: - domain.append(('company_id', '=', self.invoice_ids[0].company_id.id)) - journal = self.env['account.journal'].search(domain, limit=1) - if journal: - return {'value': {'journal_id': journal.id}} - - @api.model - def _compute_payment_amount(self, invoices, currency, journal, date): - '''Compute the total amount for the payment wizard. - - :param invoices: Invoices on which compute the total as an account.invoice recordset. - :param currency: The payment's currency as a res.currency record. - :param journal: The payment's journal as an account.journal record. - :param date: The payment's date as a datetime.date object. - :return: The total amount to pay the invoices. + @api.depends('payment_type', 'journal_id') + def _compute_payment_method_id(self): + ''' Compute the 'payment_method_id' field. + This field is not computed in '_compute_payment_method_fields' because it's a stored editable one. ''' - company = journal.company_id - currency = currency or journal.currency_id or company.currency_id - date = date or fields.Date.today() + for pay in self: + if pay.payment_type == 'inbound': + available_payment_methods = pay.journal_id.inbound_payment_method_ids + else: + available_payment_methods = pay.journal_id.outbound_payment_method_ids - if not invoices: - return 0.0 + # Select the first available one by default. + if available_payment_methods: + pay.payment_method_id = available_payment_methods[0]._origin + else: + pay.payment_method_id = False + + @api.depends('payment_type', + 'journal_id.inbound_payment_method_ids', + 'journal_id.outbound_payment_method_ids') + def _compute_payment_method_fields(self): + for pay in self: + if pay.payment_type == 'inbound': + pay.available_payment_method_ids = pay.journal_id.inbound_payment_method_ids + else: + pay.available_payment_method_ids = pay.journal_id.outbound_payment_method_ids + + pay.hide_payment_method = len(pay.available_payment_method_ids) == 1 and pay.available_payment_method_ids.code == 'manual' + + @api.depends('journal_id') + def _compute_currency_id(self): + for pay in self: + pay.currency_id = pay.journal_id.currency_id or pay.journal_id.company_id.currency_id + + @api.depends('is_internal_transfer') + def _compute_partner_id(self): + for pay in self: + if pay.is_internal_transfer: + pay.partner_id = pay.journal_id.company_id.partner_id + elif pay.partner_id == pay.journal_id.company_id.partner_id: + pay.partner_id = False + else: + pay.partner_id = pay.partner_id + + @api.depends('journal_id', 'partner_id', 'partner_type', 'is_internal_transfer') + def _compute_destination_account_id(self): + for pay in self: + if pay.is_internal_transfer: + pay.destination_account_id = pay.journal_id.company_id.transfer_account_id + elif pay.partner_type == 'customer': + # Receive money from invoice or send money to refund it. + if pay.partner_id: + pay.destination_account_id = pay.partner_id.with_company(pay.company_id).property_account_receivable_id + else: + pay.destination_account_id = self.env['account.account'].search([ + ('company_id', '=', pay.company_id.id), + ('internal_type', '=', 'receivable'), + ], limit=1) + elif pay.partner_type == 'supplier': + # Send money to pay a bill or receive money to refund it. + if pay.partner_id: + pay.destination_account_id = pay.partner_id.with_company(pay.company_id).property_account_payable_id + else: + pay.destination_account_id = self.env['account.account'].search([ + ('company_id', '=', pay.company_id.id), + ('internal_type', '=', 'payable'), + ], limit=1) + + @api.depends('partner_bank_id', 'amount', 'ref', 'currency_id', 'journal_id', 'move_id.state', + 'payment_method_id', 'payment_type') + def _compute_qr_code(self): + for pay in self: + if pay.state in ('draft', 'posted') \ + and pay.partner_bank_id \ + and pay.payment_method_id.code == 'manual' \ + and pay.payment_type == 'outbound' \ + and pay.currency_id: + + if pay.partner_bank_id: + qr_code = pay.partner_bank_id.build_qr_code_url(pay.amount, pay.ref, None, pay.currency_id, pay.partner_id) + else: + qr_code = None + + if qr_code: + pay.qr_code = ''' +
+
+ {txt} + '''.format(txt = _('Scan me with your banking app.'), + qr_code = qr_code) + continue + + pay.qr_code = None + + @api.depends('move_id.line_ids.matched_debit_ids', 'move_id.line_ids.matched_credit_ids') + def _compute_stat_buttons_from_reconciliation(self): + ''' Retrieve the invoices reconciled to the payments through the reconciliation (account.partial.reconcile). ''' + stored_payments = self.filtered('id') + if not stored_payments: + return + self.env['account.move'].flush() + self.env['account.move.line'].flush() + self.env['account.partial.reconcile'].flush() - self.env['account.move'].flush(['move_type', 'currency_id']) - self.env['account.move.line'].flush(['amount_residual', 'amount_residual_currency', 'move_id', 'account_id']) - self.env['account.account'].flush(['user_type_id']) - self.env['account.account.type'].flush(['type']) self._cr.execute(''' SELECT - move.move_type AS type, - move.currency_id AS currency_id, - SUM(line.amount_residual) AS amount_residual, - SUM(line.amount_residual_currency) AS residual_currency - FROM account_move move - LEFT JOIN account_move_line line ON line.move_id = move.id - LEFT JOIN account_account account ON account.id = line.account_id - LEFT JOIN account_account_type account_type ON account_type.id = account.user_type_id - WHERE move.id IN %s - AND account_type.type IN ('receivable', 'payable') - GROUP BY move.id, move.move_type - ''', [tuple(invoices.ids)]) - query_res = self._cr.dictfetchall() + payment.id, + ARRAY_AGG(DISTINCT invoice.id) AS invoice_ids + FROM account_payment payment + JOIN account_move move ON move.id = payment.move_id + JOIN account_move_line line ON line.move_id = move.id + JOIN account_partial_reconcile part ON + part.debit_move_id = line.id + OR + part.credit_move_id = line.id + JOIN account_move_line counterpart_line ON + part.debit_move_id = counterpart_line.id + OR + part.credit_move_id = counterpart_line.id + JOIN account_move invoice ON invoice.id = counterpart_line.move_id + WHERE line.account_internal_type IN ('receivable', 'payable') + AND line.id != counterpart_line.id + AND invoice.move_type in ('out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt') + GROUP BY payment.id + ''') + query_res = dict((payment_id, invoice_ids) for payment_id, invoice_ids in self._cr.fetchall()) - total = 0.0 - for res in query_res: - move_currency = self.env['res.currency'].browse(res['currency_id']) - if move_currency == currency and move_currency != company.currency_id: - total += res['residual_currency'] - else: - total += company.currency_id._convert(res['amount_residual'], currency, company, date) - return total + for pay in self: + invoice_ids = query_res.get(pay.id, []) + pay.reconciled_invoice_ids = [(6, 0, invoice_ids)] + pay.reconciled_invoices_count = len(invoice_ids) - def name_get(self): - return [(payment.id, payment.name or _('Draft Payment')) for payment in self] + self._cr.execute(''' + SELECT + payment.id, + ARRAY_AGG(DISTINCT counterpart_line.statement_id) AS statement_ids + FROM account_payment payment + JOIN account_move move ON move.id = payment.move_id + JOIN account_journal journal ON journal.id = move.journal_id + JOIN account_move_line line ON line.move_id = move.id + JOIN account_account account ON account.id = line.account_id + JOIN account_partial_reconcile part ON + part.debit_move_id = line.id + OR + part.credit_move_id = line.id + JOIN account_move_line counterpart_line ON + part.debit_move_id = counterpart_line.id + OR + part.credit_move_id = counterpart_line.id + WHERE (account.id = journal.payment_debit_account_id OR account.id = journal.payment_credit_account_id) + AND line.id != counterpart_line.id + AND counterpart_line.statement_id IS NOT NULL + GROUP BY payment.id + ''') + query_res = dict((payment_id, statement_ids) for payment_id, statement_ids in self._cr.fetchall()) - @api.depends('move_line_ids.reconciled') - def _get_move_reconciled(self): - for payment in self: - rec = True - for aml in payment.move_line_ids.filtered(lambda x: x.account_id.reconcile): - if not aml.reconciled: - rec = False - break - payment.move_reconciled = rec + for pay in self: + statement_ids = query_res.get(pay.id, []) + pay.reconciled_statement_ids = [(6, 0, statement_ids)] + pay.reconciled_statements_count = len(statement_ids) - @api.depends('invoice_ids', 'payment_type', 'partner_type', 'partner_id', 'is_internal_transfer') - def _compute_destination_account_id(self): - for payment in self: - payment = payment.with_company(payment.company_id) - if payment.invoice_ids: - payment.destination_account_id = payment.invoice_ids[0].mapped( - 'line_ids.account_id').filtered( - lambda account: account.user_type_id.type in ('receivable', 'payable'))[0] - elif payment.is_internal_transfer: - if not payment.company_id.transfer_account_id.id: - raise UserError(_('There is no Transfer Account defined in the accounting settings. Please define one to be able to confirm this transfer.')) - payment.destination_account_id = payment.company_id.transfer_account_id.id - elif payment.partner_id: - if payment.partner_type == 'customer': - payment.destination_account_id = payment.partner_id.property_account_receivable_id.id - else: - payment.destination_account_id = payment.partner_id.property_account_payable_id.id - elif payment.partner_type == 'customer': - default_account = self.env['ir.property'].get('property_account_receivable_id', 'res.partner') - payment.destination_account_id = default_account.id - elif payment.partner_type == 'supplier': - default_account = self.env['ir.property'].get('property_account_payable_id', 'res.partner') - payment.destination_account_id = default_account.id + # ------------------------------------------------------------------------- + # CONSTRAINT METHODS + # ------------------------------------------------------------------------- - @api.depends('move_line_ids.matched_debit_ids', 'move_line_ids.matched_credit_ids') - def _compute_reconciled_invoice_ids(self): - for record in self: - reconciled_moves = record.move_line_ids.mapped('matched_debit_ids.debit_move_id.move_id')\ - + record.move_line_ids.mapped('matched_credit_ids.credit_move_id.move_id') - record.reconciled_invoice_ids = reconciled_moves.filtered(lambda move: move.is_invoice()) - record.has_invoices = bool(record.reconciled_invoice_ids) - record.reconciled_invoices_count = len(record.reconciled_invoice_ids) + @api.constrains('payment_method_id') + def _check_payment_method_id(self): + ''' Ensure the 'payment_method_id' field is not null. + Can't be done using the regular 'required=True' because the field is a computed editable stored one. + ''' + for pay in self: + if not pay.payment_method_id: + raise ValidationError(_("Please define a payment method on your payment.")) - def action_register_payment(self): - active_ids = self.env.context.get('active_ids') - if not active_ids: - return '' + # ------------------------------------------------------------------------- + # LOW-LEVEL METHODS + # ------------------------------------------------------------------------- - return { - 'name': _('Register Payment'), - 'res_model': len(active_ids) == 1 and 'account.payment' or 'account.payment.register', - 'view_mode': 'form', - 'view_id': len(active_ids) != 1 and self.env.ref('account.view_account_payment_form_multi').id or self.env.ref('account.view_account_payment_invoice_form').id, - 'context': self.env.context, - 'target': 'new', - 'type': 'ir.actions.act_window', - } + @api.model_create_multi + def create(self, vals_list): + # OVERRIDE + write_off_line_vals_list = [] - def button_journal_entries(self): - return { - 'name': _('Journal Items'), - 'view_mode': 'tree,form', - 'res_model': 'account.move.line', - 'view_id': False, - 'type': 'ir.actions.act_window', - 'domain': [('payment_id', 'in', self.ids)], - } + for vals in vals_list: - def button_invoices(self): - return { - 'name': _('Paid Invoices'), - 'view_mode': 'tree,form', - 'res_model': 'account.move', - 'view_id': False, - 'views': [(self.env.ref('account.view_move_tree').id, 'tree'), (self.env.ref('account.view_move_form').id, 'form')], - 'type': 'ir.actions.act_window', - 'domain': [('id', 'in', [x.id for x in self.reconciled_invoice_ids])], - 'context': {'create': False}, - } + # Hack to add a custom write-off line. + write_off_line_vals_list.append(vals.pop('write_off_line_vals', None)) - def mark_as_sent(self): - self.write({'state': 'sent'}) + # Force the move_type to avoid inconsistency with residual 'default_move_type' inside the context. + vals['move_type'] = 'entry' - def unmark_as_sent(self): - self.write({'state': 'posted'}) + # Force the computation of 'journal_id' since this field is set on account.move but must have the + # bank/cash type. + if 'journal_id' not in vals: + vals['journal_id'] = self._get_default_journal().id - def unreconcile(self): - """ Set back the payments in 'posted' or 'sent' state, without deleting the journal entries. - Called when cancelling a bank statement line linked to a pre-registered payment. - """ - for payment in self: - if payment.payment_reference: - payment.write({'state': 'sent'}) - else: - payment.write({'state': 'posted'}) + # Since 'currency_id' is a computed editable field, it will be computed later. + # Prevent the account.move to call the _get_default_currency method that could raise + # the 'Please define an accounting miscellaneous journal in your company' error. + if 'currency_id' not in vals: + journal = self.env['account.journal'].browse(vals['journal_id']) + vals['currency_id'] = journal.currency_id.id or journal.company_id.currency_id.id - def cancel(self): - self.write({'state': 'cancelled'}) + payments = super().create(vals_list) + + for i, pay in enumerate(payments): + write_off_line_vals = write_off_line_vals_list[i] + + to_write = {'payment_id': pay.id} + if 'line_ids' not in vals_list[i]: + to_write['line_ids'] = [(0, 0, line_vals) for line_vals in pay._prepare_move_line_default_vals(write_off_line_vals=write_off_line_vals)] + + pay.move_id.write(to_write) + + return payments + + def write(self, vals): + # OVERRIDE + res = super().write(vals) + self._synchronize_to_moves(set(vals.keys())) + return res def unlink(self): - if any(bool(rec.move_line_ids) for rec in self): - raise UserError(_("You cannot delete a payment that is already posted.")) - if any(rec.move_name for rec in self): - raise UserError(_('It is not allowed to delete a payment that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert.')) - return super(account_payment, self).unlink() + # OVERRIDE to unlink the inherited account.move (move_id field) as well. + moves = self.with_context(force_delete=True).move_id + res = super().unlink() + moves.unlink() + return res - def _prepare_payment_moves(self): - ''' Prepare the creation of journal entries (account.move) by creating a list of python dictionary to be passed - to the 'create' method. + @api.depends('move_id.name') + def name_get(self): + return [(payment.id, payment.move_id.name or _('Draft Payment')) for payment in self] - Example : outbound with write-off: + # ------------------------------------------------------------------------- + # SYNCHRONIZATION account.payment <-> account.move + # ------------------------------------------------------------------------- - Account | Debit | Credit - --------------------------------------------------------- - BANK | 900.0 | - RECEIVABLE | | 1000.0 - WRITE-OFF ACCOUNT | 100.0 | - - :return: A list of Python dictionary to be passed to env['account.move'].create. + def _synchronize_from_moves(self, changed_fields): + ''' Update the account.payment regarding its related account.move. + Also, check both models are still consistent. + :param changed_fields: A set containing all modified fields on account.move. ''' - all_move_vals = [] - for payment in self: - company_currency = payment.company_id.currency_id + if self._context.get('skip_account_move_synchronization'): + return - # Compute amounts. - write_off_amount = payment.payment_difference_handling == 'reconcile' and -payment.payment_difference or 0.0 - if payment.payment_type == 'outbound': - counterpart_amount = payment.amount - liquidity_line_account = payment.journal_id.default_debit_account_id - else: - counterpart_amount = -payment.amount - liquidity_line_account = payment.journal_id.default_credit_account_id + for pay in self.with_context(skip_account_move_synchronization=True): + move = pay.move_id + move_vals_to_write = {} + payment_vals_to_write = {} - # Manage currency. - if payment.currency_id == company_currency: - # Single-currency. - balance = counterpart_amount - write_off_balance = write_off_amount - counterpart_amount = write_off_amount = 0.0 - currency_id = False - else: - # Multi-currencies. - balance = payment.currency_id._convert(counterpart_amount, company_currency, payment.company_id, payment.payment_date) - write_off_balance = payment.currency_id._convert(write_off_amount, company_currency, payment.company_id, payment.payment_date) - currency_id = payment.currency_id.id + if 'journal_id' in changed_fields: + if pay.journal_id.type not in ('bank', 'cash'): + raise UserError(_("A payment must always belongs to a bank or cash journal.")) - # Manage custom currency on journal for liquidity line. - if payment.journal_id.currency_id and payment.currency_id != payment.journal_id.currency_id: - # Custom currency on journal. - if payment.journal_id.currency_id == company_currency: - # Single-currency - liquidity_line_currency_id = False + if 'line_ids' in changed_fields: + all_lines = move.line_ids + liquidity_lines, counterpart_lines, writeoff_lines = pay._seek_for_lines() + + if len(liquidity_lines) != 1 or len(counterpart_lines) != 1: + raise UserError(_( + "The journal entry %s reached an invalid state relative to its payment.\n" + "To be consistent, the journal entry must always contains:\n" + "- one journal item involving the outstanding payment/receipts account.\n" + "- one journal item involving a receivable/payable account.\n" + "- optional journal items, all sharing the same account.\n\n" + ) % move.display_name) + + if writeoff_lines and len(writeoff_lines.account_id) != 1: + raise UserError(_( + "The journal entry %s reached an invalid state relative to its payment.\n" + "To be consistent, all the write-off journal items must share the same account." + ) % move.display_name) + + if any(line.currency_id != all_lines[0].currency_id for line in all_lines): + raise UserError(_( + "The journal entry %s reached an invalid state relative to its payment.\n" + "To be consistent, the journal items must share the same currency." + ) % move.display_name) + + if any(line.partner_id != all_lines[0].partner_id for line in all_lines): + raise UserError(_( + "The journal entry %s reached an invalid state relative to its payment.\n" + "To be consistent, the journal items must share the same partner." + ) % move.display_name) + + if counterpart_lines.account_id.user_type_id.type == 'receivable': + partner_type = 'customer' else: - liquidity_line_currency_id = payment.journal_id.currency_id.id - liquidity_amount = company_currency._convert( - balance, payment.journal_id.currency_id, payment.company_id, payment.payment_date) - else: - # Use the payment currency. - liquidity_line_currency_id = currency_id - liquidity_amount = counterpart_amount + partner_type = 'supplier' - # Compute 'name' to be used in receivable/payable line. - rec_pay_line_name = '' - if payment.is_internal_transfer: - rec_pay_line_name = payment.name - else: - if payment.partner_type == 'customer': - if payment.payment_type == 'inbound': - rec_pay_line_name += _("Customer Payment") - elif payment.payment_type == 'outbound': - rec_pay_line_name += _("Customer Credit Note") - elif payment.partner_type == 'supplier': - if payment.payment_type == 'inbound': - rec_pay_line_name += _("Vendor Credit Note") - elif payment.payment_type == 'outbound': - rec_pay_line_name += _("Vendor Payment") - if payment.invoice_ids: - rec_pay_line_name += ': %s' % ', '.join(payment.invoice_ids.mapped('name')) + liquidity_amount = liquidity_lines.amount_currency if liquidity_lines.currency_id else liquidity_lines.balance - # Compute 'name' to be used in liquidity line. - if payment.is_internal_transfer: - if payment.payment_type == 'inbound': - liquidity_line_name = _('Transfer to %s') % payment.journal_id.name - elif payment.payment_type == 'outbound': - liquidity_line_name = _('Transfer from %s') % payment.journal_id.name - else: - liquidity_line_name = payment.name + move_vals_to_write.update({ + 'currency_id': liquidity_lines.currency_id.id or liquidity_lines.company_currency_id.id, + 'partner_id': liquidity_lines.partner_id.id, + }) + payment_vals_to_write.update({ + 'amount': abs(liquidity_amount), + 'payment_type': 'inbound' if liquidity_amount > 0.0 else 'outbound', + 'payment_reference': liquidity_lines.name, + 'partner_type': partner_type, + 'currency_id': liquidity_lines.currency_id.id or liquidity_lines.company_currency_id.id, + 'destination_account_id': counterpart_lines.account_id.id, + 'partner_id': liquidity_lines.partner_id.id, + }) - # ==== 'inbound' / 'outbound' ==== + move.write(move._cleanup_write_orm_values(move, move_vals_to_write)) + pay.write(move._cleanup_write_orm_values(pay, payment_vals_to_write)) - move_vals = { - 'date': payment.payment_date, - 'ref': payment.communication, - 'journal_id': payment.journal_id.id, - 'currency_id': payment.journal_id.currency_id.id or payment.company_id.currency_id.id, - 'partner_id': payment.partner_id.id, - 'line_ids': [ - # Receivable / Payable / Transfer line. - (0, 0, { - 'name': rec_pay_line_name, - 'amount_currency': counterpart_amount + write_off_amount if currency_id else 0.0, - 'currency_id': currency_id, - 'debit': balance + write_off_balance > 0.0 and balance + write_off_balance or 0.0, - 'credit': balance + write_off_balance < 0.0 and -balance - write_off_balance or 0.0, - 'date_maturity': payment.payment_date, - 'partner_id': payment.partner_id.commercial_partner_id.id, - 'account_id': payment.destination_account_id.id, - 'payment_id': payment.id, - }), - # Liquidity line. - (0, 0, { - 'name': liquidity_line_name, - 'amount_currency': -liquidity_amount if liquidity_line_currency_id else 0.0, - 'currency_id': liquidity_line_currency_id, - 'debit': balance < 0.0 and -balance or 0.0, - 'credit': balance > 0.0 and balance or 0.0, - 'date_maturity': payment.payment_date, - 'partner_id': payment.partner_id.commercial_partner_id.id, - 'account_id': liquidity_line_account.id, - 'payment_id': payment.id, - }), - ], - } - if write_off_balance: - # Write-off line. - move_vals['line_ids'].append((0, 0, { - 'name': payment.writeoff_label, - 'amount_currency': -write_off_amount, - 'currency_id': currency_id, - 'debit': write_off_balance < 0.0 and -write_off_balance or 0.0, - 'credit': write_off_balance > 0.0 and write_off_balance or 0.0, - 'date_maturity': payment.payment_date, - 'partner_id': payment.partner_id.commercial_partner_id.id, - 'account_id': payment.writeoff_account_id.id, - 'payment_id': payment.id, - })) + def _synchronize_to_moves(self, changed_fields): + ''' Update the account.move regarding the modified account.payment. + :param changed_fields: A list containing all modified fields on account.payment. + ''' + if self._context.get('skip_account_move_synchronization'): + return - if payment.move_name: - move_vals['name'] = payment.move_name + if not any(field_name in changed_fields for field_name in ( + 'amount', 'payment_type', 'partner_type', 'payment_reference', 'is_internal_transfer', + 'currency_id', 'partner_id', 'destination_account_id', + )): + return - all_move_vals.append(move_vals) + for pay in self.with_context(skip_account_move_synchronization=True): + liquidity_lines, counterpart_lines, writeoff_lines = pay._seek_for_lines() - return all_move_vals + # Make sure to preserve the write-off amount. + # This allows to create a new payment with custom 'line_ids'. - def post(self): - """ Create the journal items for the payment and update the payment's state to 'posted'. - A journal entry is created containing an item in the source liquidity account (selected journal's default_debit or default_credit) - and another in the destination reconcilable account (see _compute_destination_account_id). - If invoice_ids is not empty, there will be one reconcilable move line per invoice to reconcile with. - If the payment is a transfer, a second journal entry is created in the destination journal to receive money from the transfer account. - """ - AccountMove = self.env['account.move'].with_context(default_move_type='entry') - for rec in self: - - if rec.state != 'draft': - raise UserError(_("Only a draft payment can be posted.")) - - if any(inv.state != 'posted' for inv in rec.invoice_ids): - raise ValidationError(_("The payment cannot be processed because the invoice is not open!")) - - # keep the name in case of a payment reset to draft - if not rec.name: - if rec.is_internal_transfer: - sequence_code = 'account.payment.transfer' + if writeoff_lines: + writeoff_amount_field = 'balance' if pay.currency_id == pay.company_id.currency_id else 'amount_currency' + writeoff_amount = sum(writeoff_lines.mapped(writeoff_amount_field)) + counterpart_amount = counterpart_lines[writeoff_amount_field] + if writeoff_amount > 0.0 and counterpart_amount > 0.0: + sign = 1 else: - if rec.partner_type == 'customer': - if rec.payment_type == 'inbound': - sequence_code = 'account.payment.customer.invoice' - elif rec.payment_type == 'outbound': - sequence_code = 'account.payment.customer.refund' - elif rec.partner_type == 'supplier': - if rec.payment_type == 'inbound': - sequence_code = 'account.payment.supplier.refund' - elif rec.payment_type == 'outbound': - sequence_code = 'account.payment.supplier.invoice' - rec.name = self.env['ir.sequence'].next_by_code(sequence_code, sequence_date=rec.payment_date) - if not rec.name and not rec.is_internal_transfer: - raise UserError(_("You have to define a sequence for %s in your company.") % (sequence_code,)) + sign = -1 - move = AccountMove.create(rec._prepare_payment_moves()) - if move.journal_id.post_at != 'bank_rec': - move.post() + write_off_line_vals = { + 'name': writeoff_lines[0].name, + 'amount': writeoff_amount * sign, + 'account_id': writeoff_lines[0].account_id.id, + } + else: + write_off_line_vals = {} - # Update the state / move before performing any reconciliation. - rec.write({'state': 'posted', 'move_name': move.name}) + line_vals_list = pay._prepare_move_line_default_vals(write_off_line_vals=write_off_line_vals) - if rec.invoice_ids: - (move + rec.invoice_ids).line_ids \ - .filtered(lambda line: not line.reconciled and line.account_id == rec.destination_account_id)\ - .reconcile() + line_ids_commands = [ + (1, liquidity_lines.id, line_vals_list[0]), + (1, counterpart_lines.id, line_vals_list[1]), + ] - return True + for line in writeoff_lines: + line_ids_commands.append((2, line.id)) + + if writeoff_lines: + line_ids_commands.append((0, 0, line_vals_list[2])) + + # Update the existing journal items. + # If dealing with multiple write-off lines, they are dropped and a new one is generated. + + pay.move_id.write({ + 'partner_id': pay.partner_id.id, + 'currency_id': pay.currency_id.id, + 'line_ids': line_ids_commands, + }) + + # ------------------------------------------------------------------------- + # BUSINESS METHODS + # ------------------------------------------------------------------------- + + def mark_as_sent(self): + self.write({'is_move_sent': True}) + + def unmark_as_sent(self): + self.write({'is_move_sent': False}) + + def action_post(self): + ''' draft -> posted ''' + self.move_id.post() + + def action_cancel(self): + ''' draft -> cancelled ''' + self.move_id.button_cancel() def action_draft(self): - moves = self.mapped('move_line_ids.move_id') - moves.filtered(lambda move: move.state == 'posted').button_draft() - moves.with_context(force_delete=True).unlink() - self.write({'state': 'draft'}) + ''' posted -> draft ''' + self.move_id.button_draft() - def _get_invoice_payment_amount(self, inv): - """ - Computes the amount covered by the current payment in the given invoice. - - :param inv: an invoice object - :returns: the amount covered by the payment in the invoice - """ + def button_open_invoices(self): + ''' Redirect the user to the invoice(s) paid by this payment. + :return: An action on account.move. + ''' self.ensure_one() - return sum([ - data['amount'] - for data in inv._get_reconciled_info_JSON_values() - if data['account_payment_id'] == self.id - ]) -class payment_register(models.TransientModel): - _name = 'account.payment.register' - _description = 'Register Payment' - - payment_date = fields.Date(required=True, default=fields.Date.context_today) - journal_id = fields.Many2one('account.journal', required=True, domain="[('type', 'in', ('bank', 'cash')), ('company_id', '=', invoice_company_id)]") - payment_method_id = fields.Many2one('account.payment.method', string='Payment Method Type', required=True, - domain="[('id', 'in', available_payment_methods)]", - help="Manual: Get paid by cash, check or any other method outside of Odoo.\n" - "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n" - "Check: Pay bill by check and print it from Odoo.\n" - "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit, module account_batch_payment must be installed.\n" - "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed ") - invoice_ids = fields.Many2many('account.move', 'account_invoice_payment_rel_transient', 'payment_id', 'invoice_id', string="Invoices", copy=False, readonly=True) - group_payment = fields.Boolean(help="Only one payment will be created by partner (bank)/ currency.") - - invoice_company_id = fields.Many2one(related='invoice_ids.company_id') - available_payment_methods = fields.Many2many('account.payment.method', compute='_compute_available_payment_methods') - - @api.model - def default_get(self, fields): - rec = super(payment_register, self).default_get(fields) - active_ids = self._context.get('active_ids') - if not active_ids: - return rec - invoices = self.env['account.move'].browse(active_ids) - - # Check all invoices are open - if any(invoice.state != 'posted' or invoice.payment_state not in ('not_paid', 'partial') or not invoice.is_invoice() for invoice in invoices): - raise UserError(_("You can only register payments for open invoices")) - # Check all invoices are inbound or all invoices are outbound - outbound_list = [invoice.is_outbound() for invoice in invoices] - first_outbound = invoices[0].is_outbound() - if any(x != first_outbound for x in outbound_list): - raise UserError(_("You can only register at the same time for payment that are all inbound or all outbound")) - if any(inv.company_id != invoices[0].company_id for inv in invoices): - raise UserError(_("You can only register at the same time for payment that are all from the same company")) - # Check the destination account is the same - destination_account = invoices.line_ids.filtered(lambda line: line.account_internal_type in ('receivable', 'payable')).mapped('account_id') - if len(destination_account) > 1: - raise UserError(_('There is more than one receivable/payable account in the concerned invoices. You cannot group payments in that case.')) - if 'invoice_ids' not in rec: - rec['invoice_ids'] = [(6, 0, invoices.ids)] - if 'journal_id' not in rec: - rec['journal_id'] = self.env['account.journal'].search([('company_id', '=', self.env.company.id), ('type', 'in', ('bank', 'cash'))], limit=1).id - if 'payment_method_id' not in rec: - if invoices[0].is_inbound(): - domain = [('payment_type', '=', 'inbound')] - else: - domain = [('payment_type', '=', 'outbound')] - rec['payment_method_id'] = self.env['account.payment.method'].search(domain, limit=1).id - return rec - - @api.depends('invoice_ids', 'journal_id.inbound_payment_method_ids', 'journal_id.outbound_payment_method_ids') - def _compute_available_payment_methods(self): - for p in self: - invoice = p.invoice_ids[:1] - if not invoice: - p.available_payment_methods = self.env['account.payment.method'] - elif invoice.is_inbound(): - p.available_payment_methods = self.journal_id.inbound_payment_method_ids._origin - else: - p.available_payment_methods = self.journal_id.outbound_payment_method_ids._origin - - def _prepare_payment_vals(self, invoices): - '''Create the payment values. - - :param invoices: The invoices/bills to pay. In case of multiple - documents, they need to be grouped by partner, bank, journal and - currency. - :return: The payment values as a dictionary. - ''' - amount = self.env['account.payment']._compute_payment_amount(invoices, invoices[0].currency_id, self.journal_id, self.payment_date) - values = { - 'journal_id': self.journal_id.id, - 'payment_method_id': self.payment_method_id.id, - 'payment_date': self.payment_date, - 'communication': " ".join(i.invoice_payment_ref or i.ref or i.name for i in invoices), - 'invoice_ids': [(6, 0, invoices.ids)], - 'payment_type': ('inbound' if amount > 0 else 'outbound'), - 'amount': abs(amount), - 'currency_id': invoices[0].currency_id.id, - 'partner_id': invoices[0].commercial_partner_id.id, - 'partner_type': MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].move_type], - 'partner_bank_account_id': invoices[0].invoice_partner_bank_id.id, - } - return values - - def get_payments_vals(self): - '''Compute the values for payments. - - :return: a list of payment values (dictionary). - ''' - grouped = defaultdict(lambda: self.env["account.move"]) - for inv in self.invoice_ids: - if self.group_payment: - grouped[(inv.commercial_partner_id, inv.currency_id, inv.invoice_partner_bank_id, MAP_INVOICE_TYPE_PARTNER_TYPE[inv.move_type])] += inv - else: - grouped[inv.id] += inv - return [self._prepare_payment_vals(invoices) for invoices in grouped.values()] - - def create_payments(self): - '''Create payments according to the invoices. - Having invoices with different commercial_partner_id or different type - (Vendor bills with customer invoices) leads to multiple payments. - In case of all the invoices are related to the same - commercial_partner_id and have the same type, only one payment will be - created. - - :return: The ir.actions.act_window to show created payments. - ''' - Payment = self.env['account.payment'] - payments = Payment.create(self.get_payments_vals()) - payments.post() - - action_vals = { - 'name': _('Payments'), - 'domain': [('id', 'in', payments.ids), ('state', '=', 'posted')], - 'res_model': 'account.payment', - 'view_id': False, + action = { + 'name': _("Paid Invoices"), 'type': 'ir.actions.act_window', + 'res_model': 'account.move', + 'context': {'create': False}, } - if len(payments) == 1: - action_vals.update({'res_id': payments[0].id, 'view_mode': 'form'}) + if len(self.reconciled_invoice_ids) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': self.reconciled_invoice_ids.id, + }) else: - action_vals['view_mode'] = 'tree,form' - return action_vals + action.update({ + 'view_mode': 'list,form', + 'domain': [('id', 'in', self.reconciled_invoice_ids.ids)], + }) + return action + + def button_open_statements(self): + ''' Redirect the user to the statement line(s) reconciled to this payment. + :return: An action on account.move. + ''' + self.ensure_one() + + action = { + 'name': _("Matched Statements"), + 'type': 'ir.actions.act_window', + 'res_model': 'account.bank.statement', + 'context': {'create': False}, + } + if len(self.reconciled_statement_ids) == 1: + action.update({ + 'view_mode': 'form', + 'res_id': self.reconciled_statement_ids.id, + }) + else: + action.update({ + 'view_mode': 'list,form', + 'domain': [('id', 'in', self.reconciled_statement_ids.ids)], + }) + return action diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index 96bc1553630..d5790d0d654 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -218,10 +218,9 @@ class AccountReconcileModel(models.Model): :return: A list of dict representing move.lines to be created corresponding to the tax. ''' self.ensure_one() - balance = base_line_dict['debit'] - base_line_dict['credit'] - currency = base_line_dict.get('currency_id') and self.env['res.currency'].browse(base_line_dict['currency_id']) + balance = base_line_dict['balance'] - res = tax.compute_all(balance, currency=currency) + res = tax.compute_all(balance) new_aml_dicts = [] for tax_res in res['taxes']: @@ -231,27 +230,26 @@ class AccountReconcileModel(models.Model): 'account_id': tax_res['account_id'] or base_line_dict['account_id'], 'name': tax_res['name'], 'partner_id': base_line_dict.get('partner_id'), - 'debit': tax_res['amount'] > 0 and tax_res['amount'] or 0, - 'credit': tax_res['amount'] < 0 and -tax_res['amount'] or 0, + 'balance': tax_res['amount'], 'analytic_account_id': tax.analytic and base_line_dict['analytic_account_id'], 'analytic_tag_ids': tax.analytic and base_line_dict['analytic_tag_ids'], 'tax_exigible': tax_res['tax_exigibility'], 'tax_repartition_line_id': tax_res['tax_repartition_line_id'], 'tax_ids': [(6, 0, tax_res['tax_ids'])], 'tax_tag_ids': [(6, 0, tax_res['tag_ids'])], + 'currency_id': False, 'reconcile_model_id': self.id, }) # Handle price included taxes. - base_line_dict['debit'] = tax_res['base'] > 0 and tax_res['base'] or base_line_dict['debit'] - base_line_dict['credit'] = tax_res['base'] < 0 and -tax_res['base'] or base_line_dict['credit'] + base_line_dict['balance'] = tax_res['base'] base_line_dict['tax_tag_ids'] = [(6, 0, res['base_tags'])] return new_aml_dicts - def _get_write_off_move_lines_dict(self, st_line, move_lines=None, residual_balance=None): + def _get_write_off_move_lines_dict(self, st_line, residual_balance): ''' Get move.lines dict (to be passed to the create()) corresponding to the reconciliation model's write-off lines. - :param st_line: An account.bank.statement.line record.(possibly empty, if performing manual reconciliation) - :param move_lines: An account.move.line recordset. + :param st_line: An account.bank.statement.line record.(possibly empty, if performing manual reconciliation) + :param residual_balance: The residual balance of the statement line. :return: A list of dict representing move.lines to be created corresponding to the write-off lines. ''' self.ensure_one() @@ -259,42 +257,39 @@ class AccountReconcileModel(models.Model): if self.rule_type == 'invoice_matching' and (not self.match_total_amount or (self.match_total_amount_param == 100)): return [] - line_residual = st_line.currency_id and st_line.amount_currency or st_line.amount - line_currency = st_line.currency_id or st_line.journal_id.currency_id or self.company_id.currency_id + lines_vals_list = [] - total_residual = move_lines and sum(aml.currency_id and aml.amount_residual_currency or aml.amount_residual for aml in move_lines) or 0.0 - - balance = total_residual - line_residual - - new_aml_dicts = [] - if residual_balance is None: - residual_balance = balance for line in self.line_ids: - if not line.account_id or float_is_zero(residual_balance, precision_rounding=line_currency.rounding): - continue + + if not line.account_id or st_line.company_currency_id.is_zero(residual_balance): + return [] if line.amount_type == 'percentage': - line_balance = residual_balance * (line.amount / 100.0) + balance = residual_balance * (line.amount / 100.0) elif line.amount_type == "regex": - match = re.search(line.amount_string, st_line.name) + match = re.search(line.amount_string, st_line.payment_ref) if match: - line_balance = copysign(float(re.sub(r'\D' + self.decimal_separator, '', match.group(1)).replace(self.decimal_separator, '.')) * (1 if balance > 0.0 else -1), balance) + sign = 1 if residual_balance > 0.0 else -1 + extracted_balance = float(re.sub(r'\D' + self.decimal_separator, '', match.group(1)).replace(self.decimal_separator, '.')) + balance = copysign(extracted_balance * sign, residual_balance) else: - line_balance = 0 + balance = 0 else: - line_balance = line.amount * (1 if residual_balance > 0.0 else -1) + balance = line.amount * (1 if residual_balance > 0.0 else -1) + writeoff_line = { - 'name': line.label or st_line.name, + 'name': line.label or st_line.payment_ref, + 'balance': balance, 'account_id': line.account_id.id, + 'currency_id': False, 'analytic_account_id': line.analytic_account_id.id, 'analytic_tag_ids': [(6, 0, line.analytic_tag_ids.ids)], - 'debit': line_balance > 0 and line_balance or 0, - 'credit': line_balance < 0 and -line_balance or 0, 'reconcile_model_id': self.id, } - new_aml_dicts.append(writeoff_line) + lines_vals_list.append(writeoff_line) + + residual_balance -= balance - residual_balance -= line_balance if line.tax_ids: writeoff_line['tax_ids'] = [(6, None, line.tax_ids.ids)] tax = line.tax_ids @@ -302,63 +297,59 @@ class AccountReconcileModel(models.Model): # only allow to set the force_tax_included field if we have one tax selected if line.force_tax_included: tax = tax[0].with_context(force_price_include=True) - new_aml_dicts += self._get_taxes_move_lines_dict(tax, writeoff_line) + lines_vals_list += self._get_taxes_move_lines_dict(tax, writeoff_line) - return new_aml_dicts + return lines_vals_list - def _prepare_reconciliation(self, st_line, move_lines=None, partner=None): - ''' Reconcile the statement line with some move lines using this reconciliation model. - :param st_line: An account.bank.statement.line record. - :param move_lines: An account.move.line recordset. - :param partner_id: An optional res.partner record. If not set, st_line.partner_id will be used. - :return: Counterpart account.moves. + def _prepare_reconciliation(self, st_line, aml_ids=[], partner=None): + ''' Prepare the reconciliation of the statement line with some counterpart line but + also with some auto-generated write-off lines. + + The complexity of this method comes from the fact the reconciliation will be soft meaning + it will be done only if the reconciliation will not trigger an error. + For example, the reconciliation will be skipped if we need to create an open balance but we + don't have a partner to get the receivable/payable account. + + This method works in two major steps. First, simulate the reconciliation of the account.move.line. + Then, add some write-off lines depending the rule's fields. + + :param st_line: An account.bank.statement.line record. + :param aml_ids: The ids of some account.move.line to reconcile. + :param partner: An optional res.partner record. If not specified, fallback on the statement line's partner. + :return: A list of dictionary to be passed to the account.bank.statement.line's 'reconcile' method. ''' self.ensure_one() + liquidity_lines, suspense_lines, other_lines = st_line._seek_for_lines() - # Create counterpart_aml_dicts + payment_aml_rec. - counterpart_aml_dicts = [] - payment_aml_rec = self.env['account.move.line'] - if move_lines: - for aml in move_lines: - if aml.account_id.internal_type == 'liquidity': - payment_aml_rec |= aml - else: - amount = aml.currency_id and aml.amount_residual_currency or aml.amount_residual - counterpart_aml_dicts.append({ - 'name': aml.name if aml.name != '/' else aml.move_id.name, - 'debit': amount < 0 and -amount or 0, - 'credit': amount > 0 and amount or 0, - 'move_line': aml, - }) + if st_line.to_check: + residual_balance = -liquidity_lines.balance + elif suspense_lines.account_id.reconcile: + residual_balance = sum(suspense_lines.mapped('amount_residual')) + else: + residual_balance = sum(suspense_lines.mapped('balance')) - # Create new_aml_dicts. - new_aml_dicts = self._get_write_off_move_lines_dict(st_line, move_lines=move_lines) + partner = partner or st_line.partner_id + lines_vals_list = [{'id': aml_id} for aml_id in aml_ids] + reconciliation_overview, open_balance_vals = st_line._prepare_reconciliation(lines_vals_list) - line_residual = st_line.currency_id and st_line.amount_currency or st_line.amount - line_currency = st_line.currency_id or st_line.journal_id.currency_id or st_line.company_id.currency_id - total_residual = move_lines and sum(aml.currency_id and aml.amount_residual_currency or aml.amount_residual for aml in move_lines) or 0.0 - total_residual -= sum(aml['debit'] - aml['credit'] for aml in new_aml_dicts) + for reconciliation_vals in reconciliation_overview: + residual_balance -= reconciliation_vals['line_vals']['debit'] - reconciliation_vals['line_vals']['credit'] - # Create open_balance_dict - open_balance_dict = None - if float_compare(line_residual, total_residual, precision_rounding=line_currency.rounding) != 0: - if not partner and not st_line.partner_id: - open_balance_dict = False + writeoff_vals_list = self._get_write_off_move_lines_dict(st_line, residual_balance) + + for line_vals in writeoff_vals_list: + residual_balance -= st_line.company_currency_id.round(line_vals['balance']) + + # Check we have enough information to create an open balance. + if not st_line.company_currency_id.is_zero(residual_balance): + if st_line.amount > 0: + open_balance_account = partner.property_account_receivable_id else: - balance = total_residual - line_residual - partner = (partner or st_line.partner_id).with_company(st_line.company_id) - open_balance_dict = { - 'name': '%s : %s' % (st_line.name, _('Open Balance')), - 'account_id': balance < 0 and partner.property_account_payable_id.id or partner.property_account_receivable_id.id, - 'debit': balance > 0 and balance or 0, - 'credit': balance < 0 and -balance or 0, - } - return { - 'counterpart_aml_dicts': counterpart_aml_dicts, - 'payment_aml_rec': payment_aml_rec, - 'new_aml_dicts': new_aml_dicts, - 'open_balance_dict': open_balance_dict - } + open_balance_account = partner.property_account_payable_id + if not open_balance_account: + return [] + + return lines_vals_list + writeoff_vals_list #################################################### # RECONCILIATION CRITERIA @@ -369,7 +360,7 @@ class AccountReconcileModel(models.Model): rule = self # Filter on journals. if rule.match_journal_ids: - query += ' AND st_line.journal_id IN %s' + query += ' AND st_line_move.journal_id IN %s' params += [tuple(rule.match_journal_ids.ids)] # Filter on amount nature. @@ -393,15 +384,15 @@ class AccountReconcileModel(models.Model): params += [rule.match_amount_min, rule.match_amount_max] # Filter on label, note and transaction_type - for field, column in [('label', 'name'), ('note', 'note'), ('transaction_type', 'transaction_type')]: + for table, field, column in [('st_line', 'label', 'payment_ref'), ('st_line_move', 'note', 'narration'), ('st_line', 'transaction_type', 'transaction_type')]: if rule['match_' + field] == 'contains': - query += ' AND st_line.{} ILIKE %s'.format(column) + query += ' AND {}.{} ILIKE %s'.format(table, column) params += ['%%%s%%' % rule['match_' + field + '_param']] elif rule['match_' + field] == 'not_contains': - query += ' AND st_line.{} NOT ILIKE %s'.format(column) + query += ' AND {}.{} NOT ILIKE %s'.format(table, column) params += ['%%%s%%' % rule['match_' + field + '_param']] elif rule['match_' + field] == 'match_regex': - query += ' AND st_line.{} ~* %s'.format(column) + query += ' AND {}.{} ~* %s'.format(table, column) params += [rule['match_' + field + '_param']] # Filter on partners. @@ -478,11 +469,11 @@ class AccountReconcileModel(models.Model): substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' AND regexp_split_to_array(substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') ) OR regexp_split_to_array(substring(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') OR ( move.ref IS NOT NULL @@ -490,24 +481,25 @@ class AccountReconcileModel(models.Model): substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' AND regexp_split_to_array(substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') ) AS communication_flag, - -- Determine a matching or not with the statement line communication using the move.invoice_payment_ref. + -- Determine a matching or not with the statement line communication using the move.payment_reference. ( - move.invoice_payment_ref IS NOT NULL + move.payment_reference IS NOT NULL AND - regexp_replace(move.invoice_payment_ref, '\s+', '', 'g') = regexp_replace(st_line.name, '\s+', '', 'g') + regexp_replace(move.payment_reference, '\s+', '', 'g') = regexp_replace(st_line.payment_ref, '\s+', '', 'g') ) AS payment_reference_flag FROM account_bank_statement_line st_line - LEFT JOIN account_journal journal ON journal.id = st_line.journal_id + JOIN account_move st_line_move ON st_line_move.id = st_line.move_id + JOIN account_journal journal ON journal.id = st_line_move.journal_id LEFT JOIN jnl_precision ON jnl_precision.journal_id = journal.id - LEFT JOIN res_company company ON company.id = st_line.company_id + JOIN res_company company ON company.id = st_line_move.company_id LEFT JOIN partners_table line_partner ON line_partner.line_id = st_line.id , account_move_line aml LEFT JOIN account_move move ON move.id = aml.move_id AND move.state = 'posted' LEFT JOIN account_account account ON account.id = aml.account_id WHERE st_line.id IN %s - AND aml.company_id = st_line.company_id + AND aml.company_id = st_line_move.company_id AND move.state = 'posted' AND ( -- the field match_partner of the rule might enforce the second part of @@ -534,7 +526,7 @@ class AccountReconcileModel(models.Model): ( line_partner.partner_id = 0 AND - substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' + substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' AND ( ( @@ -543,11 +535,11 @@ class AccountReconcileModel(models.Model): substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' AND regexp_split_to_array(substring(REGEXP_REPLACE(aml.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') ) OR regexp_split_to_array(substring(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') OR ( move.ref IS NOT NULL @@ -555,41 +547,24 @@ class AccountReconcileModel(models.Model): substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*') != '' AND regexp_split_to_array(substring(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'),'\s+') - && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') + && regexp_split_to_array(substring(REGEXP_REPLACE(st_line.payment_ref, '[^0-9|^\s]', '', 'g'), '\S(?:.*\S)*'), '\s+') ) OR ( - move.invoice_payment_ref IS NOT NULL + move.payment_reference IS NOT NULL AND - regexp_replace(move.invoice_payment_ref, '\s+', '', 'g') = regexp_replace(st_line.name, '\s+', '', 'g') + regexp_replace(move.payment_reference, '\s+', '', 'g') = regexp_replace(st_line.payment_ref, '\s+', '', 'g') ) ) ) ) - AND - ( - ( - -- blue lines appearance conditions - aml.account_id IN (journal.default_credit_account_id, journal.default_debit_account_id) - AND aml.statement_id IS NULL - AND ( - company.account_bank_reconciliation_start IS NULL - OR - aml.date > company.account_bank_reconciliation_start - ) - ) - OR - ( - -- black lines appearance conditions - account.reconcile IS TRUE - AND aml.reconciled IS FALSE - ) - ) + AND account.reconcile IS TRUE + AND aml.reconciled IS FALSE ''' # Filter on the same currency. if rule.match_same_currency: query += ''' - AND COALESCE(st_line.currency_id, journal.currency_id, company.currency_id) = COALESCE(aml.currency_id, company.currency_id) + AND COALESCE(st_line.foreign_currency_id, st_line_move.currency_id) = COALESCE(aml.currency_id, company.currency_id) ''' params = [rule.sequence, rule.id, tuple(st_lines.ids)] @@ -625,9 +600,10 @@ class AccountReconcileModel(models.Model): %s AS model_id, st_line.id AS id FROM account_bank_statement_line st_line - LEFT JOIN account_journal journal ON journal.id = st_line.journal_id + JOIN account_move st_line_move ON st_line_move.id = st_line.move_id + LEFT JOIN account_journal journal ON journal.id = st_line_move.journal_id LEFT JOIN jnl_precision ON jnl_precision.journal_id = journal.id - LEFT JOIN res_company company ON company.id = st_line.company_id + LEFT JOIN res_company company ON company.id = st_line_move.company_id LEFT JOIN partners_table line_partner ON line_partner.line_id = st_line.id WHERE st_line.id IN %s ''' @@ -803,30 +779,20 @@ class AccountReconcileModel(models.Model): # Create write-off lines. move_lines = self.env['account.move.line'].browse(results[line.id]['aml_ids']) partner = partner_map and partner_map.get(line.id) and self.env['res.partner'].browse(partner_map[line.id]) - reconciliation_results = model._prepare_reconciliation(line, move_lines, partner=partner) + lines_vals_list = model._prepare_reconciliation(line, aml_ids=results[line.id]['aml_ids'], partner=partner) - # A write-off must be applied. - if reconciliation_results['new_aml_dicts']: + # A write-off must be applied since there is some 'new' lines to propose. + if not lines_vals_list or any(not line_vals.get('id') for line_vals in lines_vals_list): results[line.id]['status'] = 'write_off' # Process auto-reconciliation. - if (first_batch_candidates or second_batch_candidates) and model.auto_reconcile: - # An open balance is needed but no partner has been found. - if reconciliation_results['open_balance_dict'] is False: - break - - new_aml_dicts = reconciliation_results['new_aml_dicts'] - if reconciliation_results['open_balance_dict']: - new_aml_dicts.append(reconciliation_results['open_balance_dict']) + if lines_vals_list and (first_batch_candidates or second_batch_candidates) and model.auto_reconcile: if not line.partner_id and partner: line.partner_id = partner - counterpart_moves = line.process_reconciliation( - counterpart_aml_dicts=reconciliation_results['counterpart_aml_dicts'], - payment_aml_rec=reconciliation_results['payment_aml_rec'], - new_aml_dicts=new_aml_dicts, - ) + line.reconcile(lines_vals_list) + results[line.id]['status'] = 'reconciled' - results[line.id]['reconciled_lines'] = counterpart_moves.mapped('line_ids') + results[line.id]['reconciled_lines'] = line.line_ids # The reconciled move lines are no longer candidates for another rule. reconciled_amls_ids.update(move_lines.ids) @@ -840,26 +806,18 @@ class AccountReconcileModel(models.Model): # Create write-off lines. partner = partner_map and partner_map.get(line.id) and self.env['res.partner'].browse(partner_map[line.id]) - reconciliation_results = model._prepare_reconciliation(line, partner=partner) + lines_vals_list = model._prepare_reconciliation(line, partner=partner) - # An open balance is needed but no partner has been found. - if reconciliation_results['open_balance_dict'] is False: + if not lines_vals_list: break # Process auto-reconciliation. if model.auto_reconcile: - new_aml_dicts = reconciliation_results['new_aml_dicts'] - if reconciliation_results['open_balance_dict']: - new_aml_dicts.append(reconciliation_results['open_balance_dict']) if not line.partner_id and partner: line.partner_id = partner - counterpart_moves = line.process_reconciliation( - counterpart_aml_dicts=reconciliation_results['counterpart_aml_dicts'], - payment_aml_rec=reconciliation_results['payment_aml_rec'], - new_aml_dicts=new_aml_dicts, - ) + line.reconcile(lines_vals_list) results[line.id]['status'] = 'reconciled' - results[line.id]['reconciled_lines'] = counterpart_moves.mapped('line_ids') + results[line.id]['reconciled_lines'] = line.line_ids # Break models loop. break diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index d004a02235e..1131f0b117b 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -105,6 +105,7 @@ class AccountChartTemplate(models.Model): string="Gain Exchange Rate Account", domain=[('internal_type', '=', 'other'), ('deprecated', '=', False)]) expense_currency_exchange_account_id = fields.Many2one('account.account.template', string="Loss Exchange Rate Account", domain=[('internal_type', '=', 'other'), ('deprecated', '=', False)]) + account_journal_suspense_account_id = fields.Many2one('account.account.template', string='Journal Suspense Account') default_cash_difference_income_account_id = fields.Many2one('account.account.template', string="Cash Difference Income Account") default_cash_difference_expense_account_id = fields.Many2one('account.account.template', string="Cash Difference Expense Account") default_pos_receivable_account_id = fields.Many2one('account.account.template', string="PoS receivable account") @@ -122,14 +123,14 @@ class AccountChartTemplate(models.Model): property_advance_tax_payment_account_id = fields.Many2one('account.account.template', string="Advance tax payment account") @api.model - def _prepare_transfer_account_template(self): + def _prepare_transfer_account_template(self, prefix=None): ''' Prepare values to create the transfer account that is an intermediary account used when moving money from a liquidity account to another. :return: A dictionary of values to create a new account.account. ''' digits = self.code_digits - prefix = self.transfer_account_code_prefix or '' + prefix = prefix or self.transfer_account_code_prefix or '' # Flatten the hierarchy of chart templates. chart_template = self chart_templates = self @@ -154,6 +155,15 @@ class AccountChartTemplate(models.Model): 'chart_template_id': self.id, } + @api.model + def _create_liquidity_journal_suspense_account(self, company, code_digits): + return self.env['account.account'].create({ + 'name': _("Bank Suspense Account"), + 'code': self.env['account.account']._search_new_account_code(company, code_digits, company.transfer_account_code_prefix or ''), + 'user_type_id': self.env.ref('account.data_account_type_current_assets').id, + 'company_id': company.id, + }) + def try_loading(self, company=False): """ Installs this chart of accounts for the current company if not chart of accounts had been created for it yet. @@ -239,8 +249,12 @@ class AccountChartTemplate(models.Model): company.write({ 'default_cash_difference_income_account_id': acc_template_ref.get(self.default_cash_difference_income_account_id.id, False), 'default_cash_difference_expense_account_id': acc_template_ref.get(self.default_cash_difference_expense_account_id.id, False), + 'account_journal_suspense_account_id': acc_template_ref.get(self.account_journal_suspense_account_id.id), }) + if not company.account_journal_suspense_account_id: + company.account_journal_suspense_account_id = self._create_liquidity_journal_suspense_account(company, self.code_digits) + # Set default PoS receivable account in company default_pos_receivable = self.default_pos_receivable_account_id.id if not default_pos_receivable and self.parent_id: @@ -333,19 +347,11 @@ class AccountChartTemplate(models.Model): 'type': acc['account_type'], 'company_id': company.id, 'currency_id': acc.get('currency_id', self.env['res.currency']).id, - 'sequence': 10 + 'sequence': 10, }) return bank_journals - def get_countries_posting_at_bank_rec(self): - """ Returns the list of the country codes of the countries for which, by default, - payments made on bank journals should be creating draft account.move objects, - which get in turn posted when their payment gets reconciled with a bank statement line. - This function is an extension hook for localization modules. - """ - return [] - @api.model def _get_default_bank_journals_data(self): """ Returns the data needed to create the default bank journals when diff --git a/addons/account/models/company.py b/addons/account/models/company.py index 330257355ea..4535f0da68d 100644 --- a/addons/account/models/company.py +++ b/addons/account/models/company.py @@ -45,6 +45,7 @@ class ResCompany(models.Model): cash_account_code_prefix = fields.Char(string='Prefix of the cash accounts') default_cash_difference_income_account_id = fields.Many2one('account.account', string="Cash Difference Income Account") default_cash_difference_expense_account_id = fields.Many2one('account.account', string="Cash Difference Expense Account") + account_journal_suspense_account_id = fields.Many2one('account.account', string='Journal Suspense Account') transfer_account_code_prefix = fields.Char(string='Prefix of the transfer accounts') account_sale_tax_id = fields.Many2one('account.tax', string="Default Sale Tax") account_purchase_tax_id = fields.Many2one('account.tax', string="Default Purchase Tax") @@ -64,9 +65,6 @@ class ResCompany(models.Model): property_stock_valuation_account_id = fields.Many2one('account.account', string="Account Template for Stock Valuation") bank_journal_ids = fields.One2many('account.journal', 'company_id', domain=[('type', '=', 'bank')], string='Bank Journals') tax_exigibility = fields.Boolean(string='Use Cash Basis') - account_bank_reconciliation_start = fields.Date(string="Bank Reconciliation Threshold", help="""The bank reconciliation widget won't ask to reconcile payments older than this date. - This is useful if you install accounting after having used invoicing for some time and - don't want to reconcile all the past payments with bank statements.""") incoterm_id = fields.Many2one('account.incoterms', string='Default incoterm', help='International Commercial Terms are a series of predefined commercial terms used in international transactions.') @@ -456,7 +454,7 @@ class ResCompany(models.Model): raise RedirectWarning(msg, action.id, _("Go to the journal configuration")) sample_invoice = self.env['account.move'].with_context(default_move_type='out_invoice', default_journal_id=journal.id).create({ - 'invoice_payment_ref': _('Sample invoice'), + 'payment_reference': _('Sample invoice'), 'partner_id': partner.id, 'invoice_line_ids': [ (0, 0, { diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py index d6bb95c2a32..d29ad24ea1a 100644 --- a/addons/account/models/res_config_settings.py +++ b/addons/account/models/res_config_settings.py @@ -74,11 +74,6 @@ class ResConfigSettings(models.TransientModel): module_snailmail_account = fields.Boolean(string="Snailmail") tax_exigibility = fields.Boolean(string='Cash Basis', related='company_id.tax_exigibility', readonly=False) tax_cash_basis_journal_id = fields.Many2one('account.journal', related='company_id.tax_cash_basis_journal_id', string="Tax Cash Basis Journal", readonly=False) - account_bank_reconciliation_start = fields.Date(string="Bank Reconciliation Threshold", - related='company_id.account_bank_reconciliation_start', readonly=False, - help="""The bank reconciliation widget won't ask to reconcile payments older than this date. - This is useful if you install accounting after having used invoicing for some time and - don't want to reconcile all the past payments with bank statements.""") qr_code = fields.Boolean(string='Display SEPA QR-code', related='company_id.qr_code', readonly=False) invoice_is_print = fields.Boolean(string='Print', related='company_id.invoice_is_print', readonly=False) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 03d41a20e72..80271a887d7 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -55,7 +55,7 @@ class AccountInvoiceReport(models.Model): _depends = { 'account.move': [ 'name', 'state', 'move_type', 'partner_id', 'invoice_user_id', 'fiscal_position_id', - 'invoice_date', 'invoice_date_due', 'invoice_payment_term_id', 'invoice_partner_bank_id', + 'invoice_date', 'invoice_date_due', 'invoice_payment_term_id', 'partner_bank_id', ], 'account.move.line': [ 'quantity', 'price_subtotal', 'amount_residual', 'balance', 'amount_currency', diff --git a/addons/account/static/src/xml/account_payment.xml b/addons/account/static/src/xml/account_payment.xml index b8aa5024a37..8d6f484cb6c 100644 --- a/addons/account/static/src/xml/account_payment.xml +++ b/addons/account/static/src/xml/account_payment.xml @@ -17,7 +17,7 @@ Add
-
+
+
-
@@ -250,16 +250,24 @@
-
-
-
-
+
-
- Balance in GL
-
-
-
+
+
-
-
+
+
+ Balance in GL
+
+
+
+
+
+ Outstanding Payments/Receipts
+
+
+
+
Latest Statement
@@ -269,16 +277,6 @@
-
-
- Balance in GL
-
-
-
-
Sample data
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 600bdc69f31..80e769da0cd 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -409,7 +409,7 @@
+
+
account.payment.tree
account.payment
-
-
+
@@ -40,7 +41,7 @@
@@ -50,7 +51,7 @@
-
@@ -82,31 +83,36 @@
-
- account.payment.form.multi
- account.payment.register
-
-
-
-
-
account.payment.graph
account.payment
@@ -260,6 +267,8 @@
+
+
Payments
account.payment
@@ -268,7 +277,7 @@
'default_payment_type': 'inbound',
'default_partner_type': 'customer',
'search_default_inbound_filter': 1,
- 'res_partner_search_mode': 'customer',
+ 'default_move_journal_types': ('bank', 'cash'),
}
@@ -288,7 +297,7 @@
'default_payment_type': 'outbound',
'default_partner_type': 'supplier',
'search_default_outbound_filter': 1,
- 'res_partner_search_mode': 'supplier',
+ 'default_move_journal_types': ('bank', 'cash'),
}
@@ -316,33 +325,16 @@
-
- account.payment.invoice.form
- account.payment
- primary
-
-
-
-
-
-
-
Register Payment
list
code
- action = model.action_register_payment()
+ if records:
+ action = records.action_register_payment()
@@ -356,7 +348,7 @@
list
- records.post()
+ records.action_post()
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index c75900f444d..adc629e7037 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -289,8 +289,22 @@
-
@@ -313,16 +327,17 @@
Configure Email Servers
- Keep empty for no control
- Please use the following communication for your payment : +
+ Please use the following communication for your payment :
diff --git a/addons/account/views/report_payment_receipt_templates.xml b/addons/account/views/report_payment_receipt_templates.xml index 04a7e649e08..c472cd3ff68 100644 --- a/addons/account/views/report_payment_receipt_templates.xml +++ b/addons/account/views/report_payment_receipt_templates.xml @@ -6,8 +6,8 @@
Payment Receipt:
-
- Payment Date:
+
+ Payment Date:
@@ -27,8 +27,8 @@
@@ -43,12 +43,14 @@
-
Payment Amount:
-
- Memo:
+
+ Memo:
| - | + | - - - + + + |
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index 9e2b8869f3c..fefa89d4e4a 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -432,16 +432,6 @@
Bank & Cash
-
-
-
-
-
-
- The payments which have not been matched with a bank statement will not be shown in bank reconciliation data if they were made before this date
-
-
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 9be1a3ef8d1..a130d327938 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -16,3 +16,4 @@ from . import wizard_tax_adjustments
from . import account_invoice_send
from . import base_document_layout
from . import account_transfer_wizard
+from . import account_payment_register
diff --git a/addons/account/wizard/account_invoice_send.py b/addons/account/wizard/account_invoice_send.py
index 7ef17afc7c1..90861b0c91e 100644
--- a/addons/account/wizard/account_invoice_send.py
+++ b/addons/account/wizard/account_invoice_send.py
@@ -88,7 +88,7 @@ class AccountInvoiceSend(models.TransientModel):
if self.env.context.get('mark_invoice_as_sent'):
#Salesman send posted invoice, without the right to write
#but they should have the right to change this flag
- self.mapped('invoice_ids').sudo().write({'invoice_sent': True})
+ self.mapped('invoice_ids').sudo().write({'is_move_sent': True})
def _print_document(self):
""" to override for each type of models that will use this composer."""
diff --git a/addons/account/wizard/account_payment_register.py b/addons/account/wizard/account_payment_register.py
new file mode 100644
index 00000000000..c36f5bbfb9c
--- /dev/null
+++ b/addons/account/wizard/account_payment_register.py
@@ -0,0 +1,504 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+from odoo.exceptions import UserError
+
+
+class AccountPaymentRegister(models.TransientModel):
+ _name = 'account.payment.register'
+ _description = 'Register Payment'
+
+ # == Business fields ==
+ payment_date = fields.Date(String="Payment Date", required=True,
+ default=fields.Date.context_today)
+ amount = fields.Monetary(currency_field='currency_id', store=True, readonly=False,
+ compute='_compute_amount')
+ communication = fields.Char(string="Memo", store=True, readonly=False,
+ compute='_compute_communication')
+ group_payment = fields.Boolean(string="Group Payments", store=True, readonly=False,
+ compute='_compute_group_payment',
+ help="Only one payment will be created by partner (bank)/ currency.")
+ currency_id = fields.Many2one('res.currency', string='Currency', store=True, readonly=False,
+ compute='_compute_currency_id',
+ help="The payment's currency.")
+ journal_id = fields.Many2one('account.journal', store=True, readonly=False,
+ compute='_compute_journal_id',
+ domain="[('company_id', '=', company_id), ('type', 'in', ('bank', 'cash'))]")
+ partner_bank_id = fields.Many2one('res.partner.bank', string="Recipient Bank Account",
+ readonly=False, store=True,
+ compute='_compute_partner_bank_id',
+ domain="['|', ('company_id', '=', False), ('company_id', '=', company_id), ('partner_id', '=', partner_id)]")
+ company_currency_id = fields.Many2one('res.currency', string="Company Currency",
+ related='company_id.currency_id')
+
+ # == Fields given through the context ==
+ line_ids = fields.Many2many('account.move.line', 'account_payment_register_move_line_rel', 'wizard_id', 'line_id',
+ string="Journal items", readonly=True, copy=False,)
+ payment_type = fields.Selection([
+ ('outbound', 'Send Money'),
+ ('inbound', 'Receive Money'),
+ ], string='Payment Type', store=True, copy=False,
+ compute='_compute_from_lines')
+ partner_type = fields.Selection([
+ ('customer', 'Customer'),
+ ('supplier', 'Vendor'),
+ ], store=True, copy=False,
+ compute='_compute_from_lines')
+ source_amount = fields.Monetary(
+ string="Amount to Pay (company currency)", store=True, copy=False,
+ currency_field='company_currency_id',
+ compute='_compute_from_lines')
+ source_amount_currency = fields.Monetary(
+ string="Amount to Pay (foreign currency)", store=True, copy=False,
+ currency_field='source_currency_id',
+ compute='_compute_from_lines')
+ source_currency_id = fields.Many2one('res.currency',
+ string='Source Currency', store=True, copy=False,
+ compute='_compute_from_lines',
+ help="The payment's currency.")
+ can_edit_wizard = fields.Boolean(store=True, copy=False,
+ compute='_compute_from_lines',
+ help="Technical field used to indicate the user can edit the wizard content such as the amount.")
+ can_group_payments = fields.Boolean(store=True, copy=False,
+ compute='_compute_from_lines',
+ help="Technical field used to indicate the user can see the 'group_payments' box.")
+ company_id = fields.Many2one('res.company', store=True, copy=False,
+ compute='_compute_from_lines')
+ partner_id = fields.Many2one('res.partner',
+ string="Customer/Vendor", store=True, copy=False, ondelete='restrict',
+ compute='_compute_from_lines')
+
+ # == Payment methods fields ==
+ payment_method_id = fields.Many2one('account.payment.method', string='Payment Method',
+ readonly=False, store=True,
+ compute='_compute_payment_method_id',
+ domain="[('id', 'in', available_payment_method_ids)]",
+ help="Manual: Get paid by cash, check or any other method outside of Odoo.\n"\
+ "Electronic: Get paid automatically through a payment acquirer by requesting a transaction on a card saved by the customer when buying or subscribing online (payment token).\n"\
+ "Check: Pay bill by check and print it from Odoo.\n"\
+ "Batch Deposit: Encase several customer checks at once by generating a batch deposit to submit to your bank. When encoding the bank statement in Odoo, you are suggested to reconcile the transaction with the batch deposit.To enable batch deposit, module account_batch_payment must be installed.\n"\
+ "SEPA Credit Transfer: Pay bill from a SEPA Credit Transfer file you submit to your bank. To enable sepa credit transfer, module account_sepa must be installed ")
+ available_payment_method_ids = fields.Many2many('account.payment.method',
+ compute='_compute_payment_method_fields')
+ hide_payment_method = fields.Boolean(
+ compute='_compute_payment_method_fields',
+ help="Technical field used to hide the payment method if the selected journal has only one available which is 'manual'")
+
+ # == Payment difference fields ==
+ payment_difference = fields.Monetary(
+ compute='_compute_payment_difference')
+ payment_difference_handling = fields.Selection([
+ ('open', 'Keep open'),
+ ('reconcile', 'Mark invoice as fully paid'),
+ ], default='open', string="Payment Difference Handling")
+ writeoff_account_id = fields.Many2one('account.account', string="Difference Account", copy=False,
+ domain="[('deprecated', '=', False), ('company_id', '=', company_id)]")
+ writeoff_label = fields.Char(string='Journal Item Label', default='Write-Off',
+ help='Change label of the counterpart that will hold the payment difference')
+
+ # == Display purpose fields ==
+ show_partner_bank_account = fields.Boolean(
+ compute='_compute_show_require_partner_bank',
+ help="Technical field used to know whether the field `partner_bank_id` needs to be displayed or not in the payments form views")
+ require_partner_bank_account = fields.Boolean(
+ compute='_compute_show_require_partner_bank',
+ help="Technical field used to know whether the field `partner_bank_id` needs to be required or not in the payments form views")
+
+ # -------------------------------------------------------------------------
+ # HELPERS
+ # -------------------------------------------------------------------------
+
+ @api.model
+ def _get_batch_communication(self, batch_result):
+ ''' Helper to compute the communication based on the batch.
+ :param batch_result: A batch returned by '_get_batches'.
+ :return: A string representing a communication to be set on payment.
+ '''
+ return ' '.join(label for label in batch_result['lines'].mapped('name') if label)
+
+ @api.model
+ def _get_line_batch_key(self, line):
+ ''' Turn the line passed as parameter to a dictionary defining on which way the lines
+ will be grouped together.
+ :return: A python dictionary.
+ '''
+ return {
+ 'partner_id': line.partner_id.id,
+ 'account_id': line.account_id.id,
+ 'currency_id': (line.currency_id or line.company_currency_id).id,
+ 'partner_bank_id': line.move_id.partner_bank_id.id,
+ 'partner_type': 'customer' if line.account_internal_type == 'receivable' else 'supplier',
+ 'payment_type': 'inbound' if line.balance > 0.0 else 'outbound',
+ }
+
+ def _get_batches(self):
+ ''' Group the account.move.line linked to the wizard together.
+ :return: A list of batches, each one containing:
+ * key_values: The key as a dictionary used to group the journal items together.
+ * moves: An account.move recordset.
+ '''
+ self.ensure_one()
+
+ lines = self.line_ids
+
+ if len(lines.company_id) > 1:
+ raise UserError(_("You can't create payments for entries belonging to different companies."))
+ if not lines:
+ raise UserError(_("You can't open the register payment wizard without at least one receivable/payable line."))
+
+ batches = {}
+ for line in lines:
+ batch_key = self._get_line_batch_key(line)
+
+ serialized_key = '-'.join(str(v) for v in batch_key.values())
+ batches.setdefault(serialized_key, {
+ 'key_values': batch_key,
+ 'lines': self.env['account.move.line'],
+ })
+ batches[serialized_key]['lines'] += line
+ return list(batches.values())
+
+ @api.model
+ def _get_wizard_values_from_batch(self, batch_result):
+ ''' Extract values from the batch passed as parameter (see '_get_batches')
+ to be mounted in the wizard view.
+ :param batch_result: A batch returned by '_get_batches'.
+ :return: A dictionary containing valid fields
+ '''
+ key_values = batch_result['key_values']
+ lines = batch_result['lines']
+ company = lines[0].company_id
+
+ source_amount = abs(sum(lines.mapped('amount_residual')))
+ if key_values['currency_id'] == company.currency_id.id:
+ source_amount_currency = source_amount
+ else:
+ source_amount_currency = abs(sum(lines.mapped('amount_residual_currency')))
+
+ return {
+ 'company_id': company.id,
+ 'partner_id': key_values['partner_id'],
+ 'partner_type': key_values['partner_type'],
+ 'payment_type': key_values['payment_type'],
+ 'source_currency_id': key_values['currency_id'],
+ 'source_amount': source_amount,
+ 'source_amount_currency': source_amount_currency,
+ }
+
+ # -------------------------------------------------------------------------
+ # COMPUTE METHODS
+ # -------------------------------------------------------------------------
+
+ @api.depends('line_ids')
+ def _compute_from_lines(self):
+ ''' Load initial values from the account.moves passed through the context. '''
+ for wizard in self:
+ batches = wizard._get_batches()
+
+ if len(batches) == 1:
+ # == Single batch to be mounted on the view ==
+ batch_result = batches[0]
+ wizard.update(wizard._get_wizard_values_from_batch(batch_result))
+
+ wizard.can_edit_wizard = True
+ wizard.can_group_payments = len(batch_result['lines']) != 1
+ else:
+ # == Multiple batches: The wizard is not editable ==
+ wizard.update({
+ 'company_id': batches[0]['lines'][0].company_id.id,
+ 'partner_id': False,
+ 'partner_type': False,
+ 'payment_type': False,
+ 'source_currency_id': False,
+ 'source_amount': False,
+ 'source_amount_currency': False,
+ })
+
+ wizard.can_edit_wizard = False
+ wizard.can_group_payments = any(len(batch_result['lines']) != 1 for batch_result in batches)
+
+ @api.depends('can_edit_wizard')
+ def _compute_communication(self):
+ # The communication can't be computed in '_compute_from_lines' because
+ # it's a compute editable field and then, should be computed in a separated method.
+ for wizard in self:
+ if wizard.can_edit_wizard:
+ batches = self._get_batches()
+ wizard.communication = wizard._get_batch_communication(batches[0])
+ else:
+ wizard.communication = False
+
+ @api.depends('can_edit_wizard')
+ def _compute_group_payment(self):
+ for wizard in self:
+ if wizard.can_edit_wizard:
+ batches = wizard._get_batches()
+ wizard.group_payment = len(batches[0]['lines'].move_id) == 1
+ else:
+ wizard.group_payment = False
+
+ @api.depends('company_id', 'source_currency_id')
+ def _compute_journal_id(self):
+ for wizard in self:
+ domain = [
+ ('type', 'in', ('bank', 'cash')),
+ ('company_id', '=', wizard.company_id.id),
+ ]
+ journal = None
+ if wizard.source_currency_id:
+ journal = self.env['account.journal'].search(domain + [('currency_id', '=', wizard.source_currency_id.id)], limit=1)
+ if not journal:
+ journal = self.env['account.journal'].search(domain, limit=1)
+ wizard.journal_id = journal
+
+ @api.depends('journal_id')
+ def _compute_currency_id(self):
+ for wizard in self:
+ wizard.currency_id = wizard.journal_id.currency_id or wizard.source_currency_id or wizard.company_id.currency_id
+
+ @api.depends('partner_id')
+ def _compute_partner_bank_id(self):
+ ''' The default partner_bank_id will be the first available on the partner. '''
+ for wizard in self:
+ available_partner_bank_accounts = wizard.partner_id.bank_ids
+ if available_partner_bank_accounts:
+ wizard.partner_bank_id = available_partner_bank_accounts[0]._origin
+ else:
+ wizard.partner_bank_id = False
+
+ @api.depends('journal_id')
+ def _compute_payment_method_id(self):
+ for wizard in self:
+ batches = wizard._get_batches()
+ payment_type = batches[0]['key_values']['payment_type']
+
+ if payment_type == 'inbound':
+ available_payment_methods = wizard.journal_id.inbound_payment_method_ids
+ else:
+ available_payment_methods = wizard.journal_id.outbound_payment_method_ids
+
+ # Select the first available one by default.
+ if available_payment_methods:
+ wizard.payment_method_id = available_payment_methods[0]._origin
+ else:
+ wizard.payment_method_id = False
+
+ @api.depends('payment_type',
+ 'journal_id.inbound_payment_method_ids',
+ 'journal_id.outbound_payment_method_ids')
+ def _compute_payment_method_fields(self):
+ for wizard in self:
+ if wizard.payment_type == 'inbound':
+ wizard.available_payment_method_ids = wizard.journal_id.inbound_payment_method_ids
+ else:
+ wizard.available_payment_method_ids = wizard.journal_id.outbound_payment_method_ids
+
+ wizard.hide_payment_method = len(wizard.available_payment_method_ids) == 1 and wizard.available_payment_method_ids.code == 'manual'
+
+ @api.depends('payment_type',
+ 'journal_id.inbound_payment_method_ids',
+ 'journal_id.outbound_payment_method_ids')
+ def _compute_payment_method_id(self):
+ for wizard in self:
+ if wizard.payment_type == 'inbound':
+ available_payment_methods = wizard.journal_id.inbound_payment_method_ids
+ else:
+ available_payment_methods = wizard.journal_id.outbound_payment_method_ids
+
+ # Select the first available one by default.
+ if available_payment_methods:
+ wizard.payment_method_id = available_payment_methods[0]._origin
+ else:
+ wizard.payment_method_id = False
+
+ @api.depends('payment_method_id')
+ def _compute_show_require_partner_bank(self):
+ """ Computes if the destination bank account must be displayed in the payment form view. By default, it
+ won't be displayed but some modules might change that, depending on the payment type."""
+ for wizard in self:
+ wizard.show_partner_bank_account = wizard.payment_method_id.code in self.env['account.payment']._get_method_codes_using_bank_account()
+ wizard.require_partner_bank_account = wizard.payment_method_id.code in self.env['account.payment']._get_method_codes_needing_bank_account()
+
+ @api.depends('source_amount', 'source_amount_currency', 'source_currency_id', 'company_id', 'currency_id', 'payment_date')
+ def _compute_amount(self):
+ for wizard in self:
+ if wizard.source_currency_id == wizard.currency_id:
+ # Same currency.
+ wizard.amount = wizard.source_amount_currency
+ elif wizard.currency_id == wizard.company_id.currency_id:
+ # Payment expressed on the company's currency.
+ wizard.amount = wizard.source_amount
+ else:
+ # Foreign currency on payment different than the one set on the journal entries.
+ amount_payment_currency = wizard.company_id.currency_id._convert(wizard.source_amount, wizard.currency_id, wizard.company_id, wizard.payment_date)
+ wizard.amount = amount_payment_currency
+
+ @api.depends('amount')
+ def _compute_payment_difference(self):
+ for wizard in self:
+ if wizard.source_currency_id == wizard.currency_id:
+ # Same currency.
+ wizard.payment_difference = wizard.source_amount_currency - wizard.amount
+ elif wizard.currency_id == wizard.company_id.currency_id:
+ # Payment expressed on the company's currency.
+ wizard.payment_difference = wizard.source_amount - wizard.amount
+ else:
+ # Foreign currency on payment different than the one set on the journal entries.
+ amount_payment_currency = wizard.company_id.currency_id._convert(wizard.source_amount, wizard.currency_id, wizard.company_id, wizard.payment_date)
+ wizard.payment_difference = amount_payment_currency - wizard.amount
+
+ # -------------------------------------------------------------------------
+ # LOW-LEVEL METHODS
+ # -------------------------------------------------------------------------
+
+ @api.model
+ def default_get(self, fields_list):
+ # OVERRIDE
+ res = super().default_get(fields_list)
+
+ if 'line_ids' in fields_list and 'line_ids' not in res:
+
+ # Retrieve moves to pay from the context.
+
+ if self._context.get('active_model') == 'account.move':
+ lines = self.env['account.move'].browse(self._context.get('active_ids', [])).line_ids
+ elif self._context.get('active_model') == 'account.move.line':
+ lines = self.env['account.move.line'].browse(self._context.get('active_ids', []))
+ else:
+ raise UserError(_(
+ "The register payment wizard should only be called on account.move or account.move.line records."
+ ))
+
+ # Keep lines having a residual amount to pay.
+ available_lines = self.env['account.move.line']
+ for line in lines:
+ if line.move_id.state != 'posted':
+ raise UserError(_("You can only register payment for posted journal entries."))
+
+ if line.account_internal_type not in ('receivable', 'payable'):
+ continue
+ if line.currency_id:
+ if line.currency_id.is_zero(line.amount_residual_currency):
+ continue
+ else:
+ if line.company_currency_id.is_zero(line.amount_residual):
+ continue
+ available_lines |= line
+
+ # Check.
+ if not available_lines:
+ raise UserError(_("You can't register a payment because there is nothing left to pay on the selected journal items."))
+ if len(lines.company_id) > 1:
+ raise UserError(_("You can't create payments for entries belonging to different companies."))
+ if len(set(available_lines.mapped('account_internal_type'))) > 1:
+ raise UserError(_("You can't register payments for journal items being either all inbound, either all outbound."))
+
+ res['line_ids'] = [(6, 0, available_lines.ids)]
+
+ return res
+
+ # -------------------------------------------------------------------------
+ # BUSINESS METHODS
+ # -------------------------------------------------------------------------
+
+ def _create_payment_vals_from_wizard(self):
+ payment_vals = {
+ 'date': self.payment_date,
+ 'amount': self.amount,
+ 'payment_type': self.payment_type,
+ 'partner_type': self.partner_type,
+ 'ref': self.communication,
+ 'journal_id': self.journal_id.id,
+ 'currency_id': self.currency_id.id,
+ 'partner_id': self.partner_id.id,
+ 'partner_bank_id': self.partner_bank_id.id,
+ 'payment_method_id': self.payment_method_id.id,
+ 'destination_account_id': self.line_ids[0].account_id.id
+ }
+
+ if self.payment_difference and self.payment_difference_handling == 'reconcile':
+ payment_vals['write_off_line_vals'] = {
+ 'name': self.writeoff_label,
+ 'amount': -self.payment_difference,
+ 'account_id': self.writeoff_account_id.id,
+ }
+ return payment_vals
+
+ def _create_payment_vals_from_batch(self, batch_result):
+ batch_values = self._get_wizard_values_from_batch(batch_result)
+ return {
+ 'date': self.payment_date,
+ 'amount': batch_values['source_amount_currency'],
+ 'payment_type': batch_values['payment_type'],
+ 'partner_type': batch_values['partner_type'],
+ 'ref': self._get_batch_communication(batch_result),
+ 'journal_id': self.journal_id.id,
+ 'currency_id': batch_values['source_currency_id'],
+ 'partner_id': batch_values['partner_id'],
+ 'partner_bank_id': batch_result['key_values']['partner_bank_id'],
+ 'payment_method_id': self.payment_method_id.id,
+ 'destination_account_id': batch_result['lines'][0].account_id.id
+ }
+
+ def _create_payments(self):
+ self.ensure_one()
+ batches = self._get_batches()
+
+ to_reconcile = []
+ if self.can_edit_wizard and (len(batches[0]['lines']) == 1 or self.group_payment):
+ payment_vals = self._create_payment_vals_from_wizard()
+ payment_vals_list = [payment_vals]
+ to_reconcile.append(batches[0]['lines'])
+ else:
+ # Don't group payments: Create one batch per move.
+ if not self.group_payment:
+ new_batches = []
+ for batch_result in batches:
+ for line in batch_result['lines']:
+ new_batches.append({
+ **batch_result,
+ 'lines': line,
+ })
+ batches = new_batches
+
+ payment_vals_list = []
+ for batch_result in batches:
+ payment_vals_list.append(self._create_payment_vals_from_batch(batch_result))
+ to_reconcile.append(batch_result['lines'])
+
+ payments = self.env['account.payment'].create(payment_vals_list)
+ payments.action_post()
+
+ domain = [('account_internal_type', 'in', ('receivable', 'payable')), ('reconciled', '=', False)]
+ for payment, lines in zip(payments, to_reconcile):
+ payment_lines = payment.line_ids.filtered_domain(domain)
+ for account in payment_lines.account_id:
+ (payment_lines + lines)\
+ .filtered_domain([('account_id', '=', account.id), ('reconciled', '=', False)])\
+ .reconcile()
+
+ return payments
+
+ def action_create_payments(self):
+ payments = self._create_payments()
+
+ if self._context.get('dont_redirect_to_payments'):
+ return True
+
+ action = {
+ 'name': _('Payments'),
+ 'type': 'ir.actions.act_window',
+ 'res_model': 'account.payment',
+ 'context': {'create': False},
+ }
+ if len(payments) == 1:
+ action.update({
+ 'view_mode': 'form',
+ 'res_id': payments.id,
+ })
+ else:
+ action.update({
+ 'view_mode': 'tree,form',
+ 'domain': [('id', 'in', payments.ids)],
+ })
+ return action
diff --git a/addons/account/wizard/account_payment_register_views.xml b/addons/account/wizard/account_payment_register_views.xml
new file mode 100644
index 00000000000..15aee188635
--- /dev/null
+++ b/addons/account/wizard/account_payment_register_views.xml
@@ -0,0 +1,82 @@
+
+
-
-
-
+
QR-bill payment part
@@ -19,11 +19,11 @@
Credit transfer
Account - + Creditor @@ -33,11 +33,11 @@ Reference number - + + diff --git a/addons/l10n_ch/tests/test_ch_qr_code.py b/addons/l10n_ch/tests/test_ch_qr_code.py index e46a3a2c1ec..e41dcdd03cc 100644 --- a/addons/l10n_ch/tests/test_ch_qr_code.py +++ b/addons/l10n_ch/tests/test_ch_qr_code.py @@ -28,9 +28,9 @@ class TestSwissQRCode(AccountTestInvoicingCommon): 'move_type': 'out_invoice', 'partner_id': cls.partner_a.id, 'currency_id': cls.env.ref('base.CHF').id, - 'invoice_partner_bank_id': cls.swiss_iban.id, + 'partner_bank_id': cls.swiss_iban.id, 'company_id': cls.company_data['company'].id, - 'invoice_payment_ref': "Papa a vu le fifi de lolo", + 'payment_reference': "Papa a vu le fifi de lolo", 'invoice_line_ids': [ (0, 0, {'quantity': 1, 'price_unit': 100}) ], @@ -61,13 +61,13 @@ class TestSwissQRCode(AccountTestInvoicingCommon): self.ch_qr_invoice.generate_qr_code() # Now, check with a QR-IBAN as the payment account - self.ch_qr_invoice.invoice_partner_bank_id = self.swiss_qr_iban + self.ch_qr_invoice.partner_bank_id = self.swiss_qr_iban with self.assertRaises(UserError, msg="It shouldn't be possible to generate a Swiss QR-cde for a QR-IBAN without giving it a valid QR-reference as payment reference."): self.ch_qr_invoice.generate_qr_code() # Assigning a QR reference should fix it - self.ch_qr_invoice.invoice_payment_ref = '210000000003139471430009017' + self.ch_qr_invoice.payment_reference = '210000000003139471430009017' def test_ch_qr_code_detection(self): """ Checks Swiss QR-code auto-detection when no specific QR-method diff --git a/addons/l10n_ch/views/account_invoice_view.xml b/addons/l10n_ch/views/account_invoice_view.xml index a5d56df6b99..f4f9abdee17 100644 --- a/addons/l10n_ch/views/account_invoice_view.xml +++ b/addons/l10n_ch/views/account_invoice_view.xml @@ -6,7 +6,7 @@ %s" % ( _("Bank account not found, useful informations from XML file:"), diff --git a/addons/l10n_lu/models/account_chart_template.py b/addons/l10n_lu/models/account_chart_template.py index 7eabdbb63d0..11d23619c36 100644 --- a/addons/l10n_lu/models/account_chart_template.py +++ b/addons/l10n_lu/models/account_chart_template.py @@ -7,11 +7,6 @@ from odoo import api, models, fields class AccountChartTemplate(models.Model): _inherit = 'account.chart.template' - def get_countries_posting_at_bank_rec(self): - rslt = super(AccountChartTemplate, self).get_countries_posting_at_bank_rec() - rslt.append('LU') - return rslt - @api.model def _prepare_all_journals(self, acc_template_ref, company, journals_dict=None): journal_data = super(AccountChartTemplate, self)._prepare_all_journals( diff --git a/addons/l10n_pe/models/__init__.py b/addons/l10n_pe/models/__init__.py index 4ba6149ba4f..2037a75eaa2 100644 --- a/addons/l10n_pe/models/__init__.py +++ b/addons/l10n_pe/models/__init__.py @@ -1,7 +1,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import account_tax from . import account_move -from . import account_journal from . import account_chart_template from . import l10n_latam_identification_type from . import res_partner diff --git a/addons/l10n_pe/models/account_journal.py b/addons/l10n_pe/models/account_journal.py deleted file mode 100644 index ff55a01cd45..00000000000 --- a/addons/l10n_pe/models/account_journal.py +++ /dev/null @@ -1,31 +0,0 @@ -from odoo import models, api - - -class AccountJournal(models.Model): - _inherit = "account.journal" - - @api.model - def _get_sequence_prefix(self, code, refund=False): - """For peruvian companies we can not use sequences with **/** due to the edi generation which need in the - sequence a plain text ended by a *-* and the length of this prefix""" - if self.env.company.country_id != self.env.ref('base.pe'): - return super()._get_sequence_prefix(code, refund=refund) - prefix = code.upper() - if len(prefix) > 3: - prefix = prefix[:3] - prefix = prefix.ljust(3, 'X') - if refund: - prefix = 'R' + prefix[:-1] - return prefix + '-' - - @api.model - def _create_sequence(self, vals, refund=False): - """For Peruvian companies, a number reset by date do not make sense due to the fact that we can not use a free - prefix the format does not have enough space to put a year on it or any other char, then with this approach we - are avoiding the default behavior there.""" - res = super()._create_sequence(vals, refund=refund) - # NOTE: the self element is coming filled just when write and not on create (which is Ok) - journal_type = self.type if not vals.get('type') else vals.get('type') - if self.env.company.country_id == self.env.ref('base.pe') or journal_type in ['sale', 'purchase']: - res.write({'use_date_range': False}) - return res diff --git a/addons/membership/tests/test_membership.py b/addons/membership/tests/test_membership.py index d315983138c..ae6c05aa094 100644 --- a/addons/membership/tests/test_membership.py +++ b/addons/membership/tests/test_membership.py @@ -53,14 +53,14 @@ class TestMembership(TestMembershipCommon): # the invoice is paid -> customer goes to paid status bank_journal = self.env['account.journal'].create({'name': 'Bank', 'type': 'bank', 'code': 'BNK67'}) - self.env['account.payment'].create({ - 'payment_method_id': self.env.ref("account.account_payment_method_manual_in").id, - 'payment_type': 'inbound', - 'invoice_ids': [(6, False, invoice.ids)], - 'amount': 86.25, - 'journal_id': bank_journal.id, - 'partner_type': 'customer', - }).post() + + payment = self.env['account.payment.register']\ + .with_context(active_model='account.move', active_ids=invoice.ids)\ + .create({ + 'amount': 86.25, + 'journal_id': bank_journal.id, + })\ + ._create_payments() self.assertEqual( self.partner_1.membership_state, 'paid', diff --git a/addons/payment/models/account_payment.py b/addons/payment/models/account_payment.py index 5c398c8f634..e324b033ce8 100644 --- a/addons/payment/models/account_payment.py +++ b/addons/payment/models/account_payment.py @@ -88,7 +88,7 @@ class AccountPayment(models.Model): self.mapped('payment_transaction_id').filtered(lambda x: x.state == 'done' and not x.is_processed)._post_process_after_done() return res - def post(self): + def action_post(self): # Post the payments "normally" if no transactions are needed. # If not, let the acquirer updates the state. # __________ ______________ @@ -109,7 +109,7 @@ class AccountPayment(models.Model): payments_need_trans = self.filtered(lambda pay: pay.payment_token_id and not pay.payment_transaction_id) transactions = payments_need_trans._create_payment_transaction() - res = super(AccountPayment, self - payments_need_trans).post() + res = super(AccountPayment, self - payments_need_trans).action_post() transactions.s2s_do_transaction() diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index f09951061f4..704b53c7c65 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -639,22 +639,42 @@ class PaymentTransaction(models.Model): for trans in self: trans.invoice_ids_nbr = len(trans.invoice_ids) - def _prepare_account_payment_vals(self): + def _create_payment(self, add_payment_vals={}): + ''' Create an account.payment record for the current payment.transaction. + If the transaction is linked to some invoices, the reconciliation will be done automatically. + :param add_payment_vals: Optional additional values to be passed to the account.payment.create method. + :return: An account.payment record. + ''' self.ensure_one() - return { + + payment_vals = { 'amount': self.amount, 'payment_type': 'inbound' if self.amount > 0 else 'outbound', 'currency_id': self.currency_id.id, 'partner_id': self.partner_id.id, 'partner_type': 'customer', - 'invoice_ids': [(6, 0, self.invoice_ids.ids)], 'journal_id': self.acquirer_id.journal_id.id, 'company_id': self.acquirer_id.company_id.id, 'payment_method_id': self.env.ref('payment.account_payment_method_electronic_in').id, 'payment_token_id': self.payment_token_id and self.payment_token_id.id or None, 'payment_transaction_id': self.id, - 'communication': self.reference, + 'ref': self.reference, + **add_payment_vals, } + payment = self.env['account.payment'].create(payment_vals) + payment.action_post() + + # Track the payment to make a one2one. + self.payment_id = payment + + if self.invoice_ids: + self.invoice_ids.filtered(lambda move: move.state == 'draft').post() + + (payment.line_ids + self.invoice_ids.line_ids)\ + .filtered(lambda line: line.account_id == payment.destination_account_id and not line.reconciled)\ + .reconcile() + + return payment def get_last_transaction(self): transactions = self.filtered(lambda t: t.state != 'draft') @@ -791,21 +811,11 @@ class PaymentTransaction(models.Model): invoices.post() # Create & Post the payments. - payments = defaultdict(lambda: self.env['account.payment']) for trans in self: if trans.payment_id: - payments[trans.acquirer_id.company_id.id] += trans.payment_id continue - payment_vals = trans._prepare_account_payment_vals() - payment = self.env['account.payment'].create(payment_vals) - payments[trans.acquirer_id.company_id.id] += payment - - # Track the payment to make a one2one. - trans.payment_id = payment - - for company in payments: - payments[company].with_company(company).with_context(company_id=company).post() + trans._create_payment() def _set_transaction_cancel(self): '''Move the transaction's payment to the cancel state(e.g. Paypal).''' diff --git a/addons/payment/wizards/payment_link_wizard.py b/addons/payment/wizards/payment_link_wizard.py index fb6e02b9cf5..7dd543d997b 100644 --- a/addons/payment/wizards/payment_link_wizard.py +++ b/addons/payment/wizards/payment_link_wizard.py @@ -24,7 +24,7 @@ class PaymentLinkWizard(models.TransientModel): if res_id and res_model == 'account.move': record = self.env[res_model].browse(res_id) res.update({ - 'description': record.invoice_payment_ref, + 'description': record.payment_reference, 'amount': record[amount_field], 'currency_id': record.currency_id.id, 'partner_id': record.partner_id.id, diff --git a/addons/point_of_sale/models/account_bank_statement.py b/addons/point_of_sale/models/account_bank_statement.py index 33533b8379d..0c19179cb62 100644 --- a/addons/point_of_sale/models/account_bank_statement.py +++ b/addons/point_of_sale/models/account_bank_statement.py @@ -11,11 +11,12 @@ class AccountBankStatement(models.Model): pos_session_id = fields.Many2one('pos.session', string="Session", copy=False) account_id = fields.Many2one('account.account', related='journal_id.default_debit_account_id', readonly=True) - def check_confirm_bank(self): - for bs in self: - if bs.pos_session_id.state in ('opened', 'closing_control') and bs.state == 'open': + def button_validate_or_action(self): + # OVERRIDE to check the consistency of the statement's state regarding the session's state. + for statement in self: + if statement.pos_session_id.state in ('opened', 'closing_control') and statement.state == 'open': raise UserError(_("You can't validate a bank statement that is used in an opened Session of a Point of Sale.")) - return super(AccountBankStatement, self).check_confirm_bank() + return super(AccountBankStatement, self).button_validate_or_action() def unlink(self): for bs in self: diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index 9c45e5aa64a..e59b5e0fd25 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -384,7 +384,7 @@ class PosOrder(models.Model): raise UserError(_('Please provide a partner for the sale.')) move_vals = { - 'invoice_payment_ref': order.name, + 'payment_reference': order.name, 'invoice_origin': order.name, 'journal_id': order.session_id.config_id.invoice_journal_id.id, 'move_type': 'out_invoice' if order.amount_total >= 0 else 'out_refund', diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py index 537e54c3cb0..c96a445164e 100644 --- a/addons/point_of_sale/models/pos_session.py +++ b/addons/point_of_sale/models/pos_session.py @@ -207,7 +207,6 @@ class PosSession(models.Model): 'journal_id': cash_journal.id, 'user_id': self.env.user.id, 'name': pos_name, - 'balance_start': self.env["account.bank.statement"]._get_opening_balance(cash_journal.id) if cash_journal.type == 'cash' else 0 } statement_ids |= statement_ids.with_context(ctx).create(st_values) @@ -251,7 +250,6 @@ class PosSession(models.Model): values['start_at'] = fields.Datetime.now() values['state'] = 'opened' session.write(values) - session.statement_ids.button_open() return True def action_pos_session_closing_control(self): @@ -300,14 +298,13 @@ class PosSession(models.Model): self._create_picking_at_end_of_session() self.with_company(self.company_id)._create_account_move() if self.move_id.line_ids: - self.move_id.post() # Set the uninvoiced orders' state to 'done' self.env['pos.order'].search([('session_id', '=', self.id), ('state', '=', 'paid')]).write({'state': 'done'}) else: # The cash register needs to be confirmed for cash diffs # made thru cash in/out when sesion is in cash_control. if self.config_id.cash_control: - self.cash_register_id.button_confirm_bank() + self.cash_register_id.button_validate() self.move_id.unlink() self.write({'state': 'closed'}) return { @@ -340,7 +337,6 @@ class PosSession(models.Model): pickings = self.env['stock.picking']._create_picking_from_pos_order_lines(location_dest_id, lines, picking_type) pickings.write({'pos_session_id': self.id, 'origin': self.name}) - def _create_account_move(self): """ Create account.move and account.move.line records for this session. @@ -365,6 +361,10 @@ class PosSession(models.Model): data = self._create_cash_statement_lines_and_cash_move_lines(data) data = self._create_invoice_receivable_lines(data) data = self._create_stock_output_lines(data) + + if account_move.line_ids: + account_move.post() + data = self._reconcile_account_move_lines(data) def _accumulate_amounts(self, data): @@ -633,10 +633,11 @@ class PosSession(models.Model): for statement in self.statement_ids: if not self.config_id.cash_control: statement.write({'balance_end_real': statement.balance_end}) - statement.button_confirm_bank() + statement.button_post() + statement.button_validate() all_lines = ( - split_cash_statement_lines[statement].mapped('journal_entry_ids').filtered(lambda aml: aml.account_id.internal_type == 'receivable') - | combine_cash_statement_lines[statement].mapped('journal_entry_ids').filtered(lambda aml: aml.account_id.internal_type == 'receivable') + split_cash_statement_lines[statement].mapped('move_id.line_ids').filtered(lambda aml: aml.account_id.internal_type == 'receivable') + | combine_cash_statement_lines[statement].mapped('move_id.line_ids').filtered(lambda aml: aml.account_id.internal_type == 'receivable') | split_cash_receivable_lines[statement] | combine_cash_receivable_lines[statement] ) @@ -772,11 +773,11 @@ class PosSession(models.Model): def _get_statement_line_vals(self, statement, receivable_account, amount): return { - 'date': fields.Date.context_today(self), 'amount': amount, - 'name': self.name, + 'payment_ref': self.name, 'statement_id': statement.id, - 'account_id': receivable_account.id, + 'journal_id': statement.journal_id.id, + 'counterpart_account_id': receivable_account.id, } def _update_amounts(self, old_amounts, amounts_to_add, date, round=True, force_company_currency=False): diff --git a/addons/point_of_sale/tests/common.py b/addons/point_of_sale/tests/common.py index 8d0601b0c96..19a82d3b53d 100644 --- a/addons/point_of_sale/tests/common.py +++ b/addons/point_of_sale/tests/common.py @@ -31,9 +31,9 @@ class TestPointOfSaleCommon(StockAccountTestCommon): 'company_id': cls.company_id}) cls.company.write({ 'anglo_saxon_accounting': coa.use_anglo_saxon, - 'bank_account_code_prefix': coa.bank_account_code_prefix, - 'cash_account_code_prefix': coa.cash_account_code_prefix, - 'transfer_account_code_prefix': coa.transfer_account_code_prefix, + 'bank_account_code_prefix': 'test' + coa.bank_account_code_prefix, + 'cash_account_code_prefix': 'test' + coa.cash_account_code_prefix, + 'transfer_account_code_prefix': 'test' + coa.transfer_account_code_prefix, 'chart_template_id': coa.id,}) cls.product3 = cls.env['product.product'].create({ 'name': 'Product 3', diff --git a/addons/point_of_sale/tests/test_point_of_sale_flow.py b/addons/point_of_sale/tests/test_point_of_sale_flow.py index aa0ba016b4e..6611505aca3 100644 --- a/addons/point_of_sale/tests/test_point_of_sale_flow.py +++ b/addons/point_of_sale/tests/test_point_of_sale_flow.py @@ -472,6 +472,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): # I test that the total of the attached invoice is correct invoice = self.env['account.move'].browse(res['res_id']) + invoice.post() self.assertAlmostEqual( invoice.amount_total, self.pos_order_pos1.amount_total, places=2, msg="Invoice not correct") @@ -505,7 +506,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): 'amount': 1000, 'partner_id': self.partner4.id, 'statement_id': account_statement.id, - 'name': 'EXT001' + 'payment_ref': 'EXT001' }) # I modify the bank statement and set the Closing Balance. account_statement.write({ @@ -522,7 +523,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): # I confirm the bank statement using Confirm button - self.AccountBankStatement.button_confirm_bank() + self.AccountBankStatement.button_validate() def test_create_from_ui(self): """ @@ -869,6 +870,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon): # I test that the total of the attached invoice is correct invoice = self.env['account.move'].browse(res['res_id']) + invoice.post() self.assertAlmostEqual( invoice.amount_total, self.pos_order_pos1.amount_total, places=2, msg="Invoice not correct") diff --git a/addons/point_of_sale/views/account_statement_view.xml b/addons/point_of_sale/views/account_statement_view.xml index fb31b360d25..781921d5008 100644 --- a/addons/point_of_sale/views/account_statement_view.xml +++ b/addons/point_of_sale/views/account_statement_view.xml @@ -7,7 +7,7 @@ Reconcile '), ".breadcrumb-item.active:contains('the_flow.statement')").map(tour.stepUtils.editionEnterpriseModifier), +...tour.stepUtils.statusbarButtonsSteps('Post', _t('Processing'), ".breadcrumb-item.active:contains('the_flow.statement')").map(tour.stepUtils.editionEnterpriseModifier), +...tour.stepUtils.statusbarButtonsSteps('Reconcile', _t('Reconcile'), ".o_statusbar_status .btn.dropdown-toggle:contains(Processing)").map(tour.stepUtils.editionEnterpriseModifier), { edition: "enterprise", trigger: "button.o_reconcile, button.o_validate", diff --git a/odoo/addons/test_main_flows/tests/test_flow.py b/odoo/addons/test_main_flows/tests/test_flow.py index d450c335253..4aaca90ed4d 100644 --- a/odoo/addons/test_main_flows/tests/test_flow.py +++ b/odoo/addons/test_main_flows/tests/test_flow.py @@ -47,8 +47,6 @@ class BaseTestUi(odoo.tests.HttpCase): 'name': 'Vendor Bills - Test', 'code': 'TEXJ', 'type': 'purchase', - 'default_credit_account_id': a_expense.id, - 'default_debit_account_id': a_expense.id, 'refund_sequence': True, }) self.bank_journal = self.env['account.journal'].create({ |