diff --git a/account_invoice_merge_payment/README.rst b/account_invoice_merge_payment/README.rst index 7f1969b9e78..07e36a1e81a 100644 --- a/account_invoice_merge_payment/README.rst +++ b/account_invoice_merge_payment/README.rst @@ -2,10 +2,13 @@ Account Invoice Merge Payment ============================= -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:bccdba1ab02b35126baccd2eedff245da2dbbd1f70400f7800aa6d629d12d970 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,18 +17,18 @@ Account Invoice Merge Payment :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--invoicing-lightgray.png?logo=github - :target: https://github.com/OCA/account-invoicing/tree/12.0/account_invoice_merge_payment + :target: https://github.com/OCA/account-invoicing/tree/16.0/account_invoice_merge_payment :alt: OCA/account-invoicing .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/account-invoicing-12-0/account-invoicing-12-0-account_invoice_merge_payment + :target: https://translation.odoo-community.org/projects/account-invoicing-16-0/account-invoicing-16-0-account_invoice_merge_payment :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/95/12.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/account-invoicing&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| -This module was written to extend the functionality of Account Invoice Merge +his module was written to extend the functionality of Account Invoice Merge module to support fields added in Account Payment Partner from OCA/bank-payment **Table of contents** @@ -43,8 +46,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,6 +80,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/account-invoicing `_ project on GitHub. +This module is part of the `OCA/account-invoicing `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_invoice_merge_payment/__manifest__.py b/account_invoice_merge_payment/__manifest__.py index 579e149c777..a6cf0204b22 100644 --- a/account_invoice_merge_payment/__manifest__.py +++ b/account_invoice_merge_payment/__manifest__.py @@ -1,18 +1,18 @@ # Copyright 2015-2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { - 'name': "Account Invoice Merge Payment", - 'summary': """ + "name": "Account Invoice Merge Payment", + "summary": """ Use invoice merge regarding fields on Account Payment Partner""", - 'author': "ACSONE SA/NV,Odoo Community Association (OCA)", - 'website': "http://www.acsone.eu", - 'category': 'Invoicing & Payments', - 'version': '12.0.1.0.0', - 'license': 'AGPL-3', - 'depends': [ - 'account_invoice_merge', - 'account_payment_partner', + "author": "ACSONE SA/NV,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-invoicing", + "category": "Invoicing & Payments", + "version": "12.0.1.0.0", + "license": "AGPL-3", + "depends": [ + "account_invoice_merge", + "account_payment_partner", ], - 'auto_install': True, - 'installable': True, + "auto_install": True, + "installable": True, } diff --git a/account_invoice_merge_payment/models/account_invoice.py b/account_invoice_merge_payment/models/account_invoice.py index b41afda7c25..020cdcc9b99 100644 --- a/account_invoice_merge_payment/models/account_invoice.py +++ b/account_invoice_merge_payment/models/account_invoice.py @@ -1,21 +1,21 @@ # Copyright 2015-2017 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, api +from odoo import api, models class AccountInvoice(models.Model): - _inherit = 'account.invoice' + _inherit = "account.invoice" @api.model def _get_invoice_key_cols(self): return super(AccountInvoice, self)._get_invoice_key_cols() + [ - 'payment_mode_id', + "payment_mode_id", ] @api.model def _get_first_invoice_fields(self, invoice): res = super(AccountInvoice, self)._get_first_invoice_fields(invoice) - res.update({'payment_mode_id': invoice.payment_mode_id.id}) + res.update({"payment_mode_id": invoice.payment_mode_id.id}) return res diff --git a/account_invoice_merge_payment/static/description/index.html b/account_invoice_merge_payment/static/description/index.html index 602bcb0c01d..64c2e14d277 100644 --- a/account_invoice_merge_payment/static/description/index.html +++ b/account_invoice_merge_payment/static/description/index.html @@ -1,20 +1,20 @@ - - + Account Invoice Merge Payment