[11.0][MIG] account_invoice_merge

account_invoice_merge/__init__.py

@@ -1,10 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
-# Copyright 2010-2011 Elico Corp.
-# Copyright 2016 Acsone (https://www.acsone.eu/)
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
-#   (http://www.eficent.com)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from . import models
 from . import wizard

account_invoice_merge/__manifest__.py

@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-
 # Copyright 2004-2010 Tiny SPRL (http://tiny.be).
 # Copyright 2010-2011 Elico Corp.
 # Copyright 2016 Acsone (https://www.acsone.eu/)
 # Copyright 2017 Eficent Business and IT Consulting Services S.L.
 #   (http://www.eficent.com)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 {
     'name': 'Account Invoice Merge',
     'version': '11.0.1.0.0',
     'category': 'Finance',
     'summary': "Merge invoices in draft",
     'author': "Elico Corp,Odoo Community Association (OCA)",
-    'website': 'http://www.openerp.net.cn',
+    'website': "https://github.com/OCA/<repo>" or "https://github.com/OCA/<repo>/tree/<branch>/<addon>",
     'license': 'AGPL-3',
     'depends': ['account'],
     'data': [

account_invoice_merge/i18n/es.po

@@ -1,30 +1,29 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# * account_invoice_merge
-# 
-# Translators:
-# OCA Transbot <[email protected]>, 2017
+# 	* account_invoice_merge
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 10.0\n"
+"Project-Id-Version: Odoo Server 11.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-23 13:51+0000\n"
-"PO-Revision-Date: 2017-11-23 13:51+0000\n"
-"Last-Translator: OCA Transbot <[email protected]>, 2017\n"
-"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"POT-Creation-Date: 2018-09-03 13:57+0000\n"
+"PO-Revision-Date: 2018-09-03 16:03+0100\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Language: es\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+"X-Generator: Poedit 1.7.4\n"
 
 #. module: account_invoice_merge
 #: model:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge
 msgid "Are you sure you want to merge these invoices?"
-msgstr ""
+msgstr "¿Está seguro que desea combinar estas facturas?"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:34
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:33
 #, python-format
 msgid "At least one of the selected invoices is %s!"
 msgstr "¡Al menos una de las facturas seleccionadas está %s!"
@@ -97,37 +96,37 @@ msgid "Merge Partner Invoice"
 msgstr "Fusionar factura de empresa"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:41
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:40
 #, python-format
-msgid "Not all invoices are at the same company!"
-msgstr "¡No todas las facturas son de la misma compañía!"
+msgid "Not all invoices belong to the same company!"
+msgstr "¡No todas las facturas pertenecen a la misma compañía!"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:50
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:49
 #, python-format
-msgid "Not all invoices are at the same currency!"
-msgstr "¡No todas las facturas son de la misma moneda!"
+msgid "The currency in the invoices is different!"
+msgstr "¡La moneda en las facturas es diferente!"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:53
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:52
 #, python-format
-msgid "Not all invoices are at the same journal!"
-msgstr "¡No todas las facturas tienen el mismo diario!"
+msgid "All invoices must belong to the same journal!"
+msgstr "¡Todas las facturas deben pertenecer al mismo diario!"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:44
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:43
 #, python-format
-msgid "Not all invoices are for the same partner!"
-msgstr "¡No todas las facturas tienen la misma empresa!"
+msgid "Not all invoices are from the same partner!"
+msgstr "¡No todas las facturas pertenecen a la misma empresa!"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:47
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:46
 #, python-format
 msgid "Not all invoices are of the same type!"
 msgstr "¡No todas las facturas son del mismo tipo!"
 
 #. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:38
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:37
 #, python-format
 msgid "Not all invoices use the same account!"
 msgstr "¡No todas las facturas usan la misma cuenta!"
@@ -145,12 +144,21 @@ msgid ""
 "                        * Invoice lines are exactly the same except for the\n"
 "                        product, quantity and unit.<br/>"
 msgstr ""
-
-#. module: account_invoice_merge
-#: code:addons/account_invoice_merge/wizard/invoice_merge.py:27
+"Tenga en cuenta que:<br/><br/>\n"
+"                        Las facturas solo se fusionarán si:<br/>\n"
+"                        * Las facturas están en estado 'borrador'.<br/>\n"
+"                        * Las facturas pertenecen al mismo cliente/socio.<br/>\n"
+"                        * Las facturas tienen la misma compañía, cliente/socio, dirección,\n"
+"                        moneda, diario, comercial, cuenta y tipo.<br/><br/>\n"
+"                        Las lineas solamente se fusionaran si:<br/>\n"
+"                        * Las lineas de factura son exactamente las mismas excepto por\n"
+"                        el producto, cantidad y unidad.<br/>"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/wizard/invoice_merge.py:26
 #, python-format
 msgid "Please select multiple invoices to merge in the list view."
-msgstr ""
+msgstr "Por favor, seleccione múltiples facturas para fusionar en la vista lista."
 
 #. module: account_invoice_merge
 #: model:ir.ui.view,arch_db:account_invoice_merge.view_invoice_merge

account_invoice_merge/models/__init__.py

@@ -1,9 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2004-2010 Tiny SPRL (http://tiny.be).
-# Copyright 2010-2011 Elico Corp.
-# Copyright 2016 Acsone (https://www.acsone.eu/)
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
-#   (http://www.eficent.com)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from . import account_invoice

account_invoice_merge/models/account_invoice.py

@@ -1,10 +1,9 @@
-# -*- coding: utf-8 -*-
 # Copyright 2004-2010 Tiny SPRL (http://tiny.be).
 # Copyright 2010-2011 Elico Corp.
 # Copyright 2016 Acsone (https://www.acsone.eu/)
 # Copyright 2017 Eficent Business and IT Consulting Services S.L.
 #   (http://www.eficent.com)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
 
 from odoo import api, models
 from odoo.osv.orm import browse_record, browse_null

account_invoice_merge/readme/CONTRIBUTORS.rst

@@ -0,0 +1,5 @@
+* Ian Li <[email protected]>
+* Cédric Pigeon <[email protected]>
+* Lois Rilo <[email protected]>
+* Miquel Raïch <[email protected]>
+* Valentin Vinagre <[email protected]>

account_invoice_merge/readme/DESCRIPTION.rst

@@ -0,0 +1,16 @@
+This module adds an action in the invoices list to merge invoices. Here are
+the conditions to allow merging:
+
+#. State should be 'draft'
+
+#. Type should be the same (Customer Invoice, Supplier Invoice, Customer Refund or Supplier Refund)
+
+#. Partner should be the same
+
+#. Company should be the same
+
+#. Currency should be the same
+
+#. Journal should be the same
+
+#. Account receivable account should be the same

account_invoice_merge/readme/USAGE.rst

@@ -0,0 +1,2 @@
+Go to a invoice tree view, select several invoices and click expand the
+action button and click 'Merge Partner Invoice'.

account_invoice_merge/tests/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
-#   (http://www.eficent.com)
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
 from . import test_account_invoice_merge