Merge lp:~scigghia/ooaz/6.1 into lp:ooaz

[Andrea Cometa]

[mikel (mikel-martin)]

Thanks a lot Andrea!

review: Approve

[Andrea Cometa (scigghia)]

:)

=== added file 'account_invoice_merge/i18n/it.po'
--- account_invoice_merge/i18n/it.po	1970-01-01 00:00:00 +0000
+++ account_invoice_merge/i18n/it.po	2013-03-19 10:53:20 +0000
@@ -0,0 +1,92 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_merge
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-04 08:52+0000\n"
+"PO-Revision-Date: 2012-12-04 08:52+0000\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
+#: view:invoice.merge:0
+msgid "_Merge invoces"
+msgstr "_Raggruppa Fatture"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/invoice.py:44
+#, python-format
+msgid "You can merge only invoices in draft state."
+msgstr "Si possono raggruppare solo le fatture in stato di bozza."
+
+#. module: account_invoice_merge
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Il numero della fattura deve essere unico per Azienda!"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Facturas"
+msgstr "Fatture"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#. module: account_invoice_merge
+#: field:invoice.merge,invoices:0
+msgid "Invoices"
+msgstr "Fatture"
+
+#. module: account_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Righe Fattura"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/invoice.py:41
+#, python-format
+msgid "Can not merge invoice(s) on different partners or states !."
+msgstr "Non è possibile raggruppare fatture di differenti partner o stati !."
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/invoice.py:41
+#, python-format
+msgid "Partners don't match!"
+msgstr "I partner non sono uguali!"
+
+#. module: account_invoice_merge
+#: model:ir.actions.act_window,name:account_invoice_merge.action_invoice_merge
+#: model:ir.actions.act_window,name:account_invoice_merge.product_margin_act_window
+msgid "Merge invoices"
+msgstr "Raggruppa fatture"
+
+#. module: account_invoice_merge
+#: view:invoice.merge:0
+msgid "Search Invoices"
+msgstr "Cerca fatture"
+
+#. module: account_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_account_invoice
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: account_invoice_merge
+#: code:addons/account_invoice_merge/invoice.py:44
+#, python-format
+msgid "Invalid action !"
+msgstr "Azione non valida !"
+
+#. module: account_invoice_merge
+#: model:ir.model,name:account_invoice_merge.model_invoice_merge
+msgid "Use this wizard to merge draft invoices from the same partner"
+msgstr "Usa questa funzione per raggruppare bozze fattura dello stesso partner"
+

=== modified file 'account_invoice_merge/invoice.py'
--- account_invoice_merge/invoice.py	2012-08-19 18:26:36 +0000
+++ account_invoice_merge/invoice.py	2013-03-19 10:53:20 +0000
@@ -64,7 +64,7 @@
                 mrg_pdt_ids = inv_line_obj.search(cr, uid, [('invoice_id','=',parent.id),('product_id','=',inv_lin.product_id.id)])
                 if len(mrg_pdt_ids) == 1 and inv.type == parent.type: # product found --> add quantity
                     inv_line_obj.write(cr, uid, mrg_pdt_ids, {'quantity': inv_line_obj._can_merge_quantity(cr, uid, mrg_pdt_ids[0], inv_lin.id)})
-                    inv_line_obj.unlink(cr, uid, inv_lin.id)
+                    inv_line_obj.unlink(cr, uid, [inv_lin.id])
                 elif inv.type == parent.type:
                     inv_line_obj.write(cr, uid, inv_lin.id, {'invoice_id': parent.id})
                 else:
@@ -97,4 +97,4 @@
 
 account_invoice_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: