From 1c74bc049a3c160c38f3860bbbf393b6309aeb4e Mon Sep 17 00:00:00 2001 From: Hardik Suthar Date: Sat, 6 Feb 2021 02:36:39 +0530 Subject: [PATCH 01/21] [MIG] account_payment_batch_process: Migration to 14.0 --- account_payment_batch_process/README.rst | 26 + account_payment_batch_process/__init__.py | 5 + account_payment_batch_process/__manifest__.py | 31 ++ .../models/__init__.py | 4 + .../models/payment_adjustment_reason.py | 20 + .../readme/CONTRIBUTORS.rst | 5 + .../readme/CREDITS.rst | 1 + .../readme/DESCRIPTION.rst | 5 + .../readme/HISTORY.rst | 12 + .../security/ir.model.access.csv | 5 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../views/account_move.xml | 16 + .../views/account_payment.xml | 29 ++ .../wizard/__init__.py | 6 + .../wizard/account_payment_register.py | 461 ++++++++++++++++++ .../wizard/account_payment_register.xml | 133 +++++ .../wizard/invoice_payment_line.py | 103 ++++ 17 files changed, 862 insertions(+) create mode 100644 account_payment_batch_process/README.rst create mode 100644 account_payment_batch_process/__init__.py create mode 100644 account_payment_batch_process/__manifest__.py create mode 100644 account_payment_batch_process/models/__init__.py create mode 100644 account_payment_batch_process/models/payment_adjustment_reason.py create mode 100644 account_payment_batch_process/readme/CONTRIBUTORS.rst create mode 100644 account_payment_batch_process/readme/CREDITS.rst create mode 100644 account_payment_batch_process/readme/DESCRIPTION.rst create mode 100644 account_payment_batch_process/readme/HISTORY.rst create mode 100644 account_payment_batch_process/security/ir.model.access.csv create mode 100644 account_payment_batch_process/static/description/icon.png create mode 100644 account_payment_batch_process/views/account_move.xml create mode 100644 account_payment_batch_process/views/account_payment.xml create mode 100644 account_payment_batch_process/wizard/__init__.py create mode 100644 account_payment_batch_process/wizard/account_payment_register.py create mode 100644 account_payment_batch_process/wizard/account_payment_register.xml create mode 100644 account_payment_batch_process/wizard/invoice_payment_line.py diff --git a/account_payment_batch_process/README.rst b/account_payment_batch_process/README.rst new file mode 100644 index 00000000000..972aab7f7e4 --- /dev/null +++ b/account_payment_batch_process/README.rst @@ -0,0 +1,26 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================= +OSI Batch Payments Processing +============================= + +OSI Batch Payments Processing for Customers Invoices and Supplier Invoices/Vendor Bills. + +Payments to multiple vendors can be processed. +Payments from multiple customers can be processed. + +Partial payments can be processed leaving invoice/bill open or writing off unpaid portion to a write-off account. + +Credits +======= +* Open Source Integrators + +Contributors +============ +* Balaji Kannan +* Bhavesh Odedra +* Mayank Gosai +* Sandip Mangukiya +* Hardik Suthar diff --git a/account_payment_batch_process/__init__.py b/account_payment_batch_process/__init__.py new file mode 100644 index 00000000000..9c366a16c2e --- /dev/null +++ b/account_payment_batch_process/__init__.py @@ -0,0 +1,5 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models +from . import wizard diff --git a/account_payment_batch_process/__manifest__.py b/account_payment_batch_process/__manifest__.py new file mode 100644 index 00000000000..42d5aaa26c8 --- /dev/null +++ b/account_payment_batch_process/__manifest__.py @@ -0,0 +1,31 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Payment Batch Processing", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "summary": """ + Account Batch Payments Processing for Customers Invoices and + Supplier Invoices + """, + "category": "Extra", + "maintainer": "Open Source Integrators", + "website": "https://github.com/OCA/account-payment", + "depends": [ + "account", + "account_check_printing", + "account_payment_order", + ], + "data": [ + "security/ir.model.access.csv", + "wizard/account_payment_register.xml", + "views/account_move.xml", + "views/account_payment.xml", + ], + "external_dependencies": { + "python": ["num2words"], + }, + "installable": True, +} diff --git a/account_payment_batch_process/models/__init__.py b/account_payment_batch_process/models/__init__.py new file mode 100644 index 00000000000..4a707408c89 --- /dev/null +++ b/account_payment_batch_process/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import payment_adjustment_reason diff --git a/account_payment_batch_process/models/payment_adjustment_reason.py b/account_payment_batch_process/models/payment_adjustment_reason.py new file mode 100644 index 00000000000..d4c77876145 --- /dev/null +++ b/account_payment_batch_process/models/payment_adjustment_reason.py @@ -0,0 +1,20 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class PaymentAdjustmentReason(models.Model): + _name = "payment.adjustment.reason" + _rec_name = "code" + _description = "Payment Adjustment Reason" + + code = fields.Char(string="Code", required=True, copy=False) + account_id = fields.Many2one("account.account", string="Account") + reason = fields.Text(string="Reason", copy=False) + + def name_get(self): + result = [] + for pay in self: + result.append((pay.id, "%s" % (pay.code or ""))) + return result diff --git a/account_payment_batch_process/readme/CONTRIBUTORS.rst b/account_payment_batch_process/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..a8e8821e4a7 --- /dev/null +++ b/account_payment_batch_process/readme/CONTRIBUTORS.rst @@ -0,0 +1,5 @@ +* Balaji Kannan +* Bhavesh Odedra +* Mayank Gosai +* Sandip Mangukiya +* Hardik Suthar diff --git a/account_payment_batch_process/readme/CREDITS.rst b/account_payment_batch_process/readme/CREDITS.rst new file mode 100644 index 00000000000..5849121741e --- /dev/null +++ b/account_payment_batch_process/readme/CREDITS.rst @@ -0,0 +1 @@ +* Open Source Integrators diff --git a/account_payment_batch_process/readme/DESCRIPTION.rst b/account_payment_batch_process/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..0efc1232c78 --- /dev/null +++ b/account_payment_batch_process/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +Batch Payments Processing for Customers Invoices and Supplier Invoices/Vendor Bills. + +Payments to multiple vendors can be processed. Payments from multiple customers can be processed. + +Partial payments can be processed leaving invoice/bill open or writing off unpaid portion to a write-off account. diff --git a/account_payment_batch_process/readme/HISTORY.rst b/account_payment_batch_process/readme/HISTORY.rst new file mode 100644 index 00000000000..d9b70b93e97 --- /dev/null +++ b/account_payment_batch_process/readme/HISTORY.rst @@ -0,0 +1,12 @@ +12.0.1.1.0 +~~~~~~~~~~ + +**Features** + +- Remove menu "Batch Payments" from Vendors and Customers +- Remove menu "Register Payment" from batch invoices. + +12.0.1.0.0 +~~~~~~~~~~ + +- Initial File diff --git a/account_payment_batch_process/security/ir.model.access.csv b/account_payment_batch_process/security/ir.model.access.csv new file mode 100644 index 00000000000..c7747e7738c --- /dev/null +++ b/account_payment_batch_process/security/ir.model.access.csv @@ -0,0 +1,5 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_invoice_payment_line,invoice.payment.line,model_invoice_payment_line,base.group_user,1,1,1,0 +access_payment_adjustment_reason_manager,payment.adjustment.reason,model_payment_adjustment_reason,account.group_account_manager,1,1,1,1 +access_payment_adjustment_reason_user,payment.adjustment.reason,model_payment_adjustment_reason,account.group_account_user,1,0,0,0 +access_payment_adjustment_reason_invoice,payment.adjustment.reason,model_payment_adjustment_reason,account.group_account_invoice,1,0,0,0 diff --git a/account_payment_batch_process/static/description/icon.png b/account_payment_batch_process/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/account_payment_batch_process/views/account_move.xml b/account_payment_batch_process/views/account_move.xml new file mode 100644 index 00000000000..8e43c2385b3 --- /dev/null +++ b/account_payment_batch_process/views/account_move.xml @@ -0,0 +1,16 @@ + + + + + account.move.batch.supplier.tree + account.move + + + + + + + + + + diff --git a/account_payment_batch_process/views/account_payment.xml b/account_payment_batch_process/views/account_payment.xml new file mode 100644 index 00000000000..e9b53c584cc --- /dev/null +++ b/account_payment_batch_process/views/account_payment.xml @@ -0,0 +1,29 @@ + + + + + + account.payment.tree.nocreate + account.payment + + + + + + + + + + + + + + + + + diff --git a/account_payment_batch_process/wizard/__init__.py b/account_payment_batch_process/wizard/__init__.py new file mode 100644 index 00000000000..f93d6da04de --- /dev/null +++ b/account_payment_batch_process/wizard/__init__.py @@ -0,0 +1,6 @@ +# Copyright (C) 2019, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import ( + account_payment_register, + invoice_payment_line, +) diff --git a/account_payment_batch_process/wizard/account_payment_register.py b/account_payment_batch_process/wizard/account_payment_register.py new file mode 100644 index 00000000000..af5c1983c1f --- /dev/null +++ b/account_payment_batch_process/wizard/account_payment_register.py @@ -0,0 +1,461 @@ +# Copyright (C) 2021, Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +import logging +import math + +from odoo import _, api, fields, models +from odoo.exceptions import UserError, ValidationError +from odoo.tools import float_round +from odoo.tools.float_utils import float_compare + +try: + from num2words import num2words +except ImportError: + logging.getLogger(__name__).warning( + "The num2words python library is not installed." + ) + num2words = None + + +MAP_INVOICE_TYPE_PARTNER_TYPE = { + "out_invoice": "customer", + "out_refund": "customer", + "in_invoice": "supplier", + "in_refund": "supplier", +} + +# Since invoice amounts are unsigned, +# this is how we know if money comes in or goes out +MAP_INVOICE_TYPE_PAYMENT_SIGN = { + "out_invoice": 1, + "in_refund": 1, + "in_invoice": -1, + "out_refund": -1, +} + + +class AccountPaymentRegister(models.TransientModel): + _inherit = "account.payment.register" + + @api.depends("invoice_payments.amount") + def _compute_total(self): + self.total_amount = sum(line.amount for line in self.invoice_payments) + + @api.depends("invoice_payments.balance") + def _compute_cheque_amount(self): + self.cheque_amount = sum(line.balance for line in self.invoice_payments) + + is_auto_fill = fields.Char(string="Auto-Fill Pay Amount") + invoice_payments = fields.One2many( + "invoice.payment.line", "wizard_id", string="Payments" + ) + is_customer = fields.Boolean(string="Is Customer?") + cheque_amount = fields.Float( + "Batch Payment Total", + required=True, + compute="_compute_cheque_amount", + store=True, + readonly=False, + ) + total_amount = fields.Float("Total Invoices:", compute="_compute_total") + + def get_invoice_payment_line(self, invoice): + account = \ + invoice.invoice_payment_term_id and ( + (MAP_INVOICE_TYPE_PARTNER_TYPE[invoice.move_type] == "customer") and + invoice.invoice_payment_term_id.line_ids[0].discount_income_account_id or + invoice.invoice_payment_term_id.line_ids[0].discount_expense_account_id) + return (0, 0, { + "partner_id": invoice.partner_id.id, + "invoice_id": invoice.id, + "balance": invoice.amount_residual or 0.0, + "amount": invoice.amount_residual or 0.0, + "payment_difference": 0.0, + "payment_difference_handling": "reconcile", + "writeoff_account_id": account.id, + "note": "Payment of invoice %s" % invoice.name, + }) + + def get_invoice_payments(self, invoices): + res = [] + for invoice in invoices: + res.append(self.get_invoice_payment_line(invoice)) + return res + + @api.model + def default_get(self, fields_list): + if self.env.context and not self.env.context.get("batch", False): + return super().default_get(fields_list) + res = super().default_get(fields_list) + context = dict(self._context or {}) + active_model = context.get("active_model") + active_ids = context.get("active_ids") + # Checks on context parameters + if not active_model or not active_ids: + raise UserError( + _( + "The wizard is executed without active_model or active_ids in the context." + ) + ) + if active_model != "account.move": + raise UserError( + _("The expected model for this action is 'account.move', not '%s'.") + % active_model + ) + # Checks on received invoice records + invoices = self.env[active_model].browse(active_ids) + if any( + invoice.state != "posted" + or invoice.payment_state not in ["not_paid", "partial"] + for invoice in invoices + ): + raise UserError(_("You can only register payments for open invoices.")) + + if any(inv.payment_mode_id != invoices[0].payment_mode_id for inv in invoices): + raise UserError( + _( + "You can only register a batch payment for invoices with the same payment mode." + ) + ) + if any( + MAP_INVOICE_TYPE_PARTNER_TYPE[inv.move_type] + != MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].move_type] + for inv in invoices + ): + raise UserError( + _( + "You cannot mix customer invoices and vendor bills in a single payment." + ) + ) + if any(inv.currency_id != invoices[0].currency_id for inv in invoices): + raise UserError( + _( + "In order to pay multiple bills at once, they must use the same currency." + ) + ) + + if "batch" in context and context.get("batch"): + is_customer = (MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].move_type] == "customer") + payment_lines = self.get_invoice_payments(invoices) + res.update({"invoice_payments": payment_lines, "is_customer": is_customer}) + else: + # Checks on received invoice records + if any( + MAP_INVOICE_TYPE_PARTNER_TYPE[inv.move_type] + != MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].move_type] + for inv in invoices + ): + raise UserError( + _( + "You cannot mix customer invoices and vendor bills in a single payment." + ) + ) + + total_amount = sum( + inv.amount_residual * MAP_INVOICE_TYPE_PAYMENT_SIGN[inv.move_type] + for inv in invoices + ) + return res.update( + { + "amount": abs(total_amount), + "journal_id": invoices[0].payment_method_id.id, + "currency_id": invoices[0].currency_id.id, + "payment_type": is_customer and "inbound" or "outbound", + "partner_id": invoices[0].commercial_partner_id.id, + "partner_type": MAP_INVOICE_TYPE_PARTNER_TYPE[invoices[0].move_type], + "company_id": self.env.user.company_id, + "communication": "Batch payment of %s" % fields.Date.today(), + } + ) + + def get_payment_values(self, group_data=None): + res = {} + if group_data: + writeoff_amount = 0 + writeoff_account_id = False + writeoff_name = False + for invoice_id in list(group_data["inv_val"]): + values = group_data["inv_val"][invoice_id] + if not self.currency_id.is_zero(values["payment_difference"]) \ + and values["payment_difference_handling"] == 'reconcile': + writeoff_name = writeoff_name or values["line_name"] + writeoff_account_id = writeoff_account_id or values["writeoff_account_id"] + writeoff_amount += values["payment_difference"] + res = { + "journal_id": self.journal_id.id, + "payment_method_id": "payment_method_id" in group_data + and group_data["payment_method_id"] + or self.payment_method_id.id, + "date": self.payment_date, + "ref": group_data["memo"], + "payment_type": self.payment_type, + "amount": group_data["total"], + "currency_id": self.currency_id.id, + "partner_id": int(group_data["partner_id"]), + "partner_type": group_data["partner_type"], + "check_amount_in_words": group_data["check_amount_in_words"], + "write_off_line_vals": { + "name": writeoff_name, + "account_id": writeoff_account_id, + "amount": writeoff_amount, + }, + } + return res + + def _check_amounts(self): + if float_compare(self.total_amount, self.cheque_amount, 2) != 0: + raise ValidationError( + _( + "The pay amount of the invoices and the batch payment total do not match." + ) + ) + + def get_memo(self, memo, group_data, partner_id, data_get): + if memo: + memo = ( + group_data[partner_id]["memo"] + + " : " + + memo + + "-" + + str(data_get.invoice_id.name) + ) + else: + memo = ( + group_data[partner_id]["memo"] + " : " + str(data_get.invoice_id.name) + ) + return memo + + def total_amount_in_words(self, data_get, old_total=0): + check_amount_in_words = num2words(math.floor(old_total + data_get.amount)).title() + decimals = (old_total + data_get.amount) % 1 + if decimals >= 10 ** -2: + check_amount_in_words += _(" and %s/100") % str( + int(round(float_round(decimals * 100, precision_rounding=1))) + ) + return check_amount_in_words + + def get_payment_invoice_value(self, name, data_get): + return { + "line_name": name, + "amount": data_get.amount, + "payment_difference_handling": data_get.payment_difference_handling, + "payment_difference": data_get.payment_difference, + "writeoff_account_id": data_get.writeoff_account_id + and data_get.writeoff_account_id.id + or False, + } + + def update_group_pay_data( + self, partner_id, group_data, data_get, check_amount_in_words + ): + # build memo value + if self.communication: + memo = self.communication + "-" + str(data_get.invoice_id.name) + else: + memo = str(data_get.invoice_id.name) + name = "" + if data_get.reason_code: + name = str(data_get.reason_code.code) + if data_get.note: + name = name + ": " + str(data_get.note) + if not name: + name = "Counterpart" + inv_val = { + "line_name": name, + "amount": data_get.amount, + "payment_difference_handling": data_get.payment_difference_handling, + "payment_difference": data_get.payment_difference, + "writeoff_account_id": data_get.writeoff_account_id + and data_get.writeoff_account_id.id + or False, + } + group_data.update( + { + partner_id: { + "partner_id": partner_id, + "partner_type": MAP_INVOICE_TYPE_PARTNER_TYPE[ + data_get.invoice_id.move_type + ], + "total": data_get.amount, + "check_amount_in_words": check_amount_in_words, + "memo": memo, + "temp_invoice": data_get.invoice_id.id, + "inv_val": {data_get.invoice_id.id: inv_val}, + } + } + ) + + def get_amount(self, memo, group_data, line): + line.payment_difference = line.balance - line.amount + if line.payment_difference_handling: + line.invoice_id.discount_taken = line.payment_difference + partner_id = line.invoice_id.partner_id.id + if partner_id in group_data: + old_total = group_data[partner_id]["total"] + # build memo value + if self.communication: + memo = ( + group_data[partner_id]["memo"] + + " : " + + self.communication + + "-" + + str(line.invoice_id.name) + ) + else: + memo = ( + group_data[partner_id]["memo"] + + " : " + + str(line.invoice_id.name) + ) + # Calculate amount in words + check_amount_in_words = self.total_amount_in_words(line, old_total) + group_data[partner_id].update( + { + "partner_id": partner_id, + "partner_type": MAP_INVOICE_TYPE_PARTNER_TYPE[ + line.invoice_id.move_type + ], + "total": old_total + line.amount, + "memo": memo, + "temp_invoice": line.invoice_id.id, + "check_amount_in_words": check_amount_in_words, + } + ) + # prepare name + name = "" + if line.reason_code: + name = str(line.reason_code.code) + if line.note: + name = name + ": " + str(line.note) + if not name: + name = "Counterpart" + # Update with payment diff data + inv_val = self.get_payment_invoice_value(name, line) + group_data[partner_id]["inv_val"].update( + {line.invoice_id.id: inv_val} + ) + else: + # calculate amount in words + check_amount_in_words = self.total_amount_in_words(line, 0) + # prepare name + self.update_group_pay_data( + partner_id, group_data, line, check_amount_in_words + ) + + def make_payments(self): + # Make group data either for Customers or Vendors + context = dict(self._context or {}) + group_data = {} + memo = self.communication or " " + partner_invoices = {} + context.update({"is_customer": self.is_customer}) + self._check_amounts() + for invoice_payment_line in self.invoice_payments: + if invoice_payment_line.amount > 0: + self.get_amount(memo, group_data, invoice_payment_line) + + # update context + context.update({"group_data": group_data}) + # making partner wise payment + payment_ids = [] + for partner in list(group_data): + # update active_ids with active invoice id + if context.get("active_ids", False) and group_data[partner].get( + "inv_val", False + ): + context.update({"active_ids": list(group_data[partner]["inv_val"])}) + payment = ( + self.env["account.payment"] + .with_context(context) + .create(self.get_payment_values(group_data=group_data[partner])) + ) + payment_ids.append(payment.id) + payment.action_post() + + # Reconciliation + domain = [ + ("account_internal_type", "in", ("receivable", "payable")), + ("reconciled", "=", False), + ] + payment_lines = payment.line_ids.filtered_domain(domain) + invoices = self.env["account.move"].browse(context.get("active_ids")) + lines = invoices.line_ids.filtered_domain(domain) + for account in payment_lines.account_id: + (payment_lines + lines).filtered_domain( + [("account_id", "=", account.id), ("reconciled", "=", False)] + ).reconcile() + + view_id = self.env["ir.model.data"].get_object_reference( + "account_payment_batch_process", + "view_account_payment_tree_nocreate", + )[1] + return { + "name": _("Payments"), + "view_type": "form", + "view_mode": "tree", + "res_model": "account.payment", + "view_id": view_id, + "type": "ir.actions.act_window", + "target": "new", + "domain": "[('id','in',%s)]" % (payment_ids), + "context": {"group_by": "partner_id"}, + } + + def get_batch_payment_amount(self, invoice=None, payment_date=None): + return { + "amount": False, + "payment_difference": False, + "payment_difference_handling": False, + "writeoff_account_id": False, + } + + def get_invoice_payments_remaining_amount(self, remaining_amount, count): + total = 0.0 + for payline in self.invoice_payments: + vals = self.get_batch_payment_amount(payline.invoice_id, self.payment_date) + if remaining_amount < 0.0: + break + amount = vals.get("amt", False) or payline.balance + payline.write( + { + "amount": vals.get("amount", False) or payline.balance, + "payment_difference": vals.get("payment_difference", False) or 0.0, + "writeoff_account_id": vals.get("writeoff_account_id", False), + "payment_difference_handling": vals.get( + "payment_difference_handling", False), + "note": vals.get("note", False), + } + ) + # Special Case: If full amount payment, then make diff handling as 'reconcile' + if payline.payment_difference_handling == "reconcile" and payline.payment_difference == 0.0: + # Change handling difference + payline.payment_difference_handling = "open" + total += amount + self.cheque_amount = total + + def auto_fill_payments(self): + ctx = self._context.copy() + batch_payment = self.cheque_amount + remaining_amt = batch_payment + count = 0 + for wizard in self: + if wizard.invoice_payments: + wizard.get_invoice_payments_remaining_amount(remaining_amt, count) + ctx.update( + { + "reference": wizard.communication or "", + "journal_id": wizard.journal_id.id, + } + ) + return { + "name": _("Batch Payments"), + "view_mode": "form", + "view_id": False, + "view_type": "form", + "res_id": self.id, + "res_model": "account.payment.register", + "type": "ir.actions.act_window", + "nodestroy": True, + "target": "new", + "context": ctx, + } diff --git a/account_payment_batch_process/wizard/account_payment_register.xml b/account_payment_batch_process/wizard/account_payment_register.xml new file mode 100644 index 00000000000..d42634d74d6 --- /dev/null +++ b/account_payment_batch_process/wizard/account_payment_register.xml @@ -0,0 +1,133 @@ + + + + + + account.payment.register.wizard.batch.inherited + + account.payment.register + + + + + + + + + +