OCA · 9184Lucky · Mar 11, 2015 · Mar 11, 2015 · Apr 4, 2015 · Apr 4, 2015
diff --git a/account_invoice_merge_payment/README.rst b/account_invoice_merge_payment/README.rst
@@ -0,0 +1,85 @@
+=============================
+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
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/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-16-0/account-invoicing-16-0-account_invoice_merge_payment
+    :alt: Translate me on Weblate
+.. |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|
+
+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**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+* The module is automatically installed when account_invoice_merge and account_payment_partner are installed
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/account-invoicing/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/account-invoicing/issues/new?body=module:%20account_invoice_merge_payment%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* ACSONE SA/NV
+
+Contributors
+~~~~~~~~~~~~
+
+* Stéphane Bidoul <stephane.bidoul@acsone.eu>
+* Adrien Peiffer <adrien.peiffer@acsone.eu>
+* Benjamin Willig <benjamin.willig@acsone.eu>
+* Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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 <https://github.com/OCA/account-invoicing/tree/16.0/account_invoice_merge_payment>`_ 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/__init__.py b/account_invoice_merge_payment/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_invoice_merge_payment/__manifest__.py b/account_invoice_merge_payment/__manifest__.py
@@ -0,0 +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": """
+        Use invoice merge regarding fields on Account Payment Partner""",
+    "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/account-invoicing",
+    "category": "Invoicing & Payments",
+    "version": "16.0.1.0.0",
+    "license": "AGPL-3",
+    "depends": [
+        "account_invoice_merge",
+        "account_payment_partner",
+    ],
+    "auto_install": True,
+    "installable": True,
+}
diff --git a/account_invoice_merge_payment/i18n/account_invoice_merge_payment.pot b/account_invoice_merge_payment/i18n/account_invoice_merge_payment.pot
@@ -0,0 +1,20 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_merge_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_merge_payment
+#: model:ir.model,name:account_invoice_merge_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
diff --git a/account_invoice_merge_payment/i18n/fr.po b/account_invoice_merge_payment/i18n/fr.po
@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_invoice_merge_payment
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: account-invoicing (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-25 16:48+0000\n"
+"PO-Revision-Date: 2015-07-15 10:35+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-account-"
+"invoicing-8-0/language/fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_invoice_merge_payment
+#: model:ir.model,name:account_invoice_merge_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Facture"
diff --git a/account_invoice_merge_payment/i18n/sl.po b/account_invoice_merge_payment/i18n/sl.po
@@ -0,0 +1,26 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_invoice_merge_payment
+#
+# Translators:
+# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: account-invoicing (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-25 16:48+0000\n"
+"PO-Revision-Date: 2015-08-16 11:39+0000\n"
+"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-account-"
+"invoicing-8-0/language/sl/)\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
+
+#. module: account_invoice_merge_payment
+#: model:ir.model,name:account_invoice_merge_payment.model_account_invoice
+msgid "Invoice"
+msgstr "Račun"
diff --git a/account_invoice_merge_payment/models/__init__.py b/account_invoice_merge_payment/models/__init__.py
@@ -0,0 +1 @@
+from . import account_move
diff --git a/account_invoice_merge_payment/models/account_move.py b/account_invoice_merge_payment/models/account_move.py
@@ -0,0 +1,19 @@
+# Copyright 2015-2017 ACSONE SA/NV
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class AccountMove(models.Model):
+
+    _inherit = "account.move"
+
+    @api.model
+    def _get_invoice_key_cols(self):
+        return super()._get_invoice_key_cols() + ["payment_mode_id"]
+
+    @api.model
+    def _get_first_invoice_fields(self, invoice):
+        res = super()._get_first_invoice_fields(invoice)
+        res.update({"payment_mode_id": invoice.payment_mode_id.id})
+        return res
diff --git a/account_invoice_merge_payment/readme/CONFIGURE.rst b/account_invoice_merge_payment/readme/CONFIGURE.rst
@@ -0,0 +1 @@
+* The module is automatically installed when account_invoice_merge and account_payment_partner are installed
diff --git a/account_invoice_merge_payment/readme/CONTRIBUTORS.rst b/account_invoice_merge_payment/readme/CONTRIBUTORS.rst
@@ -0,0 +1,4 @@
+* Stéphane Bidoul <stephane.bidoul@acsone.eu>
+* Adrien Peiffer <adrien.peiffer@acsone.eu>
+* Benjamin Willig <benjamin.willig@acsone.eu>
+* Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
diff --git a/account_invoice_merge_payment/readme/DESCRIPTION.rst b/account_invoice_merge_payment/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+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
diff --git a/account_invoice_merge_payment/static/description/icon.png b/account_invoice_merge_payment/static/description/icon.png