[tryton-debian-vcs] tryton-modules-account-invoice branch upstream updated. upstream/3.8.2-2-g5ba3902

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Jun 2 16:06:35 UTC 2016


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-invoice.git;a=commitdiff;h=upstream/3.8.2-2-g5ba3902

commit 5ba39020ea073f133e14956ed5472fe42015baca
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:35:06 2016 +0200

    Adding upstream version 4.0.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 97c6c0b..00797c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.1 - 2016-05-11
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
 * Merge invoice and credit note
diff --git a/PKG-INFO b/PKG-INFO
index a80f159..a9c12e5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index ed6ef46..553dd89 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -1433,9 +1433,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 87c3d37..7b2adf5 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -74,7 +74,6 @@ msgstr ""
 "No podeu crear un pagament parcial a la factura \"%s\" per un import més "
 "gran que l'import a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
@@ -96,14 +95,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta el romanent de la línia del termini de pagament \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"No podeu afegir la línia \"%(line)s\" a la factura \"%(invoice)s\" perquè "
-"està comptabilitzada, pagada o cancel·lada."
+"No podeu afegir impostos a la factura \"%(invoice)s\" perquè està "
+"comptabilitzada, pagada o cancel·lada."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -183,7 +181,6 @@ msgstr ""
 "El compte haver del diari \"%(journal)s\" és el mateix que el compte de la "
 "factura \"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta el compte haver del diari \"%s\"."
@@ -758,7 +755,7 @@ msgstr "Termini de pagament"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Percentatge"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1064,14 +1061,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Factures"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures de proveïdor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures de client"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1097,43 +1093,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prova termini de pagament"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Tot"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Esborrany"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Comptabilitzada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Tot"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Esborrany"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Comptabilitzada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1143,14 +1131,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures de proveïdor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures de client"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1274,11 +1261,11 @@ msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveïdor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1286,11 +1273,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveïdor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1458,7 +1445,7 @@ msgstr "Increments relatius línia de termini de pagament"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 5082bd8..fe1fd4f 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -1102,9 +1102,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1390,9 +1391,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 7667d34..dc10414 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -81,7 +81,6 @@ msgstr ""
 "Für Rechnung \"%s\" kann keine Teilzahlung erstellt werden, deren Betrag "
 "größer als der zu zahlende Betrag ist."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
@@ -104,7 +103,6 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Fehlende Restzeile in Zahlungsbedingung \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
@@ -193,7 +191,6 @@ msgstr ""
 "Das Habenkonto in Journal \"%(journal)s\" ist dasselbe wie das von Rechnung "
 "\"%(invoice)s\"'."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Fehlendes Habenkonto in Journal \"%s\"."
@@ -769,7 +766,7 @@ msgstr "Zahlungsbedingung"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Verhältnis"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1077,14 +1074,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Rechnungen"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Rechnungseingang"
+msgstr "Lieferantenrechnungen"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Kundenrechnungen"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1110,43 +1106,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Zahlungsbedingung testen"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Alle"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Entwurf"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Festgeschrieben"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Geprüft"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Alle"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Entwurf"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Festgeschrieben"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1156,14 +1144,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Rechnung"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Rechnungseingang"
+msgstr "Lieferantenrechnungen"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Kundenrechnungen"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1287,23 +1274,23 @@ msgstr "Geprüft"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Kunde"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Lieferant"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Kunde"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Lieferant"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1347,7 +1334,7 @@ msgstr "Restbetrag"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "April"
@@ -1399,7 +1386,7 @@ msgstr "September"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Friday"
@@ -1471,7 +1458,7 @@ msgstr "Zahlungsbedingungsposition Zeitspannen"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 6a8f554..695ba2f 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -73,14 +73,13 @@ msgstr ""
 "No puede crear un pago parcial en la factura «%s» por un importe mayor al "
 "importe a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
 "term \"%(term)s\"."
 msgstr ""
-"Porcentaje y divisor no son consistentes en la línea «%(line)s» del término "
-"de pago «%(term)s»."
+"Cociente y divisor no son consistentes en la línea «%(line)s» del término de"
+" pago «%(term)s»."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
@@ -94,14 +93,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de resto en el término de pago «%s»."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"No puede añadir la línea «%(line)s» a la factura «%(invoice)s» porque está "
-"confirmada, pagada o cancelada."
+"No puede añadir impuesto a la factura «%(invoice)s» porque está confirmada, "
+"pagada o cancelada."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -179,7 +177,6 @@ msgstr ""
 "La cuenta crédito del diario «%(journal)s» tiene la misma cuenta de la "
 "factura «%(invoice)s»."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta crédito del diario «%s»."
@@ -754,7 +751,7 @@ msgstr "Término de pago"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Cociente"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1060,14 +1057,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1093,43 +1089,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prueba de término de pago"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1139,14 +1127,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1270,11 +1257,11 @@ msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1282,11 +1269,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1454,7 +1441,7 @@ msgstr "Línea de término de pago - Incrementos relativos"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 59489d4..de56dc1 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -75,14 +75,13 @@ msgstr ""
 "En la factura \"%s\" usted no puede crear un pago parcial con una cantidad "
 "mayor a la cantidad total a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
 "term \"%(term)s\"."
 msgstr ""
-"Porcentaje y Divisor no son consistentes en línea \"%(line)s\" de forma de "
-"pago \"%(term)s\"."
+"Los valores del porcentaje y divisor no son consistentes en la línea "
+"\"%(line)s\" de la forma de pago \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
@@ -96,14 +95,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta linea de residuo en forma de pago \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"No puede agregar la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
-"la factura está contabilizada, pagada o cancelada."
+"No puede agregar impuestos a la factura \"%(invoice)s\" porque está "
+"contabilizada, pagada o cancelada."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -183,10 +181,9 @@ msgstr ""
 "¡La cuenta crédito en el libro diario \"%(journal)s\" es la misma que la "
 "cuenta de factura \"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
-msgstr "Falta la cuenta credito en el libro diario \"%s\"."
+msgstr "Falta la cuenta crédito en el libro contable \"%s\"."
 
 msgctxt "error:account.invoice:"
 msgid ""
@@ -756,7 +753,7 @@ msgstr "Forma de Pago"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Ratio"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1062,14 +1059,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de Proveedor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de Venta"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1095,43 +1091,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Test de Forma de Pago"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1141,14 +1129,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de Proveedor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de Venta"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1272,23 +1259,23 @@ msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1332,7 +1319,7 @@ msgstr "Saldo"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "April"
@@ -1340,7 +1327,7 @@ msgstr "Abril"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "December"
@@ -1376,7 +1363,7 @@ msgstr "Noviembre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "September"
@@ -1384,7 +1371,7 @@ msgstr "Septiembre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Friday"
@@ -1456,7 +1443,7 @@ msgstr "Deltas Relativos de Forma de Pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
@@ -1534,10 +1521,9 @@ msgctxt "view:account.invoice:"
 msgid "Other Info"
 msgstr "Info Adicional"
 
-#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Pay"
-msgstr "_Pago"
+msgstr "Pago"
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 8648f20..f990599 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -74,14 +74,13 @@ msgstr ""
 "No puede crear un pago parcial en la factura \"%s\" con un importe mayor al "
 "importe a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
 "term \"%(term)s\"."
 msgstr ""
-"Porcentaje y Divisor no son consistentes en la línea \"%(line)s\" del "
-"término de pago \"%(term)s\"."
+"Los valores de Porcentaje y Divisor no son consistentes en la línea "
+"\"%(line)s\" del término de pago \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
@@ -95,14 +94,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de remanente en el término de pago \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"No puede agregar la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
-"está contabilizada, pagada o cancelada."
+"No puede agregar el impuesto a la factura \"%(invoice)s\" porque está "
+"contabilizada, pagada o cancelada."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -182,7 +180,6 @@ msgstr ""
 "La cuenta de crédito del libro diario \"%(journal)s\" tiene la misma cuenta "
 "de la factura \"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta de crédito del libro diario \"%s\"."
@@ -757,7 +754,7 @@ msgstr "Término de pago"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Porcentaje"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1063,14 +1060,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1096,43 +1092,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prueba de término de pago"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1142,14 +1130,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Facturas de proveedor"
+msgstr "Facturas de Proveedor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de Cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1273,11 +1260,11 @@ msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1285,11 +1272,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1457,7 +1444,7 @@ msgstr "Incrementos relativos de línea de término de pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 9237a7d..43f5700 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -72,7 +72,6 @@ msgstr ""
 "No puede crear un pago parcial en la factura \"%s\" por un importe mayor al "
 "importe a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
@@ -93,14 +92,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de remanente en el plazo de pago \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"No puede añadir la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
-"está contabilizada, pagada o cancelada."
+"No puede añadir impuestos a la factura \"%(invoice)s\" porque está "
+"contabilizada, pagada o cancelada."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -180,7 +178,6 @@ msgstr ""
 "La cuenta haber del diario \"%(journal)s\" tiene la misma cuenta de la "
 "factura \"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta haber del diario \"%s\"."
@@ -755,7 +752,7 @@ msgstr "Plazo de pago"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Porcentaje"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1061,14 +1058,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1094,43 +1090,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Probar plazo de pago"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1140,14 +1128,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Facturas de cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1271,11 +1258,11 @@ msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1283,11 +1270,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1455,7 +1442,7 @@ msgstr "Incrementos relativos línea de plazo de pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/es_MX.po b/locale/es_MX.po
index 9a7adc4..7291a36 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -1165,9 +1165,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Plazos de pago"
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #, fuzzy
 msgctxt "report:account.invoice:"
@@ -1476,9 +1477,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr "Incremento relativo línea de plazo de pago"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 42e5a9b..6bc943b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -77,14 +77,13 @@ msgstr ""
 "Sur la facture « %s » vous ne pouvez créer un paiement partiel suppérieur au"
 " montant qu'il reste à payer."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
 "term \"%(term)s\"."
 msgstr ""
-"Pourcentage et diviseur sont inconsistant sur la ligne « %(line)s » de la "
-"condition de paiement « %(term)s »."
+"Les valeurs du ratio et diviseur sont inconsistantes sur la ligne « %(line)s"
+" » de la condition de paiement « %(term)s »."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
@@ -104,14 +103,13 @@ msgstr ""
 "Une ligne de type « reste » est manquante sur la condition de paiement « %s "
 "»."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"Vous ne pouvez ajouter la ligne « %(line)s » à la facture « %(invoice)s » "
-"car elle est posté, payée ou annulée."
+"Vous ne pouvez ajouter de taxe à la facture « %(invoice)s » car elle est "
+"postée, payée ou annulée."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -191,7 +189,6 @@ msgstr ""
 "Le compte de crédit du journal « %(journal)s » est le même que compte de la "
 "facture « %(invoice)s »."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Le compte de crédit du journal « %s » est absent."
@@ -765,7 +762,7 @@ msgstr "Condition de paiement"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Ratio"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1071,14 +1068,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Factures"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures fournisseur"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures client"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1104,60 +1100,51 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Test de condition de paiement"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Toutes"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Brouillon"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
-msgstr "Posté"
+msgstr "Postées"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
-msgstr "Validé"
+msgstr "Validées"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Toutes"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Brouillon"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
-msgstr "Posté"
+msgstr "Postées"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
-msgstr "Validé"
+msgstr "Validées"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Facture"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures fournisseur"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Factures client"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1281,11 +1268,11 @@ msgstr "Validé"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1293,11 +1280,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Client"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Fournisseur"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1465,7 +1452,7 @@ msgstr "Deltas relatifs de ligne de condition de paiement"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index 5082bd8..fe1fd4f 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -1102,9 +1102,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1390,9 +1391,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 4e30d2d..95adeed 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -1451,9 +1451,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr "Delta relativi riga termine pagamento"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index 5082bd8..fe1fd4f 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -1102,9 +1102,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1390,9 +1391,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/lo_LA.po b/locale/lo_LA.po
index bc11796..81d9f03 100644
--- a/locale/lo_LA.po
+++ b/locale/lo_LA.po
@@ -1185,9 +1185,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "ຮູບແບບການຈ່າຍ"
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1481,9 +1482,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index 5082bd8..fe1fd4f 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -1102,9 +1102,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1390,9 +1391,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 2faf00d..27c1585 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -1139,9 +1139,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Betalingstermijnen"
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1432,9 +1433,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index aa57069..5ac51e6 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -76,13 +76,12 @@ msgstr ""
 "Na fatura \"%s\" você não pode criar um pagamento parcial com um montante "
 "maior do que o montante a pagar."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
 "term \"%(term)s\"."
 msgstr ""
-"Os valores de percentagem e divisor não são consistentes na linha "
+"Os valores da proporção e do divisor não são consistentes na linha "
 "\"%(line)s\" da forma de pagamento \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
@@ -98,7 +97,6 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta a linha de remanescente de pagamento na forma \"%s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
@@ -185,7 +183,6 @@ msgstr ""
 "A conta de crédito do diário \"%(journal)s\" é a mesma conta da fatura "
 "\"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta a conta de crédito do diário \"%s\"."
@@ -760,7 +757,7 @@ msgstr "Forma de Pagamento"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Percentual"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1066,14 +1063,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Faturas"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Faturas de Fornecedor"
+msgstr "Faturas do Fornecedor"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Faturas do Cliente"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1099,43 +1095,35 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Simulação da Forma de Pagamento"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todos"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todos"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Rascunho"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
@@ -1145,14 +1133,13 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Faturar"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Faturas de Fornecedor"
+msgstr "Faturas do Fornecedor"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Faturas do Cliente"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1276,11 +1263,11 @@ msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1288,11 +1275,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Fornecedor"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1458,9 +1445,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr "Linha de Forma de Pagamento - Incrementos Relativos"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 6999735..97976e4 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -1187,9 +1187,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Правила оплаты"
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1483,9 +1484,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index 55beea4..ad5607b 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -74,7 +74,6 @@ msgstr ""
 "Pri računu \"%s\" ni možno izdelati delnega plačila z zneskom, ki je večji "
 "od zneska za plačilo."
 
-#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
 "Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
@@ -95,14 +94,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "V plačilnem roku \"%s\" manjka postavka preostanka."
 
-#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
 " canceled."
 msgstr ""
-"Postavke \"%(line)s\" pri računu \"%(invoice)s\" ni možno dodati, ker je "
-"bodisi knjižen ali plačan bodisi preklican."
+"Davka pri računu \"%(invoice)s\" ni možno dodati, ker je bodisi knjižen ali "
+"plačan bodisi preklican."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -179,7 +177,6 @@ msgstr ""
 "Kreditni konto v dnevniku \"%(journal)s\" je enak kontu računa "
 "\"%(invoice)s\"."
 
-#, fuzzy
 msgctxt "error:account.invoice:"
 msgid "The credit account on journal \"%s\" is missing."
 msgstr "V dnevniku \"%s\" manjka kreditni konto."
@@ -752,7 +749,7 @@ msgstr "Plačilni rok"
 
 msgctxt "field:account.invoice.payment_term.line,ratio:"
 msgid "Ratio"
-msgstr ""
+msgstr "Odstotek"
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1058,14 +1055,13 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Računi"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Prejeti računi"
 
 msgctxt "model:ir.action,name:act_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Izdani računi"
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1091,60 +1087,51 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Preizkus plačilnega roka"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Vse"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Priprava"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
-msgstr "Knjiženi"
+msgstr "Knjiženo"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
-msgstr "Odobreni"
+msgstr "Odobreno"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Vse"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Priprava"
 
-#, fuzzy
 msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
-msgstr "Knjiženi"
+msgstr "Knjiženo"
 
-#, fuzzy
 msgctxt ""
 "model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
-msgstr "Odobreni"
+msgstr "Odobreno"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Račun"
 
-#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Prejeti računi"
 
 msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Izdani računi"
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1268,11 +1255,11 @@ msgstr "Odobreno"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Customer"
-msgstr ""
+msgstr "Kupec"
 
 msgctxt "selection:account.invoice,type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
@@ -1280,11 +1267,11 @@ msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Customer"
-msgstr ""
+msgstr "Kupec"
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1452,7 +1439,7 @@ msgstr "Obroki postavk plačilnega roka"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 5082bd8..fe1fd4f 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1102,9 +1102,10 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
+#, fuzzy
 msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
 msgctxt "report:account.invoice:"
 msgid "Amount"
@@ -1390,9 +1391,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "%"
-msgstr ""
+msgstr "%"
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
diff --git a/tryton.cfg b/tryton.cfg
index 1ecb3d5..96db76f 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.0
+version=4.0.1
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index b3345ee..f77cc31 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-account-invoice
-Version: 4.0.0
+Version: 4.0.1
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_account_invoice.egg-info/SOURCES.txt b/trytond_account_invoice.egg-info/SOURCES.txt
index 31f4361..ca4fbeb 100644
--- a/trytond_account_invoice.egg-info/SOURCES.txt
+++ b/trytond_account_invoice.egg-info/SOURCES.txt
@@ -35,11 +35,13 @@ tryton.cfg
 ./locale/hu_HU.po
 ./locale/it_IT.po
 ./locale/ja_JP.po
+./locale/lo_LA.po
 ./locale/lt_LT.po
 ./locale/nl_NL.po
 ./locale/pt_BR.po
 ./locale/ru_RU.po
 ./locale/sl_SI.po
+./locale/zh_CN.po
 ./tests/__init__.py
 ./tests/scenario_invoice.rst
 ./tests/scenario_invoice_alternate_currency.rst
@@ -48,6 +50,7 @@ tryton.cfg
 ./tests/tools.py
 ./view/address_form.xml
 ./view/address_tree.xml
+./view/address_tree_sequence.xml
 ./view/credit_start_form.xml
 ./view/fiscalyear_form.xml
 ./view/invoice_form.xml
diff --git a/trytond_account_invoice.egg-info/requires.txt b/trytond_account_invoice.egg-info/requires.txt
index 4561aa5..39ea0d0 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -6,4 +6,4 @@ trytond_company >= 4.0, < 4.1
 trytond_currency >= 4.0, < 4.1
 trytond_party >= 4.0, < 4.1
 trytond_product >= 4.0, < 4.1
-trytond >= 4.0, < 4.1
\ No newline at end of file
+trytond >= 4.0, < 4.1
commit 0e426117b5cd7a2e84bff881a59238ae689cfe33
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri May 27 18:25:47 2016 +0200

    Adding upstream version 4.0.0.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index dd479b8..97c6c0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,10 @@
-Version 3.8.2 - 2016-04-06
-* Bug fixes (see mercurial logs for details)
-
-Version 3.8.1 - 2016-02-06
+Version 4.0.0 - 2016-05-02
 * Bug fixes (see mercurial logs for details)
+* Merge invoice and credit note
+* Inversed sign of tax report from credit note
+* Move tax Rounding configuration to account
+* Add Python3 support
+* Change payment term percentage into ratio
 
 Version 3.8.0 - 2015-11-02
 * Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 9f88079..a80f159 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_account_invoice
-Version: 3.8.2
+Version: 4.0.0
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_account_invoice
         =======================
         
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/__init__.py b/__init__.py
index aa65f3a..9071fa1 100644
--- a/__init__.py
+++ b/__init__.py
@@ -30,8 +30,6 @@ def register():
         Period,
         Move,
         Reconciliation,
-        Configuration,
-        ConfigurationTaxRounding,
         module='account_invoice', type_='model')
     Pool.register(
         TestPaymentTerm,
diff --git a/account.py b/account.py
index 954fe53..610530e 100644
--- a/account.py
+++ b/account.py
@@ -1,73 +1,15 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-from sql import Null
-from sql.conditionals import Case
-
-from trytond.model import ModelSQL, ModelView, MatchMixin, fields
+from trytond.model import fields
 from trytond.pyson import Eval
 from trytond.pool import Pool, PoolMeta
-from trytond.transaction import Transaction
-
-__all__ = ['Configuration', 'ConfigurationTaxRounding',
-    'FiscalYear', 'Period', 'Move', 'Reconciliation']
-__metaclass__ = PoolMeta
-
-tax_roundings = [
-    ('document', 'Per Document'),
-    ('line', 'Per Line'),
-    ]
-
-
-class Configuration:
-    __name__ = 'account.configuration'
-    tax_rounding = fields.Function(fields.Selection(tax_roundings,
-            'Tax Rounding'), 'on_change_with_tax_rounding')
-    tax_roundings = fields.One2Many('account.configuration.tax_rounding',
-        'configuration', 'Tax Roundings')
-
-    @staticmethod
-    def default_tax_rounding():
-        return 'document'
-
-    @fields.depends('tax_roundings')
-    def on_change_with_tax_rounding(self, name=None, pattern=None):
-        context = Transaction().context
-        if pattern is None:
-            pattern = {}
-        pattern = pattern.copy()
-        pattern['company'] = context.get('company')
-
-        for line in self.tax_roundings:
-            if line.match(pattern):
-                return line.method
-        return self.default_tax_rounding()
-
-
-class ConfigurationTaxRounding(ModelSQL, ModelView, MatchMixin):
-    'Account Configuration Tax Rounding'
-    __name__ = 'account.configuration.tax_rounding'
-    configuration = fields.Many2One('account.configuration', 'Configuration',
-        required=True, ondelete='CASCADE')
-    sequence = fields.Integer('Sequence')
-    company = fields.Many2One('company.company', 'Company')
-    method = fields.Selection(tax_roundings, 'Method', required=True)
-
-    @classmethod
-    def __setup__(cls):
-        super(ConfigurationTaxRounding, cls).__setup__()
-        cls._order.insert(0, ('sequence', 'ASC'))
-
-    @staticmethod
-    def order_sequence(tables):
-        table, _ = tables[None]
-        return [Case((table.sequence == Null, 0), else_=1), table.sequence]
 
-    @staticmethod
-    def default_method():
-        return 'document'
+__all__ = ['FiscalYear',
+    'Period', 'Move', 'Reconciliation']
 
 
 class FiscalYear:
+    __metaclass__ = PoolMeta
     __name__ = 'account.fiscalyear'
     out_invoice_sequence = fields.Many2One('ir.sequence.strict',
         'Customer Invoice Sequence', required=True,
@@ -182,6 +124,7 @@ class FiscalYear:
 
 
 class Period:
+    __metaclass__ = PoolMeta
     __name__ = 'account.period'
     out_invoice_sequence = fields.Many2One('ir.sequence.strict',
         'Customer Invoice Sequence',
@@ -303,6 +246,7 @@ class Period:
 
 
 class Move:
+    __metaclass__ = PoolMeta
     __name__ = 'account.move'
 
     @classmethod
@@ -311,6 +255,7 @@ class Move:
 
 
 class Reconciliation:
+    __metaclass__ = PoolMeta
     __name__ = 'account.move.reconciliation'
 
     @classmethod
diff --git a/account.xml b/account.xml
index 3937f8f..fda39f5 100644
--- a/account.xml
+++ b/account.xml
@@ -3,42 +3,6 @@
 this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
-        <record model="ir.ui.view" id="configuration_view_form">
-            <field name="model">account.configuration</field>
-            <field name="inherit" ref="account.configuration_view_form"/>
-            <field name="name">configuration_form</field>
-        </record>
-
-        <record model="ir.ui.view" id="configuration_tax_rounding_view_form">
-            <field name="model">account.configuration.tax_rounding</field>
-            <field name="type">form</field>
-            <field name="name">configuration_tax_rounding_form</field>
-        </record>
-        <record model="ir.ui.view" id="configuration_tax_rounding_view_list">
-            <field name="model">account.configuration.tax_rounding</field>
-            <field name="type">tree</field>
-            <field name="name">configuration_tax_rounding_list</field>
-        </record>
-
-        <record model="ir.model.access" id="access_configuration_tax_rounding">
-            <field name="model"
-                search="[('model', '=', 'account.configuration.tax_rounding')]"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="False"/>
-            <field name="perm_create" eval="False"/>
-            <field name="perm_delete" eval="False"/>
-        </record>
-        <record model="ir.model.access"
-            id="access_configuration_tax_rounding_account_admin">
-            <field name="model"
-                search="[('model', '=', 'account.configuration.tax_rounding')]"/>
-            <field name="group" ref="account.group_account_admin"/>
-            <field name="perm_read" eval="True"/>
-            <field name="perm_write" eval="True"/>
-            <field name="perm_create" eval="True"/>
-            <field name="perm_delete" eval="True"/>
-        </record>
-
         <record model="ir.ui.view" id="fiscalyear_view_form">
             <field name="model">account.fiscalyear</field>
             <field name="inherit" ref="account.fiscalyear_view_form"/>
diff --git a/doc/index.rst b/doc/index.rst
index 3c2e696..36d55fb 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -104,13 +104,13 @@ It defines the maximum dates of how an due amount should be paid.
 
     - *Percentage on Remainder*:
 
-      - Percentage: The percentage to use on the remainder amount.
-      - Divisor: The reversed percentage.
+      - Ratio: The ratio to use on the remainder amount.
+      - Divisor: The reversed ratio.
 
     - *Percentage on Total*:
 
-      - Percentage: The percentage to use on the total amount.
-      - Divisor: The reversed percentage.
+      - Ratio: The ratio to use on the total amount.
+      - Divisor: The reversed ratio.
 
     - *Remainder*
 
diff --git a/invoice.odt b/invoice.odt
index 308bf88..28dd18f 100644
Binary files a/invoice.odt and b/invoice.odt differ
diff --git a/invoice.py b/invoice.py
index 3c61c61..4a8e5fb 100644
--- a/invoice.py
+++ b/invoice.py
@@ -1,13 +1,15 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 from decimal import Decimal
-from collections import defaultdict
+from collections import defaultdict, namedtuple
+from itertools import combinations
 import base64
 import itertools
 
 from sql import Literal, Null
 from sql.aggregate import Count, Sum
 from sql.conditionals import Coalesce, Case
+from sql.functions import Round
 
 from trytond.model import Workflow, ModelView, ModelSQL, fields, Check
 from trytond.report import Report
@@ -35,29 +37,17 @@ _STATES = {
 _DEPENDS = ['state']
 
 _TYPE = [
-    ('out_invoice', 'Invoice'),
-    ('in_invoice', 'Supplier Invoice'),
-    ('out_credit_note', 'Credit Note'),
-    ('in_credit_note', 'Supplier Credit Note'),
+    ('out', 'Customer'),
+    ('in', 'Supplier'),
 ]
 
 _TYPE2JOURNAL = {
-    'out_invoice': 'revenue',
-    'in_invoice': 'expense',
-    'out_credit_note': 'revenue',
-    'in_credit_note': 'expense',
+    'out': 'revenue',
+    'in': 'expense',
 }
 
 _ZERO = Decimal('0.0')
 
-_CREDIT_TYPE = {
-    None: None,
-    'out_invoice': 'out_credit_note',
-    'in_invoice': 'in_credit_note',
-    'out_credit_note': 'out_invoice',
-    'in_credit_note': 'in_invoice',
-    }
-
 
 class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
     'Invoice'
@@ -92,7 +82,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         states={
             'readonly': Eval('state').in_(['posted', 'paid', 'cancel']),
             'required': Eval('state').in_(
-                If(Eval('type').in_(['in_invoice', 'in_credit_note']),
+                If(Eval('type') == 'in',
                     ['validated', 'posted', 'paid'],
                     ['posted', 'paid'])),
             },
@@ -127,14 +117,14 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
             ('company', '=', Eval('company', -1)),
             ],
         states={
-            'invisible': Eval('type').in_(['out_invoice', 'out_credit_note']),
+            'invisible': Eval('type') == 'out',
             },
         depends=['company'])
     account = fields.Many2One('account.account', 'Account', required=True,
         states=_STATES, depends=_DEPENDS + ['type', 'company'],
         domain=[
             ('company', '=', Eval('company', -1)),
-            If(Eval('type').in_(['out_invoice', 'out_credit_note']),
+            If(Eval('type') == 'out',
                 ('kind', '=', 'receivable'),
                 ('kind', '=', 'payable')),
             ])
@@ -211,8 +201,8 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 'same_credit_account': ('The credit account on journal '
                     '"%(journal)s" is the same as invoice "%(invoice)s"\'s '
                     'account.'),
-                'missing_credit_account': ('The credit account on journal %s" '
-                    'is missing.'),
+                'missing_credit_account': ('The credit account on journal '
+                    '"%s" is missing.'),
                 'same_account_on_line': ('Invoice "%(invoice)s" uses the same '
                     'account "%(account)s" for the invoice and in line '
                     '"%(line)s".'),
@@ -240,8 +230,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 'cancel': {
                     'invisible': (~Eval('state').in_(['draft', 'validated'])
                         & ~((Eval('state') == 'posted')
-                            & Eval('type').in_(
-                                ['in_invoice', 'in_credit_note']))),
+                            & (Eval('type') == 'in'))),
                     },
                 'draft': {
                     'invisible': (~Eval('state').in_(['cancel', 'validated'])
@@ -253,8 +242,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                     'pre_validate':
                         ['OR',
                             ('invoice_date', '!=', None),
-                            ('type', 'not in',
-                                ['in_invoice', 'in_credit_note']),
+                            ('type', '!=', 'in'),
                         ],
                     'invisible': Eval('state') != 'draft',
                     },
@@ -262,8 +250,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                     'pre_validate':
                         ['OR',
                             ('invoice_date', '!=', None),
-                            ('type', 'not in',
-                                ['in_invoice', 'in_credit_note']),
+                            ('type', '!=', 'in'),
                         ],
                     'invisible': ~Eval('state').in_(['draft', 'validated']),
                     },
@@ -276,11 +263,18 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
 
     @classmethod
     def __register__(cls, module_name):
+        pool = Pool()
+        Line = pool.get('account.invoice.line')
+        Tax = pool.get('account.invoice.tax')
         TableHandler = backend.get('TableHandler')
         sql_table = cls.__table__()
+        line = Line.__table__()
+        tax = Tax.__table__()
+
         super(Invoice, cls).__register__(module_name)
-        cursor = Transaction().cursor
-        table = TableHandler(cursor, cls, module_name)
+        transaction = Transaction()
+        cursor = transaction.connection.cursor()
+        table = TableHandler(cls, module_name)
 
         # Migration from 1.2 invoice_date is no more required
         table.not_null_action('invoice_date', action='remove')
@@ -290,7 +284,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
 
         if (table.column_exist('invoice_report')
                 and table.column_exist('invoice_report_cache')):
-            limit = cursor.IN_MAX
+            limit = transaction.database.IN_MAX
             cursor.execute(*sql_table.select(Count(Literal(1))))
             invoice_count, = cursor.fetchone()
             for offset in range(0, invoice_count, limit):
@@ -320,12 +314,54 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 values=['posted'],
                 where=sql_table.state == 'open'))
 
+        # Migration from 3.8: remove invoice/credit note type
+        cursor.execute(*sql_table.select(sql_table.id,
+                where=sql_table.type.like('%_invoice')
+                | sql_table.type.like('%_credit_note'),
+                limit=1))
+        if cursor.fetchone():
+            for type_ in ['out', 'in']:
+                cursor.execute(*sql_table.update(
+                        columns=[sql_table.type],
+                        values=[type_],
+                        where=sql_table.type == '%s_invoice' % type_))
+                cursor.execute(*line.update(
+                        columns=[line.invoice_type],
+                        values=[type_],
+                        where=line.invoice_type == '%s_invoice' % type_))
+
+                cursor.execute(*line.update(
+                        columns=[line.quantity, line.invoice_type],
+                        values=[-line.quantity, type_],
+                        where=(line.invoice_type == '%s_credit_note' % type_)
+                        & (line.invoice == Null)
+                        ))
+                # Don't use UPDATE FROM because SQLite nor MySQL support it
+                cursor.execute(*line.update(
+                        columns=[line.quantity, line.invoice_type],
+                        values=[-line.quantity, type_],
+                        where=line.invoice.in_(sql_table.select(sql_table.id,
+                                where=(
+                                    sql_table.type == '%s_credit_note' % type_)
+                                ))))
+                cursor.execute(*tax.update(
+                        columns=[tax.base, tax.amount, tax.base_sign],
+                        values=[-tax.base, -tax.amount, -tax.base_sign],
+                        where=tax.invoice.in_(sql_table.select(sql_table.id,
+                                where=(
+                                    sql_table.type == '%s_credit_note' % type_)
+                                ))))
+                cursor.execute(*sql_table.update(
+                        columns=[sql_table.type],
+                        values=[type_],
+                        where=sql_table.type == '%s_credit_note' % type_))
+
         # Add index on create_date
         table.index_action('create_date', action='add')
 
     @staticmethod
     def default_type():
-        return Transaction().context.get('type', 'out_invoice')
+        return Transaction().context.get('type', 'out')
 
     @staticmethod
     def default_state():
@@ -363,29 +399,20 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         '''
         self.account = None
         if self.party:
-            if self.type in ('out_invoice', 'out_credit_note'):
+            if self.type == 'out':
                 self.account = self.party.account_receivable
-                if (self.type == 'out_invoice'
-                        and self.party.customer_payment_term):
+                if self.party.customer_payment_term:
                     self.payment_term = self.party.customer_payment_term
-            elif self.type in ('in_invoice', 'in_credit_note'):
+            elif self.type == 'in':
                 self.account = self.party.account_payable
-                if (self.type == 'in_invoice'
-                        and self.party.supplier_payment_term):
+                if self.party.supplier_payment_term:
                     self.payment_term = self.party.supplier_payment_term
-        if self.company and self.type in ('out_credit_note', 'in_credit_note'):
-            if (self.type == 'out_credit_note'
-                    and self.company.party.customer_payment_term):
-                self.payment_term = self.company.party.customer_payment_term
-            elif (self.type == 'in_credit_note'
-                    and self.company.party.supplier_payment_term):
-                self.payment_term = self.company.party.supplier_payment_term
 
     @fields.depends('type', 'party', 'company')
     def on_change_type(self):
         Journal = Pool().get('account.journal')
         journals = Journal.search([
-                ('type', '=', _TYPE2JOURNAL.get(self.type or 'out_invoice',
+                ('type', '=', _TYPE2JOURNAL.get(self.type or 'out',
                         'revenue')),
                 ], limit=1)
         if journals:
@@ -501,7 +528,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         InvoiceTax = pool.get('account.invoice.tax')
         Move = pool.get('account.move')
         MoveLine = pool.get('account.move.line')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
 
         untaxed_amount = dict((i.id, _ZERO) for i in invoices)
         tax_amount = dict((i.id, _ZERO) for i in invoices)
@@ -564,7 +591,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 total_amount[invoice_id] = sum_
 
         for invoice in invoices_move:
-            if invoice.type in ('in_invoice', 'out_credit_note'):
+            if invoice.type == 'in':
                 total_amount[invoice.id] *= -1
             # Float amount must be rounded to get the right precision
             if to_round:
@@ -604,7 +631,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         MoveLine = pool.get('account.move.line')
         line = MoveLine.__table__()
         invoice = cls.__table__()
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
 
         lines = defaultdict(list)
         for sub_ids in grouped_slice(invoices):
@@ -651,13 +678,12 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                     amount_currency += line.amount_second_currency
                 else:
                     amount += line.debit - line.credit
-            if invoice.type in ('in_invoice', 'out_credit_note'):
-                amount = - amount
-                amount_currency = - amount_currency
             if amount != _ZERO:
                 with Transaction().set_context(date=invoice.currency_date):
                     amount_currency += Currency.compute(
                         invoice.company.currency, amount, invoice.currency)
+            if invoice.type == 'in':
+                amount_currency *= -1
             res[invoice.id] = amount_currency
         return res
 
@@ -667,16 +693,27 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         Rule = pool.get('ir.rule')
         Line = pool.get('account.invoice.line')
         Tax = pool.get('account.invoice.tax')
+        Invoice = pool.get('account.invoice')
+        Currency = pool.get('currency.currency')
         type_name = cls.total_amount._field.sql_type().base
         line = Line.__table__()
+        invoice = Invoice.__table__()
+        currency = Currency.__table__()
         tax = Tax.__table__()
 
+        _, operator, value = clause
         invoice_query = Rule.query_get('account.invoice')
-        Operator = fields.SQL_OPERATORS[clause[1]]
-
-        union = (line.select(line.invoice.as_('invoice'),
-                Coalesce(Sum(line.quantity * line.unit_price), 0
-                    ).as_('total_amount'),
+        Operator = fields.SQL_OPERATORS[operator]
+        # SQLite uses float for sum
+        if backend.name() == 'sqlite':
+            value = float(value)
+
+        union = (line.join(invoice, condition=(invoice.id == line.invoice)
+                ).join(currency, condition=(currency.id == invoice.currency)
+                ).select(line.invoice.as_('invoice'),
+                Coalesce(Sum(Round((line.quantity * line.unit_price).cast(
+                                type_name),
+                                currency.digits)), 0).as_('total_amount'),
                 where=line.invoice.in_(invoice_query),
                 group_by=line.invoice)
             | tax.select(tax.invoice.as_('invoice'),
@@ -685,7 +722,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 group_by=tax.invoice))
         query = union.select(union.invoice, group_by=union.invoice,
             having=Operator(Sum(union.total_amount).cast(type_name),
-                clause[2]))
+                value))
         return [('id', 'in', query)]
 
     @classmethod
@@ -693,17 +730,32 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         pool = Pool()
         Rule = pool.get('ir.rule')
         Line = pool.get('account.invoice.line')
+        Invoice = pool.get('account.invoice')
+        Currency = pool.get('currency.currency')
         type_name = cls.untaxed_amount._field.sql_type().base
         line = Line.__table__()
+        invoice = Invoice.__table__()
+        currency = Currency.__table__()
 
+        _, operator, value = clause
         invoice_query = Rule.query_get('account.invoice')
-        Operator = fields.SQL_OPERATORS[clause[1]]
-
-        query = line.select(line.invoice,
-            where=line.invoice.in_(invoice_query),
-            group_by=line.invoice,
-            having=Operator(Coalesce(Sum(line.quantity * line.unit_price), 0
-                    ).cast(type_name), clause[2]))
+        Operator = fields.SQL_OPERATORS[operator]
+        # SQLite uses float for sum
+        if backend.name() == 'sqlite':
+            value = float(value)
+
+        query = line.join(invoice,
+            condition=(invoice.id == line.invoice)
+            ).join(currency,
+                condition=(currency.id == invoice.currency)
+                ).select(line.invoice,
+                    where=line.invoice.in_(invoice_query),
+                    group_by=line.invoice,
+                    having=Operator(Coalesce(Sum(
+                                Round((line.quantity * line.unit_price).cast(
+                                        type_name),
+                                    currency.digits)), 0).cast(type_name),
+                        value))
         return [('id', 'in', query)]
 
     @classmethod
@@ -714,14 +766,18 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         type_name = cls.tax_amount._field.sql_type().base
         tax = Tax.__table__()
 
+        _, operator, value = clause
         invoice_query = Rule.query_get('account.invoice')
-        Operator = fields.SQL_OPERATORS[clause[1]]
+        Operator = fields.SQL_OPERATORS[operator]
+        # SQLite uses float for sum
+        if backend.name() == 'sqlite':
+            value = float(value)
 
         query = tax.select(tax.invoice,
             where=tax.invoice.in_(invoice_query),
             group_by=tax.invoice,
             having=Operator(Coalesce(Sum(tax.amount), 0).cast(type_name),
-                clause[2]))
+                value))
         return [('id', 'in', query)]
 
     @property
@@ -744,10 +800,6 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         return taxable_lines
 
     @property
-    def tax_type(self):
-        return self.type.split('_', 1)[1]
-
-    @property
     def tax_date(self):
         return self.accounting_date or self.invoice_date
 
@@ -844,17 +896,18 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
             with Transaction().set_context(date=self.currency_date):
                 res['amount_second_currency'] = Currency.compute(
                     self.company.currency, amount, self.currency)
-            res['amount_second_currency'] = -res['amount_second_currency']
             res['second_currency'] = self.currency.id
         else:
             res['amount_second_currency'] = None
             res['second_currency'] = None
-        if amount >= Decimal('0.0'):
-            res['debit'] = Decimal('0.0')
-            res['credit'] = amount
+        if amount <= 0:
+            res['debit'], res['credit'] = -amount, 0
         else:
-            res['debit'] = - amount
-            res['credit'] = Decimal('0.0')
+            res['debit'], res['credit'] = 0, amount
+        if res['amount_second_currency']:
+            res['amount_second_currency'] = (
+                res['amount_second_currency'].copy_sign(
+                    res['debit'] - res['credit']))
         res['account'] = self.account.id
         if self.account.party_required:
             res['party'] = self.party.id
@@ -927,14 +980,19 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
             return
 
         test_state = True
-        if self.type in ('in_invoice', 'in_credit_note'):
+        if self.type == 'in':
             test_state = False
 
         accounting_date = self.accounting_date or self.invoice_date
         period_id = Period.find(self.company.id,
             date=accounting_date, test_state=test_state)
         period = Period(period_id)
-        sequence = period.get_invoice_sequence(self.type)
+        invoice_type = self.type
+        if all(l.amount <= 0 for l in self.lines):
+            invoice_type += '_credit_note'
+        else:
+            invoice_type += '_invoice'
+        sequence = period.get_invoice_sequence(invoice_type)
         if not sequence:
             self.raise_user_error('no_invoice_sequence', {
                     'invoice': self.rec_name,
@@ -944,8 +1002,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 date=self.invoice_date or Date.today()):
             number = Sequence.get_id(sequence.id)
             vals = {'number': number}
-            if (not self.invoice_date
-                    and self.type in ('out_invoice', 'out_credit_note')):
+            if not self.invoice_date and self.type == 'out':
                 vals['invoice_date'] = Transaction().context['date']
         self.write([self], vals)
 
@@ -1045,63 +1102,30 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                         })
 
     def check_cancel_move(self):
-        if (self.type in ('out_invoice', 'out_credit_note')
-                and self.cancel_move):
+        if self.type == 'out' and self.cancel_move:
             self.raise_user_error('customer_invoice_cancel_move',
                 self.rec_name)
 
-    def get_reconcile_lines_for_amount(self, amount, exclude_lines=None):
+    def get_reconcile_lines_for_amount(self, amount):
         '''
         Return list of lines and the remainder to make reconciliation.
         '''
-        if exclude_lines is None:
-            exclude_lines = []
-        payment_amount = Decimal('0.0')
-        remainder = self.total_amount
-        lines = []
-        payment_lines = []
-
-        for line in self.payment_lines:
-            if line.reconciliation:
-                continue
-            payment_amount += line.debit - line.credit
-            payment_lines.append(line)
-
-        for line in self.lines_to_pay:
-
-            if line.reconciliation:
-                continue
-            if line in exclude_lines:
-                continue
-
-            test_amount = (line.debit - line.credit) - amount
-            if self.currency.is_zero(test_amount):
-                return ([line], Decimal('0.0'))
-            if abs(test_amount) < abs(remainder):
-                lines = [line]
-                remainder = test_amount
-
-            test_amount = payment_amount - amount
-            test_amount += (line.debit - line.credit)
-            if self.currency.is_zero(test_amount):
-                return ([line] + payment_lines, Decimal('0.0'))
-            if abs(test_amount) < abs(remainder):
-                lines = [line] + payment_lines
-                remainder = test_amount
-
-            exclude_lines2 = exclude_lines[:]
-            exclude_lines2.append(line)
-            lines2, remainder2 = self.get_reconcile_lines_for_amount(
-                ((line.debit - line.credit) - amount),
-                exclude_lines=exclude_lines2)
-            if remainder2 == Decimal('0.0'):
-                lines2.append(line)
-                return lines2, remainder2
-            if abs(remainder2) < abs(remainder):
-                lines2.append(line)
-                lines, remainder = lines2, remainder2
-
-        return (lines, remainder)
+        Result = namedtuple('Result', ['lines', 'remainder'])
+
+        lines = [l for l in self.payment_lines + self.lines_to_pay
+            if not l.reconciliation]
+
+        best = Result([], self.total_amount)
+        for n in xrange(len(lines), 0, -1):
+            for comb_lines in combinations(lines, n):
+                remainder = sum((l.debit - l.credit) for l in comb_lines)
+                remainder -= amount
+                result = Result(list(comb_lines), remainder)
+                if self.currency.is_zero(remainder):
+                    return result
+                if abs(remainder) < abs(best.remainder):
+                    best = result
+        return result
 
     def pay_invoice(self, amount, journal, date, description,
             amount_second_currency=None, second_currency=None):
@@ -1112,82 +1136,52 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         '''
         pool = Pool()
         Move = pool.get('account.move')
+        Line = pool.get('account.move.line')
         Period = pool.get('account.period')
 
-        lines = []
+        line1 = Line(description=description, account=self.account)
+        line2 = Line(description=description)
+        lines = [line1, line2]
 
-        if self.type in ('out_invoice', 'in_credit_note'):
-            if self.account == journal.debit_account:
-                self.raise_user_error('same_debit_account', {
-                        'journal': journal.rec_name,
-                        'invoice': self.rec_name,
-                        })
-            if not journal.debit_account:
-                self.raise_user_error('missing_debit_account',
-                    (journal.rec_name,))
-
-            lines.append({
-                    'description': description,
-                    'account': self.account.id,
-                    'party': (self.party.id
-                        if self.account.party_required else None),
-                    'debit': Decimal('0.0'),
-                    'credit': amount,
-                    'amount_second_currency': (-amount_second_currency
-                        if amount_second_currency else amount_second_currency),
-                    'second_currency': second_currency,
-                    })
-            lines.append({
-                    'description': description,
-                    'account': journal.debit_account.id,
-                    'party': (self.party.id
-                        if journal.debit_account.party_required else None),
-                    'debit': amount,
-                    'credit': Decimal('0.0'),
-                    'amount_second_currency': amount_second_currency,
-                    'second_currency': second_currency,
-                    })
+        if amount >= 0:
+            if self.type == 'out':
+                line1.debit, line1.credit = 0, amount
+            else:
+                line1.debit, line1.credit = amount, 0
         else:
-            if self.account == journal.credit_account:
-                self.raise_user_error('same_credit_account', {
-                        'journal': journal.rec_name,
-                        'invoice': self.rec_name,
-                        })
-            if not journal.credit_account:
-                self.raise_user_error('missing_credit_account',
-                    (journal.rec_name,))
-
-            lines.append({
-                    'description': description,
-                    'account': self.account.id,
-                    'party': (self.party.id
-                        if self.account.party_required else None),
-                    'debit': amount,
-                    'credit': Decimal('0.0'),
-                    'amount_second_currency': amount_second_currency,
-                    'second_currency': second_currency,
-                    })
-            lines.append({
-                    'description': description,
-                    'account': journal.credit_account.id,
-                    'party': (self.party.id
-                        if journal.credit_account.party_required else None),
-                    'debit': Decimal('0.0'),
-                    'credit': amount,
-                    'amount_second_currency': (-amount_second_currency
-                        if amount_second_currency else amount_second_currency),
-                    'second_currency': second_currency,
+            if self.type == 'out':
+                line1.debit, line1.credit = -amount, 0
+            else:
+                line1.debit, line2.credit = 0, -amount
+
+        line2.debit, line2.credit = line1.credit, line1.debit
+        if line2.debit:
+            account_journal = 'debit_account'
+        else:
+            account_journal = 'credit_account'
+        line2.account = getattr(journal, account_journal)
+        if self.account == line2.account:
+            self.raise_user_error('same_%s' % account_journal, {
+                    'journal': journal.rec_name,
+                    'invoice': self.rec_name,
                     })
+        if not line2.account:
+            self.raise_user_error('missing_%s' % account_journal,
+                (journal.rec_name,))
+
+        for line in lines:
+            if line.account.party_required:
+                line.party = self.party
+            if amount_second_currency:
+                line.amount_second_currency = amount_second_currency.copy_sign(
+                    line.debit - line.credit)
+                line.second_currency = second_currency
 
         period_id = Period.find(self.company.id, date=date)
 
-        move, = Move.create([{
-                    'journal': journal.id,
-                    'period': period_id,
-                    'date': date,
-                    'company': self.company.id,
-                    'lines': [('create', lines)],
-                    }])
+        move = Move(journal=journal, period=period_id, date=date,
+            company=self.company, lines=lines)
+        move.save()
         Move.post([move])
 
         for line in move.lines:
@@ -1212,9 +1206,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
         Return values to credit invoice.
         '''
         res = {}
-        res['type'] = _CREDIT_TYPE[self.type]
-
-        for field in ('description', 'comment'):
+        for field in ('type', 'description', 'comment'):
             res[field] = getattr(self, field)
 
         for field in ('company', 'party', 'invoice_address', 'currency',
@@ -1272,7 +1264,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
     @Workflow.transition('validated')
     def validate_invoice(cls, invoices):
         for invoice in invoices:
-            if invoice.type in ('in_invoice', 'in_credit_note'):
+            if invoice.type == 'in':
                 invoice.set_number()
                 invoice.create_move()
 
@@ -1291,7 +1283,7 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                 })
         Move.post([m for m in moves if m.state != 'posted'])
         for invoice in invoices:
-            if invoice.type in ('out_invoice', 'out_credit_note'):
+            if invoice.type == 'out':
                 invoice.print_invoice()
 
     @classmethod
@@ -1424,7 +1416,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
             'required': Eval('type') == 'line',
             },
         depends=['type', 'unit_digits'])
-    unit = fields.Many2One('product.uom', 'Unit',
+    unit = fields.Many2One('product.uom', 'Unit', ondelete='RESTRICT',
         states={
             'required': Bool(Eval('product')),
             'invisible': Eval('type') != 'line',
@@ -1438,6 +1430,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
     unit_digits = fields.Function(fields.Integer('Unit Digits'),
         'on_change_with_unit_digits')
     product = fields.Many2One('product.product', 'Product',
+        ondelete='RESTRICT',
         states={
             'invisible': Eval('type') != 'line',
             },
@@ -1446,6 +1439,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         fields.Many2One('product.uom.category', 'Product Uom Category'),
         'on_change_with_product_uom_category')
     account = fields.Many2One('account.account', 'Account',
+        ondelete='RESTRICT',
         states={
             'invisible': Eval('type') != 'line',
             'required': Eval('type') == 'line',
@@ -1473,12 +1467,10 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
                 ('group', '=', None),
                 ('group.kind', 'in',
                     If(Bool(Eval('_parent_invoice')),
-                        If(Eval('_parent_invoice', {}).get('type').in_(
-                                ['out_invoice', 'out_credit_note']),
+                        If(Eval('_parent_invoice', {}).get('type') == 'out',
                             ['sale', 'both'],
                             ['purchase', 'both']),
-                        If(Eval('invoice_type').in_(
-                                ['out_invoice', 'out_credit_note']),
+                        If(Eval('invoice_type') == 'out',
                             ['sale', 'both'],
                             ['purchase', 'both']))
                     )],
@@ -1527,20 +1519,16 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         cls.account.domain = [
             ('company', '=', Eval('company', -1)),
             If(Bool(Eval('_parent_invoice')),
-                If(Eval('_parent_invoice', {}).get('type').in_(
-                        ['out_invoice', 'out_credit_note']),
+                If(Eval('_parent_invoice', {}).get('type') == 'out',
                     ('kind', 'in', cls._account_domain('out')),
-                    If(Eval('_parent_invoice', {}).get('type').in_(
-                            ['in_invoice', 'in_credit_note']),
+                    If(Eval('_parent_invoice', {}).get('type') == 'in',
                         ('kind', 'in', cls._account_domain('in')),
                         ('kind', 'in',
                             cls._account_domain('out')
                             + cls._account_domain('in')))),
-                If(Eval('invoice_type').in_(
-                        ['out_invoice', 'out_credit_note']),
+                If(Eval('invoice_type') == 'out',
                     ('kind', 'in', cls._account_domain('out')),
-                    If(Eval('invoice_type').in_(
-                            ['in_invoice', 'in_credit_note']),
+                    If(Eval('invoice_type') == 'in',
                         ('kind', 'in', cls._account_domain('in')),
                         ('kind', 'in',
                             cls._account_domain('out')
@@ -1563,8 +1551,8 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         TableHandler = backend.get('TableHandler')
         sql_table = cls.__table__()
         super(InvoiceLine, cls).__register__(module_name)
-        cursor = Transaction().cursor
-        table = TableHandler(cursor, cls, module_name)
+        cursor = Transaction().connection.cursor()
+        table = TableHandler(cls, module_name)
 
         # Migration from 1.0 invoice is no more required
         table.not_null_action('invoice', action='remove')
@@ -1673,10 +1661,6 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         return [(self.taxes, self.unit_price, self.quantity)]
 
     @property
-    def tax_type(self):
-        return self.invoice.tax_type
-
-    @property
     def tax_date(self):
         return self.invoice.tax_date
 
@@ -1732,7 +1716,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
             type_ = self.invoice.type
         else:
             type_ = self.invoice_type
-        if type_ in ('in_invoice', 'in_credit_note'):
+        if type_ == 'in':
             try:
                 self.account = self.product.account_expense_used
             except Exception:
@@ -1794,7 +1778,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         if (self.invoice and self.invoice.party
                 and self.invoice.type):
             party = self.invoice.party
-            if self.invoice.type in ('in_invoice', 'in_credit_note'):
+            if self.invoice.type == 'in':
                 tax_rule = party.supplier_tax_rule
             else:
                 tax_rule = party.customer_tax_rule
@@ -1905,7 +1889,7 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
             return res
         taxes = self._get_taxes().values()
         for tax in taxes:
-            if self.invoice.type in ('out_invoice', 'in_invoice'):
+            if tax['base'] >= 0:
                 base_code = tax['base_code']
                 amount = tax['base'] * tax['base_sign']
             else:
@@ -1942,22 +1926,20 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
             amount = self.amount
             res['amount_second_currency'] = None
             res['second_currency'] = None
-        if self.invoice.type in ('in_invoice', 'out_credit_note'):
-            if amount >= Decimal('0.0'):
-                res['debit'] = amount
-                res['credit'] = Decimal('0.0')
+        if amount >= 0:
+            if self.invoice.type == 'out':
+                res['debit'], res['credit'] = 0, amount
             else:
-                res['debit'] = Decimal('0.0')
-                res['credit'] = - amount
+                res['debit'], res['credit'] = amount, 0
         else:
-            if amount >= Decimal('0.0'):
-                res['debit'] = Decimal('0.0')
-                res['credit'] = amount
+            if self.invoice.type == 'out':
+                res['debit'], res['credit'] = -amount, 0
             else:
-                res['debit'] = - amount
-                res['credit'] = Decimal('0.0')
-            if res['amount_second_currency']:
-                res['amount_second_currency'] *= -1
+                res['debit'], res['credit'] = 0, -amount
+        if res['amount_second_currency']:
+            res['amount_second_currency'] = (
+                res['amount_second_currency'].copy_sign(
+                    res['debit'] - res['credit']))
         res['account'] = self.account.id
         if self.account.party_required:
             res['party'] = self.invoice.party.id
@@ -1971,10 +1953,10 @@ class InvoiceLine(ModelSQL, ModelView, TaxableMixin):
         Return values to credit line.
         '''
         res = {}
-        res['invoice_type'] = _CREDIT_TYPE[self.invoice_type]
         res['origin'] = str(self)
+        res['quantity'] = -self.quantity
 
-        for field in ('sequence', 'type', 'quantity', 'unit_price',
+        for field in ('sequence', 'type', 'invoice_type', 'unit_price',
                 'description'):
             res[field] = getattr(self, field)
 
@@ -2029,6 +2011,7 @@ class InvoiceTax(ModelSQL, ModelView):
             ])
     tax_sign = fields.Numeric('Tax Sign', digits=(2, 0), required=True)
     tax = fields.Many2One('account.tax', 'Tax',
+        ondelete='RESTRICT',
         domain=[
             ('company', '=', Eval('_parent_invoice', {}).get('company', 0)),
             ],
@@ -2044,7 +2027,7 @@ class InvoiceTax(ModelSQL, ModelView):
         cls._error_messages.update({
                 'modify': ('You can not modify tax "%(tax)s" from invoice '
                     '"%(invoice)s" because it is posted or paid.'),
-                'create': ('You can not add line "%(line)s" to invoice '
+                'create': ('You can not add tax to invoice '
                     '"%(invoice)s" because it is posted, paid or canceled.'),
                 'invalid_base_code_company': ('You can not create invoice '
                     '"%(invoice)s" on company "%(invoice_company)s" '
@@ -2059,8 +2042,7 @@ class InvoiceTax(ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
-        table = TableHandler(cursor, cls, module_name)
+        table = TableHandler(cls, module_name)
 
         super(InvoiceTax, cls).__register__(module_name)
 
@@ -2092,7 +2074,7 @@ class InvoiceTax(ModelSQL, ModelView):
     def default_tax_sign():
         return Decimal('1')
 
-    @fields.depends('tax', '_parent_invoice.party', '_parent_invoice.type')
+    @fields.depends('tax', '_parent_invoice.party', 'base')
     def on_change_tax(self):
         Tax = Pool().get('account.tax')
         if not self.tax:
@@ -2104,11 +2086,7 @@ class InvoiceTax(ModelSQL, ModelView):
         with Transaction().set_context(**context):
             tax = Tax(self.tax.id)
         self.description = tax.description
-        if self.invoice and self.invoice.type:
-            invoice_type = self.invoice.type
-        else:
-            invoice_type = 'out_invoice'
-        if invoice_type in ('out_invoice', 'in_invoice'):
+        if self.base >= 0:
             self.base_code = tax.invoice_base_code
             self.base_sign = tax.invoice_base_sign
             self.tax_code = tax.invoice_tax_code
@@ -2121,7 +2099,8 @@ class InvoiceTax(ModelSQL, ModelView):
             self.tax_sign = tax.credit_note_tax_sign
             self.account = tax.credit_note_account
 
-    @fields.depends('tax', 'base', 'amount', 'manual')
+    @fields.depends('tax', 'base', 'amount', 'manual',
+        '_parent_invoice.currency')
     def on_change_with_amount(self):
         Tax = Pool().get('account.tax')
         if self.tax and self.manual:
@@ -2130,7 +2109,10 @@ class InvoiceTax(ModelSQL, ModelView):
             for values in Tax.compute([tax], base, 1):
                 if (values['tax'] == tax
                         and values['base'] == base):
-                    return values['amount']
+                    amount = values['amount']
+                    if self.invoice.currency:
+                        amount = self.invoice.currency.round(amount)
+                    return amount
         return self.amount
 
     @classmethod
@@ -2140,7 +2122,10 @@ class InvoiceTax(ModelSQL, ModelView):
         '''
         for tax in taxes:
             if tax.invoice.state in ('posted', 'paid'):
-                cls.raise_user_error('modify')
+                cls.raise_user_error('modify', {
+                        'tax': tax.rec_name,
+                        'invoice': tax.invoice.rec_name,
+                        })
 
     def get_sequence_number(self, name):
         i = 1
@@ -2170,7 +2155,9 @@ class InvoiceTax(ModelSQL, ModelView):
                 invoice_ids.append(vals['invoice'])
         for invoice in Invoice.browse(invoice_ids):
             if invoice.state in ('posted', 'paid', 'cancel'):
-                cls.raise_user_error('create')
+                cls.raise_user_error('create', {
+                        'invoice': invoice.rec_name,
+                        })
         return super(InvoiceTax, cls).create(vlist)
 
     def get_move_line(self):
@@ -2192,22 +2179,20 @@ class InvoiceTax(ModelSQL, ModelView):
             amount = self.amount
             res['amount_second_currency'] = None
             res['second_currency'] = None
-        if self.invoice.type in ('in_invoice', 'out_credit_note'):
-            if amount >= Decimal('0.0'):
-                res['debit'] = amount
-                res['credit'] = Decimal('0.0')
+        if amount >= 0:
+            if self.invoice.type == 'out':
+                res['debit'], res['credit'] = 0, amount
             else:
-                res['debit'] = Decimal('0.0')
-                res['credit'] = - amount
+                res['debit'], res['credit'] = amount, 0
         else:
-            if amount >= Decimal('0.0'):
-                res['debit'] = Decimal('0.0')
-                res['credit'] = amount
+            if self.invoice.type == 'out':
+                res['debit'], res['credit'] = -amount, 0
             else:
-                res['debit'] = - amount
-                res['credit'] = Decimal('0.0')
-            if res['amount_second_currency']:
-                res['amount_second_currency'] *= -1
+                res['debit'], res['credit'] = 0, -amount
+        if res['amount_second_currency']:
+            res['amount_second_currency'] = (
+                res['amount_second_currency'].copy_sign(
+                    res['debit'] - res['credit']))
         res['account'] = self.account.id
         if self.account.party_required:
             res['party'] = self.invoice.party.id
@@ -2224,9 +2209,11 @@ class InvoiceTax(ModelSQL, ModelView):
         Return values to credit tax.
         '''
         res = {}
+        res['base'] = -self.base
+        res['amount'] = -self.amount
 
-        for field in ('description', 'sequence', 'base', 'amount',
-                'manual', 'base_sign', 'tax_sign'):
+        for field in ('description', 'sequence', 'manual', 'base_sign',
+                'tax_sign'):
             res[field] = getattr(self, field)
 
         for field in ('account', 'base_code', 'tax_code', 'tax'):
@@ -2295,8 +2282,7 @@ class InvoiceReport(Report):
             # If the invoice is posted or paid and the report not saved in
             # invoice_report_cache there was an error somewhere. So we save it
             # now in invoice_report_cache
-            if (invoice.state in ('posted', 'paid')
-                    and invoice.type in ('out_invoice', 'out_credit_note')):
+            if invoice.state in {'posted', 'paid'} and invoice.type == 'out':
                 invoice.invoice_report_format, invoice.invoice_report_cache = \
                     result[:2]
                 invoice.save()
@@ -2411,7 +2397,7 @@ class PayInvoiceAsk(ModelView):
             self.amount_writeoff += line.debit - line.credit
         for line in self.payment_lines:
             self.amount_writeoff += line.debit - line.credit
-        if self.invoice.type in ('in_invoice', 'out_credit_note'):
+        if self.invoice.type == 'in':
             self.amount_writeoff = - self.amount_writeoff - amount
         else:
             self.amount_writeoff = self.amount_writeoff - amount
@@ -2443,8 +2429,8 @@ class PayInvoice(Wizard):
                 })
 
     def get_reconcile_lines_for_amount(self, invoice, amount):
-        if invoice.type in ('in_invoice', 'out_credit_note'):
-            amount = -amount
+        if invoice.type == 'in':
+            amount *= -1
         return invoice.get_reconcile_lines_for_amount(amount)
 
     def default_start(self, fields):
@@ -2511,7 +2497,7 @@ class PayInvoice(Wizard):
             default['amount_writeoff'] += line.debit - line.credit
         for line in Line.browse(default['payment_lines']):
             default['amount_writeoff'] += line.debit - line.credit
-        if invoice.type in ('in_invoice', 'out_credit_note'):
+        if invoice.type == 'in':
             default['amount_writeoff'] = - default['amount_writeoff'] - amount
         else:
             default['amount_writeoff'] = default['amount_writeoff'] - amount
@@ -2546,8 +2532,8 @@ class PayInvoice(Wizard):
             amount_second_currency = self.start.amount
             second_currency = self.start.currency
 
-        if amount > invoice.amount_to_pay and \
-                self.ask.type != 'writeoff':
+        if (abs(amount) > abs(invoice.amount_to_pay)
+                and self.ask.type != 'writeoff'):
             self.raise_user_error('amount_greater_amount_to_pay',
                 (invoice.rec_name,))
 
@@ -2617,7 +2603,7 @@ class CreditInvoice(Wizard):
         for invoice in Invoice.browse(Transaction().context['active_ids']):
             if (invoice.state != 'posted'
                     or invoice.payment_lines
-                    or invoice.type in ('in_invoice', 'in_credit_note')):
+                    or invoice.type == 'in'):
                 default['with_refund'] = False
                 break
         return default
@@ -2637,7 +2623,7 @@ class CreditInvoice(Wizard):
                 if invoice.payment_lines:
                     self.raise_user_error('refund_with_payement',
                         (invoice.rec_name,))
-                if invoice.type in ('in_invoice', 'in_credit_note'):
+                if invoice.type == 'in':
                     self.raise_user_error('refund_supplier', invoice.rec_name)
 
         credit_invoices = Invoice.credit(invoices, refund=refund)
diff --git a/invoice.xml b/invoice.xml
index 06f6b99..fecc8ad 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -38,181 +38,93 @@ this repository contains the full copyright notices and license terms. -->
             <field name="act_window" ref="act_invoice_form"/>
         </record>
 
-        <record model="ir.action.act_window" id="act_invoice_out_invoice_form">
-            <field name="name">Invoices</field>
-            <field name="res_model">account.invoice</field>
-            <field name="domain" eval="[('type', '=', 'out_invoice')]" pyson="1"/>
-            <field name="context" eval="{'type': 'out_invoice'}" pyson="1"/>
-            <field name="search_value"></field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_out_invoice_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="invoice_view_tree"/>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_out_invoice_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="invoice_view_form"/>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_invoice_domain_draft">
-            <field name="name">Draft</field>
-            <field name="sequence" eval="10"/>
-            <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_invoice_domain_validated">
-            <field name="name">Validated</field>
-            <field name="sequence" eval="20"/>
-            <field name="domain" eval="[('state', '=', 'validated')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_invoice_domain_posted">
-            <field name="name">Posted</field>
-            <field name="sequence" eval="30"/>
-            <field name="domain" eval="[('state', '=', 'posted')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_invoice_domain_all">
-            <field name="name">All</field>
-            <field name="sequence" eval="9999"/>
-            <field name="domain"></field>
-            <field name="act_window" ref="act_invoice_out_invoice_form"/>
-        </record>
-        <menuitem parent="menu_invoices" action="act_invoice_out_invoice_form"
-            id="menu_invoice_out_invoice_form" sequence="1"/>
-
-        <record model="ir.action.act_window" id="act_invoice_out_credit_note_form">
-            <field name="name">Credit Notes</field>
+        <record model="ir.action.act_window" id="act_invoice_out_form">
+            <field name="name">Customer Invoices</field>
             <field name="res_model">account.invoice</field>
-            <field name="domain" eval="[('type', '=', 'out_credit_note')]" pyson="1"/>
-            <field name="context" eval="{'type': 'out_credit_note'}" pyson="1"/>
+            <field name="domain" eval="[('type', '=', 'out')]" pyson="1"/>
+            <field name="context" eval="{'type': 'out'}" pyson="1"/>
             <field name="search_value"></field>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_out_credit_note_form_view1">
+        <record model="ir.action.act_window.view" id="act_invoice_out_form_view1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="invoice_view_tree"/>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_out_credit_note_form_view2">
+        <record model="ir.action.act_window.view" id="act_invoice_out_form_view2">
             <field name="sequence" eval="20"/>
             <field name="view" ref="invoice_view_form"/>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_credit_note_domain_draft">
+        <record model="ir.action.act_window.domain" id="act_invoice_out_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
             <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_credit_note_domain_validated">
+        <record model="ir.action.act_window.domain" id="act_invoice_out_domain_validated">
             <field name="name">Validated</field>
             <field name="sequence" eval="20"/>
             <field name="domain" eval="[('state', '=', 'validated')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_credit_note_domain_posted">
+        <record model="ir.action.act_window.domain" id="act_invoice_out_domain_posted">
             <field name="name">Posted</field>
             <field name="sequence" eval="30"/>
             <field name="domain" eval="[('state', '=', 'posted')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_out_credit_note_domain_all">
+        <record model="ir.action.act_window.domain" id="act_invoice_out_domain_all">
             <field name="name">All</field>
             <field name="sequence" eval="9999"/>
             <field name="domain"></field>
-            <field name="act_window" ref="act_invoice_out_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_out_form"/>
         </record>
-        <menuitem parent="menu_invoices" action="act_invoice_out_credit_note_form"
-            id="menu_invoice_out_credit_note_form" sequence="2"/>
+        <menuitem parent="menu_invoices" action="act_invoice_out_form"
+            id="menu_invoice_out_form" sequence="1"/>
 
-        <record model="ir.action.act_window" id="act_invoice_in_invoice_form">
+        <record model="ir.action.act_window" id="act_invoice_in_form">
             <field name="name">Supplier Invoices</field>
             <field name="res_model">account.invoice</field>
-            <field name="domain" eval="[('type', '=', 'in_invoice')]" pyson="1"/>
-            <field name="context" eval="{'type': 'in_invoice'}" pyson="1"/>
-            <field name="search_value"></field>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_in_invoice_form_view1">
-            <field name="sequence" eval="10"/>
-            <field name="view" ref="invoice_view_tree"/>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.view" id="act_invoice_in_invoice_form_view2">
-            <field name="sequence" eval="20"/>
-            <field name="view" ref="invoice_view_form"/>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_invoice_domain_draft">
-            <field name="name">Draft</field>
-            <field name="sequence" eval="10"/>
-            <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_invoice_domain_validated">
-            <field name="name">Validated</field>
-            <field name="sequence" eval="20"/>
-            <field name="domain" eval="[('state', '=', 'validated')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_invoice_domain_posted">
-            <field name="name">Posted</field>
-            <field name="sequence" eval="30"/>
-            <field name="domain" eval="[('state', '=', 'posted')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_invoice_domain_all">
-            <field name="name">All</field>
-            <field name="sequence" eval="9999"/>
-            <field name="domain"></field>
-            <field name="act_window" ref="act_invoice_in_invoice_form"/>
-        </record>
-        <menuitem parent="menu_invoices" action="act_invoice_in_invoice_form"
-            id="menu_invoice_in_invoice_form" sequence="3"/>
-
-        <record model="ir.action.act_window" id="act_invoice_in_credit_note_form">
-            <field name="name">Supplier Credit Notes</field>
-            <field name="res_model">account.invoice</field>
-            <field name="domain" eval="[('type', '=', 'in_credit_note')]" pyson="1"/>
-            <field name="context" eval="{'type': 'in_credit_note'}" pyson="1"/>
+            <field name="domain" eval="[('type', '=', 'in')]" pyson="1"/>
+            <field name="context" eval="{'type': 'in'}" pyson="1"/>
             <field name="search_value"></field>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_in_credit_note_form_view1">
+        <record model="ir.action.act_window.view" id="act_invoice_in_form_view1">
             <field name="sequence" eval="10"/>
             <field name="view" ref="invoice_view_tree"/>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <record model="ir.action.act_window.view" id="act_invoice_in_credit_note_form_view2">
+        <record model="ir.action.act_window.view" id="act_invoice_in_form_view2">
             <field name="sequence" eval="20"/>
             <field name="view" ref="invoice_view_form"/>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_credit_note_domain_draft">
+        <record model="ir.action.act_window.domain" id="act_invoice_in_domain_draft">
             <field name="name">Draft</field>
             <field name="sequence" eval="10"/>
             <field name="domain" eval="[('state', '=', 'draft')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_credit_note_domain_validated">
+        <record model="ir.action.act_window.domain" id="act_invoice_in_domain_validated">
             <field name="name">Validated</field>
             <field name="sequence" eval="20"/>
             <field name="domain" eval="[('state', '=', 'validated')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_credit_note_domain_posted">
+        <record model="ir.action.act_window.domain" id="act_invoice_in_domain_posted">
             <field name="name">Posted</field>
             <field name="sequence" eval="30"/>
             <field name="domain" eval="[('state', '=', 'posted')]" pyson="1"/>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <record model="ir.action.act_window.domain" id="act_invoice_in_credit_note_domain_all">
+        <record model="ir.action.act_window.domain" id="act_invoice_in_domain_all">
             <field name="name">All</field>
             <field name="sequence" eval="9999"/>
             <field name="domain"></field>
-            <field name="act_window" ref="act_invoice_in_credit_note_form"/>
+            <field name="act_window" ref="act_invoice_in_form"/>
         </record>
-        <menuitem parent="menu_invoices" action="act_invoice_in_credit_note_form"
-            id="menu_invoice_in_credit_note_form" sequence="4"/>
+        <menuitem parent="menu_invoices" action="act_invoice_in_form"
+            id="menu_invoice_in_form" sequence="3"/>
 
         <record model="ir.model.access" id="access_invoice">
             <field name="model" search="[('model', '=', 'account.invoice')]"/>
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 63234ae..ed6ef46 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,64 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Фирма"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Настройки"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Създадено на"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Създадено от"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Метод"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Условие за плащане"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Последователност"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Променено на"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Променено от"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Последователност за кредитно известие на доставчик"
@@ -350,9 +292,10 @@ msgctxt "field:account.invoice,number:"
 msgid "Number"
 msgstr "Номер"
 
+#, fuzzy
 msgctxt "field:account.invoice,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Източник"
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
@@ -760,9 +703,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Условие за плащане"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1023,10 +966,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "За подреждане на редовете във възходящ ред"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Фактура"
@@ -1093,21 +1032,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Фактури"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Кредитно известие на доставчик"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Фактури на доставчик"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Кредитни известия"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Фактури"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1133,95 +1065,43 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Проект"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Публикуван"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Проверен"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Проект"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Публикуван"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Проверен"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Проект"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Публикуван"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Проверен"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Проект"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Публикуван"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Проверен"
 
@@ -1229,21 +1109,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Фактура"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Кредитно известие на доставчик"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Фактури на доставчик"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Кредитни известия"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Фактури"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1262,139 +1135,91 @@ msgid "Payment Terms"
 msgstr "Условия за плащане"
 
 #, fuzzy
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Сума"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Основа"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Кредитно известие N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Дата"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Дата:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Описание:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Проект на кредитно известие"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Проект на фактура"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Проект на кредитно известие на доставчик"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Проект на фактура за доставчик"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Фактура N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Условие за плащане"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "ПРО-ФОРМА на кредитно известие"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "ПРО-ФОРМА фактура"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Количество"
 
 #, fuzzy
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Препратка"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Кредитно известие на доставчик N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Фактура за доставчик N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Данък"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Данъци"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Данъци:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Общо (без данъци):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Общо:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Единична цена"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "ДДС:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Отказан"
@@ -1418,40 +1243,24 @@ msgid "Validated"
 msgstr "Проверен"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Кредитно известие"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Фактура"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Кредитно известие на доставчик"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Фактура за доставчик"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Кредитно известие"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Фактура"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Кредитно известие на доставчик"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Фактура за доставчик"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1584,18 +1393,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Сряда"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Сигурни ли сте че искате да кредитирате тази/тези фактура/фактури?"
@@ -1637,6 +1434,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Ред от условие за плащане"
 
@@ -1644,9 +1445,10 @@ msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "Ред от условие за плащане"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
@@ -1694,11 +1496,12 @@ msgstr ""
 
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Отказ"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "Проект"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
@@ -1712,9 +1515,10 @@ msgctxt "view:account.invoice:"
 msgid "Other Info"
 msgstr "Друга информация"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Pay"
-msgstr ""
+msgstr "Плащане"
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 85f1e86..87c3d37 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -74,10 +74,11 @@ msgstr ""
 "No podeu crear un pagament parcial a la factura \"%s\" per un import més "
 "gran que l'import a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Percentatge i divisor no són consistents a la línia \"%(line)s\" del termini"
 " de pagament \"%(term)s\"."
@@ -95,10 +96,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta el romanent de la línia del termini de pagament \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "No podeu afegir la línia \"%(line)s\" a la factura \"%(invoice)s\" perquè "
 "està comptabilitzada, pagada o cancel·lada."
@@ -181,8 +183,9 @@ msgstr ""
 "El compte haver del diari \"%(journal)s\" és el mateix que el compte de la "
 "factura \"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta el compte haver del diari \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -237,54 +240,6 @@ msgstr ""
 "No podeu canviar la seqüència de factures al període \"%s\" perquè ja hi ha "
 "factures comptabilitzades en aquest període."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Arrodoniment impostos"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Arrodoniment impostos"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuració"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Data creació"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Usuari creació"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Mètode"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Seqüència"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Data modificació"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Usuari modificació"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Seqüència d'abonament de proveïdor"
@@ -801,9 +756,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Termini de pagament"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Percentatge"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1045,10 +1000,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Serveix per ordenar les línies de forma ascendent."
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuració arrodoniment impostos"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1113,21 +1064,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Factures"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Abonaments de proveïdor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures de proveïdor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Abonaments"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Factures"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1153,83 +1097,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prova termini de pagament"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Tot"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Esborrany"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Comptabilitzada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Tot"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Esborrany"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Comptabilitzada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Tot"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Esborrany"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Comptabilitzada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Tot"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Esborrany"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Comptabilitzada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
@@ -1237,21 +1143,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Abonaments de proveïdor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures de proveïdor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Abonaments"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Factures"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1269,138 +1168,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Terminis de pagament"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Import"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Abonament Núm.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Data"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Data:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descripció"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descripció:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Abonament esborrany"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Factura esborrany"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Abonament de proveïdor esborrany"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Factura de proveïdor esborrany"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factura Núm.:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Termini de pagament"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Abonament Pro Forma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Factura Pro Forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Quantitat"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referència"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Abonament de proveïdor Núm.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Factura de proveïdor Núm.:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impost"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impostos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Impostos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sense impostos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Preu unitat"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "CIF/NIF:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Abonament de proveïdor validat"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Factura de proveïdor validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Per document"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Per línia"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Per document"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Per línia"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancel·lada"
@@ -1422,40 +1273,24 @@ msgid "Validated"
 msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Abonament"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Abonament de proveïdor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveïdor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Abonament"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Abonament de proveïdor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveïdor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1581,18 +1416,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Dimecres"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuració arrodoniment impostos"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuració arrodoniment impostos"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Esteu segur d'abonar aquestes factures?"
@@ -1634,6 +1457,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Increments relatius línia de termini de pagament"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Línia termini de pagament"
 
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index d668971..5082bd8 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,54 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr ""
@@ -748,8 +700,8 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
@@ -992,10 +944,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr ""
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr ""
@@ -1060,20 +1008,12 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
@@ -1100,83 +1040,37 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr ""
 
@@ -1184,20 +1078,12 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
@@ -1216,138 +1102,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr ""
@@ -1369,19 +1207,11 @@ msgid "Validated"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,19 +1219,11 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
@@ -1528,18 +1350,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1581,6 +1391,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 662e1f6..7667d34 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -81,10 +81,11 @@ msgstr ""
 "Für Rechnung \"%s\" kann keine Teilzahlung erstellt werden, deren Betrag "
 "größer als der zu zahlende Betrag ist."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Werte für Prozentsatz und Divisor sind nicht konsistent in Zeile "
 "\"%(line)s\" von Zahlungsbedingung \"%(term)s\"."
@@ -103,10 +104,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Fehlende Restzeile in Zahlungsbedingung \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "Zu Rechnung \"%(invoice)s\" kann Position \"%(line)s\" nicht mehr "
 "hinzugefügt werden, da sie festgeschrieben, bezahlt oder annulliert ist."
@@ -191,8 +193,9 @@ msgstr ""
 "Das Habenkonto in Journal \"%(journal)s\" ist dasselbe wie das von Rechnung "
 "\"%(invoice)s\"'."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Fehlendes Habenkonto in Journal \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -248,54 +251,6 @@ msgstr ""
 "geändert werden, weil es bereits festgeschriebene Rechnungen in diesem "
 "Buchungszeitraum gibt."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Steuerrundung"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Steuerrundungen"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Unternehmen"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Einstellungen"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Erstellungsdatum"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Erstellt durch"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Methode"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Name"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Reihenfolge"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Zuletzt geändert"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Letzte Änderung durch"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Nummernkreis Lieferantengutschriften"
@@ -812,9 +767,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Prozentsatz"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1058,10 +1013,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Ordnet Positionen in aufsteigender Reihenfolge"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Buchhaltung Konfiguration Steuerrundung"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Rechnung"
@@ -1126,21 +1077,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Rechnungen"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Gutschriften von Lieferanten"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Rechnungseingang"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Gutschriften an Kunden"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Rechnungen"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1166,83 +1110,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Zahlungsbedingung testen"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Alle"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Entwurf"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Festgeschrieben"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Geprüft"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Alle"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Entwurf"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Festgeschrieben"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Geprüft"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Alle"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Entwurf"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Festgeschrieben"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Geprüft"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Alle"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Entwurf"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Festgeschrieben"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Geprüft"
 
@@ -1250,21 +1156,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Rechnung"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Gutschriften von Lieferanten"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Rechnungseingang"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Gutschriften an Kunden"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Rechnungsausgang"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1282,138 +1181,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Zahlungsbedingungen"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Betrag"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Netto"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Gutschrift Nr.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Fällig am"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Beschreibung"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Gutschrift (Entwurf)"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Rechnung (Entwurf)"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Gutschrift (Entwurf)"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Rechnung (Entwurf)"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Rechnung Nr.:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Zahlungsbedingung"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Gutschrift Pro Forma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Rechnung Pro Forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Anzahl"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Beleg-Nr."
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Gutschrift Nr.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Rechnung Nr.:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Steuer"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Steuern"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Steuern"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Netto"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Rechnungsbetrag"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Einzelpreis"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "USt-ID-Nr:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Geprüfte Lieferantengutschrift"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Geprüfte Lieferantenrechnung"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Pro Dokument"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Pro Position"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Pro Dokument"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Pro Position"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Annulliert"
@@ -1435,40 +1286,24 @@ msgid "Validated"
 msgstr "Geprüft"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Gutschrift an Kunde"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Kundenrechnung"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Gutschrift von Lieferant"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Lieferantenrechnung"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Kundengutschrift"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Kundenrechnung"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Lieferantengutschrift"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Lieferantenrechnung"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1594,18 +1429,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Buchhaltung Konfiguration Steuerrundung"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Buchhaltung Konfiguration Steuerrundungen"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Rechnung"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Wollen Sie diese Rechnung(en) wirklich gutschreiben?"
@@ -1647,6 +1470,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Zahlungsbedingungsposition Zeitspannen"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Zahlungsbedingungsposition"
 
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 1a43e23..6a8f554 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -73,10 +73,11 @@ msgstr ""
 "No puede crear un pago parcial en la factura «%s» por un importe mayor al "
 "importe a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Porcentaje y divisor no son consistentes en la línea «%(line)s» del término "
 "de pago «%(term)s»."
@@ -93,10 +94,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de resto en el término de pago «%s»."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "No puede añadir la línea «%(line)s» a la factura «%(invoice)s» porque está "
 "confirmada, pagada o cancelada."
@@ -177,8 +179,9 @@ msgstr ""
 "La cuenta crédito del diario «%(journal)s» tiene la misma cuenta de la "
 "factura «%(invoice)s»."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta crédito del diario «%s»."
 
 msgctxt "error:account.invoice:"
@@ -233,54 +236,6 @@ msgstr ""
 "No puede cambiar la secuencia de facturas en el período «%s» porque ya hay "
 "facturas confirmadas en este período"
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Redondeo de impuesto"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Redondeos de impuesto"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuración"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Secuencia de nota de crédito de proveedor"
@@ -797,9 +752,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Término de pago"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1041,10 +996,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Usar para ordenar las líneas ascendentemente"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración contable de Redondeo de impuesto"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1109,21 +1060,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de crédito de proveedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de crédito"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1149,83 +1093,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prueba de término de pago"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
@@ -1233,21 +1139,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de crédito de proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de crédito"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1265,138 +1164,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Términos de pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Importe"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Nota de crédito Nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descripción:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Nota de crédito borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Factura borrador"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Nota de crédito de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Factura de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factura Nº:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Término de pago"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Nota de crédito pro forma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Factura pro forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referencia"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Nota de crédito de proveedor Nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Factura de proveedor Nº:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impuesto"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Impuestos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sin impuestos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Precio unidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "CUIT:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Nota de crédito de proveedor validada"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Factura de proveedor validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por línea"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por línea"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancelada"
@@ -1418,40 +1269,24 @@ msgid "Validated"
 msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1577,18 +1412,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración contable de Redondeo de impuesto"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuración contable de Redondeos de impuesto"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "¿Está seguro de abonar esta/s factura/s?"
@@ -1630,6 +1453,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Línea de término de pago - Incrementos relativos"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Línea del término de pago"
 
diff --git a/locale/es_CO.po b/locale/es_CO.po
index 0d2b620..59489d4 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -75,10 +75,11 @@ msgstr ""
 "En la factura \"%s\" usted no puede crear un pago parcial con una cantidad "
 "mayor a la cantidad total a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Porcentaje y Divisor no son consistentes en línea \"%(line)s\" de forma de "
 "pago \"%(term)s\"."
@@ -95,10 +96,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta linea de residuo en forma de pago \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "No puede agregar la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
 "la factura está contabilizada, pagada o cancelada."
@@ -181,8 +183,9 @@ msgstr ""
 "¡La cuenta crédito en el libro diario \"%(journal)s\" es la misma que la "
 "cuenta de factura \"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta credito en el libro diario \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -235,54 +238,6 @@ msgstr ""
 "No puede cambiar la secuencia de factura en el período \"%s\" porque hay una"
 " factura contabilizada en este período"
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Redondeo de Impuesto"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Redondeo de Impuestos"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Compañía"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuración"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Fecha de Creación"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Creado por Usuario"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Fecha de Modificación"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Modificado por Usuario"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Secuencia de Nota Crédito de Proveedor"
@@ -799,9 +754,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Forma de Pago"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1043,10 +998,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Para ordenar las líneas ascendentemente"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración de Redondeo de Impuesto"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1111,21 +1062,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas Crédito del Proveedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de Proveedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas Crédito"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1151,83 +1095,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Test de Forma de Pago"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Contabilizado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Contabilizado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
@@ -1235,21 +1141,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas Crédito del Proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de Proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas Crédito"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas de Venta"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1267,138 +1166,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Formas de Pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Valor"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Nota Crédito N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descripción:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Nota Crédito en Borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Factura en Borrador"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Nota Crédito de Proveedor en Borrador"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Factura de Proveedor en Borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factura N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Forma de Pago"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Nota Crédito Proforma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Factura Proforma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referencia"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Nota Crédito del Proveedor N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Factura del Proveedor N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impuesto"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Impuestos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sin impuestos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Precio Unitario"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "NIT:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Nota Credito de Proveedor Validada"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Factura de Proveedor Validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por Documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por Línea"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por Documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por Línea"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Anulada"
@@ -1420,40 +1271,24 @@ msgid "Validated"
 msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Nota Crédito"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Nota Crédito del Proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Nota Crédito"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura de Venta"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Nota Crédito del Proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1579,18 +1414,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración de Redondeo de Impuesto"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuración de Redondeo de Impuestos"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Esta seguro que desea acreditar esta(s) facturas?"
@@ -1632,6 +1455,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Deltas Relativos de Forma de Pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Línea de Forma de Pago"
 
@@ -1707,9 +1534,10 @@ msgctxt "view:account.invoice:"
 msgid "Other Info"
 msgstr "Info Adicional"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Pay"
-msgstr ""
+msgstr "_Pago"
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
diff --git a/locale/es_EC.po b/locale/es_EC.po
index 4996b6b..8648f20 100644
--- a/locale/es_EC.po
+++ b/locale/es_EC.po
@@ -18,20 +18,20 @@ msgstr ""
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it has payments."
-msgstr "No puede acreditar con devolución la factura \"%s\" porque tiene pagos."
+msgstr "No puede abonar con devolución la factura \"%s\" porque tiene pagos."
 
 msgctxt "error:account.invoice.credit:"
 msgid ""
 "You can not credit with refund invoice \"%s\" because it is a supplier "
 "invoice/credit note."
 msgstr ""
-"No puede acreditar con devolución la factura \"%s\" porque es una "
-"factura/nota de crédito de proveedor."
+"No puede abonar con devolución la factura \"%s\" porque es una factura/nota "
+"de crédito de proveedor."
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it is not posted."
 msgstr ""
-"No puede acreditar con devolución la factura \"%s\" porque no está "
+"No puede abonar con devolución la factura \"%s\" porque no está "
 "contabilizada."
 
 msgctxt "error:account.invoice.line:"
@@ -47,8 +47,8 @@ msgid ""
 "You can not add a line to invoice \"%(invoice)s\" that is posted, paid or "
 "cancelled."
 msgstr ""
-"No puede añadir una línea a la factura \"%(invoice)s\" que está confirmada, "
-"pagada o cancelada."
+"No puede agregar una línea a la factura \"%(invoice)s\" que está confirmada,"
+" pagada o cancelada."
 
 msgctxt "error:account.invoice.line:"
 msgid ""
@@ -74,10 +74,11 @@ msgstr ""
 "No puede crear un pago parcial en la factura \"%s\" con un importe mayor al "
 "importe a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Porcentaje y Divisor no son consistentes en la línea \"%(line)s\" del "
 "término de pago \"%(term)s\"."
@@ -94,12 +95,13 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de remanente en el término de pago \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
-"No puede añadir la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
+"No puede agregar la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
 "está contabilizada, pagada o cancelada."
 
 msgctxt "error:account.invoice.tax:"
@@ -180,8 +182,9 @@ msgstr ""
 "La cuenta de crédito del libro diario \"%(journal)s\" tiene la misma cuenta "
 "de la factura \"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta de crédito del libro diario \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -236,54 +239,6 @@ msgstr ""
 "No puede cambiar la secuencia de factura en el período \"%s\" porque ya hay "
 "una factura contabilizada en este período"
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Redondeo de impuesto"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Redondeos de impuesto"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuración"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Fecha de creación"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Creado por usuario"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Fecha de modificación"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Modificado por usuario"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Secuencia de nota crédito de proveedor"
@@ -800,9 +755,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Término de pago"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1044,10 +999,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Utilice para ordenar las líneas ascendentemente"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración contable de redondeo de impuesto"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1112,21 +1063,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de crédito de proveedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de crédito"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1134,7 +1078,7 @@ msgstr "Términos de pago"
 
 msgctxt "model:ir.action,name:credit"
 msgid "Credit"
-msgstr "Acreditar"
+msgstr "Generar nota de crédito"
 
 msgctxt "model:ir.action,name:print"
 msgid "Invoice"
@@ -1152,83 +1096,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Prueba de término de pago"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
@@ -1236,21 +1142,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de Crédito de Proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Facturas de Proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de Crédito"
+msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1268,138 +1167,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Términos de Pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Valor"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Nota de crédito N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descripción:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Nota de crédito borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Factura borrador"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Nota crédito de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Factura de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factura N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Término de pago"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Nota de crédito proforma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Factura proforma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referencia"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Nota de crédito de proveedor N°:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Factura de proveedor N°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impuesto"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Impuestos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sin impuestos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Precio unitario"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "CI/RUC:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Nota de crédito de proveedor validada"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Factura de proveedor validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por línea"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por línea"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancelada"
@@ -1421,40 +1272,24 @@ msgid "Validated"
 msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1580,21 +1415,9 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración contable de redondeo de impuesto"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuración contable de redondeos de impuesto"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
-msgstr "¿Está seguro que desea acreditar esta(s) factura(s)?"
+msgstr "¿Está seguro que desea abonar esta(s) factura(s)?"
 
 msgctxt "view:account.invoice.credit.start:"
 msgid "Credit Invoice"
@@ -1633,6 +1456,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Incrementos relativos de línea de término de pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Línea del término de pago"
 
@@ -1750,7 +1577,7 @@ msgstr "Términos de pago"
 
 msgctxt "wizard_button:account.invoice.credit,start,credit:"
 msgid "Credit"
-msgstr "Acreditar"
+msgstr "Abonar"
 
 msgctxt "wizard_button:account.invoice.credit,start,end:"
 msgid "Cancel"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index ae179d9..9237a7d 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -72,10 +72,11 @@ msgstr ""
 "No puede crear un pago parcial en la factura \"%s\" por un importe mayor al "
 "importe a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Porcentaje y divisor no son consistentes en la línea \"%(line)s\" del plazo "
 "de pago \"%(term)s\"."
@@ -92,10 +93,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de remanente en el plazo de pago \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "No puede añadir la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
 "está contabilizada, pagada o cancelada."
@@ -178,8 +180,9 @@ msgstr ""
 "La cuenta haber del diario \"%(journal)s\" tiene la misma cuenta de la "
 "factura \"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta haber del diario \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -234,54 +237,6 @@ msgstr ""
 "No puede cambiar la secuencia de facturas en el período \"%s\" porque ya hay"
 " facturas contabilizadas en este período."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Redondeo impuestos"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Redondeo impuestos"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuración"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Secuencia de factura de abono de proveedor"
@@ -798,9 +753,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1042,10 +997,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Sirve para ordenar las líneas de forma ascendente."
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración redondeo impuestos"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1110,21 +1061,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Facturas de abono de proveedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Facturas de abono"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1150,83 +1094,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Probar plazo de pago"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
@@ -1234,21 +1140,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Facturas de abono de proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Facturas de abono"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1266,138 +1165,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Plazos de pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Importe"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Factura de abono Nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Fecha:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descripción:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Factura de abono borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Factura borrador"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Factura de abono de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Factura de proveedor borrador"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factura Nº:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Factura de abono Pro Forma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Factura Pro Forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Cantidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referencia"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Factura de abono de proveedor Nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Factura de proveedor Nº:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impuesto"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Impuestos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sin impuestos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Precio unidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "CIF/NIF:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Factura de abono de proveedor validada"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Factura de proveedor validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por línea"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por línea"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancelada"
@@ -1419,40 +1270,24 @@ msgid "Validated"
 msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Factura de abono"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Factura de abono de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Factura de abono"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Factura de abono de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1578,18 +1413,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración redondeo impuestos"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuración redondeo impuestos"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Factura"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "¿Está seguro de abonar estas facturas?"
@@ -1631,6 +1454,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Incrementos relativos línea de plazo de pago"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Línea del plazo de pago"
 
diff --git a/locale/es_MX.po b/locale/es_MX.po
index b0746a6..9a7adc4 100644
--- a/locale/es_MX.po
+++ b/locale/es_MX.po
@@ -72,10 +72,11 @@ msgstr ""
 "No puede crear un pago parcial en la factura \"%s\" por un importe mayor al "
 "importe a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Porcentaje y divisor no son consistentes en la línea \"%(line)s\" del plazo "
 "de pago \"%(term)s\"."
@@ -92,10 +93,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Falta la línea de remanente en el plazo de pago \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "No puede añadir la línea \"%(line)s\" a la factura \"%(invoice)s\" porque "
 "está contabilizada, pagada o cancelada."
@@ -178,8 +180,9 @@ msgstr ""
 "La cuenta haber del diario \"%(journal)s\" tiene la misma cuenta de la "
 "factura \"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta la cuenta haber del diario \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -234,54 +237,6 @@ msgstr ""
 "No puede cambiar la secuencia de facturas en el período \"%s\" porque ya hay"
 " facturas contabilizadas en este período."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Redondeo impuestos"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Redondeo impuestos"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuración"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Fecha creación"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Usuario creación"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nombre"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Secuencia"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Fecha modificación"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Usuario modificación"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Secuencia de nota de crédito de proveedor"
@@ -798,9 +753,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentaje"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1042,10 +997,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Sirve para ordenar las líneas de forma ascendente."
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuración redondeo impuestos"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Factura"
@@ -1110,21 +1061,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Facturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de crédito de proveedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de crédito"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1150,83 +1094,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Probar plazo de pago"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Todo"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Borrador"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Contabilizada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validada"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todo"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Borrador"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Contabilizada"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validada"
 
@@ -1234,21 +1140,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Factura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de crédito de proveedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Facturas de proveedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de crédito"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Facturas"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1266,138 +1165,105 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Plazos de pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Amount"
-msgstr ""
+msgstr "Importe"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Base"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
+msgstr "Base"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Date:"
-msgstr ""
+msgstr "Fecha"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Description:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
+msgstr "Descripción"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
+msgstr "Plazo de pago"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Reference"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
+msgstr "Referencia"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
-msgstr ""
+msgstr "Factura de proveedor"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Tax"
-msgstr ""
+msgstr "Impuesto"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Taxes"
-msgstr ""
+msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
-msgstr ""
+msgstr "Impuestos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Total:"
-msgstr ""
+msgstr "Total"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
-msgstr ""
+msgstr "Precio unidad"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por línea"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por línea"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancelada"
@@ -1419,40 +1285,24 @@ msgid "Validated"
 msgstr "Validada"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Nota de crédito"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Factura"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de crédito de proveedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1578,77 +1428,81 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Miércoles"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.credit.start:"
 msgid "Credit Invoice"
-msgstr ""
+msgstr "Nueva nota de crédito"
 
 msgctxt "view:account.invoice.line:"
 msgid "General"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Line"
-msgstr ""
+msgstr "Línea de factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Línea de factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.line:"
 msgid "Notes"
-msgstr ""
+msgstr "Nota"
 
+#, fuzzy
 msgctxt "view:account.invoice.pay.ask:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Pagar factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.pay.start:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Pagar factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Delta"
-msgstr ""
+msgstr "Incremento relativo línea de plazo de pago"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
+msgstr "Incremento relativo línea de plazo de pago"
+
+msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Línea del plazo de pago"
 
 msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "Plazos de pago"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Plazo de pago"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Plazos de pago"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "Print Invoice"
@@ -1662,21 +1516,25 @@ msgctxt "view:account.invoice.print.warning:"
 msgid "You have selected more than one invoice to print."
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Impuesto de factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Taxes"
-msgstr ""
+msgstr "Impuestos de factura"
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
-msgstr ""
+msgstr "Código de impuesto"
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Taxes"
-msgstr ""
+msgstr "Impuestos"
 
 msgctxt "view:account.invoice:"
 msgid "Also known as Pro Forma"
@@ -1686,21 +1544,25 @@ msgctxt "view:account.invoice:"
 msgid "Are you sure to cancel the invoice?"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Invoices"
-msgstr ""
+msgstr "Todas las facturas"
 
 msgctxt "view:account.invoice:"
 msgid "Other Info"
@@ -1718,33 +1580,38 @@ msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
-msgstr ""
+msgstr "Validada"
 
 msgctxt "view:account.move.line:"
 msgid "Amount Second Currency"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Credit"
-msgstr ""
+msgstr "Abonar"
 
 msgctxt "view:account.move.line:"
 msgid "Debit"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Lines to Pay"
-msgstr ""
+msgstr "Líneas a pagar"
 
+#, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
+#, fuzzy
 msgctxt "view:party.party:"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Plazos de pago"
 
 msgctxt "wizard_button:account.invoice.credit,start,credit:"
 msgid "Credit"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 9f9eb8f..42e5a9b 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -77,10 +77,11 @@ msgstr ""
 "Sur la facture « %s » vous ne pouvez créer un paiement partiel suppérieur au"
 " montant qu'il reste à payer."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Pourcentage et diviseur sont inconsistant sur la ligne « %(line)s » de la "
 "condition de paiement « %(term)s »."
@@ -103,10 +104,11 @@ msgstr ""
 "Une ligne de type « reste » est manquante sur la condition de paiement « %s "
 "»."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "Vous ne pouvez ajouter la ligne « %(line)s » à la facture « %(invoice)s » "
 "car elle est posté, payée ou annulée."
@@ -189,8 +191,9 @@ msgstr ""
 "Le compte de crédit du journal « %(journal)s » est le même que compte de la "
 "facture « %(invoice)s »."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Le compte de crédit du journal « %s » est absent."
 
 msgctxt "error:account.invoice:"
@@ -244,54 +247,6 @@ msgstr ""
 "Vous ne pouvez changer la séquence de facture dans la période « %s » car il "
 "y a déjà une facture postée pour cette période"
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Arrondi de taxe"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Arrondi de taxe"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Société"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuration"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Date de création"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Créé par"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Méthode"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nom"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Séquence"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Date de mise à jour"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Mis à jour par"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Séquence de note de crédit fournisseur"
@@ -808,9 +763,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Condition de paiement"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Pourcentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1052,10 +1007,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Utilisé pour trier les lignes en ordre croissant"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuration comptable d'arrondi de taxe"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Facture"
@@ -1120,21 +1071,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Factures"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notes de crédit fournisseur"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures fournisseur"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notes de crédit"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Factures"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1160,83 +1104,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Test de condition de paiement"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Toutes"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validé"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Toutes"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Brouillon"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Posté"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validé"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Toutes"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Brouillon"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Posté"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validé"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Toutes"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Brouillon"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Posté"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validé"
 
@@ -1244,21 +1150,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Facture"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notes de crédit fournisseur"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Factures fournisseur"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notes de crédit"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Factures"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1276,138 +1175,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Conditions de paiement"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr " :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Montant"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "N° de note de crédit :"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Date"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Date :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Description"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Description :"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Note de crédit brouillon"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Facture brouillon"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Note de crédit fournisseur brouillon"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Facture fournisseur brouillon"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "N° de facture :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Condition de paiement"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Note de crédit pro forma"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Facture pro forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Quantité"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Référence"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "N° de note de crédit fournisseur :"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "N° de facture fournisseur :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Taxe"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Taxes"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Taxes :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (hors-taxes) :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total :"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Prix unitaire"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "TVA :"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Note de crédit fournisseur validée"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Facture fournisseur validée"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Par document"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Par ligne"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Par document"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Par ligne"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Annulé"
@@ -1429,40 +1280,24 @@ msgid "Validated"
 msgstr "Validé"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Note de crédit"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Facture"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Note de crédit fournisseur"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Facture fournisseur"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Note de crédit"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Facture"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Note de crédit fournisseur"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Facture fournisseur"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1588,18 +1423,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Mercredi"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuration comptable d'arrondi de taxe"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuration comptable d'arrondi de taxe"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Facture"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Êtes-vous sûr de créditer cette/ces facture(s) ?"
@@ -1641,6 +1464,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Deltas relatifs de ligne de condition de paiement"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Ligne de condition de paiement"
 
diff --git a/locale/hu_HU.po b/locale/hu_HU.po
index d668971..5082bd8 100644
--- a/locale/hu_HU.po
+++ b/locale/hu_HU.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,54 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr ""
@@ -748,8 +700,8 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
@@ -992,10 +944,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr ""
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr ""
@@ -1060,20 +1008,12 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
@@ -1100,83 +1040,37 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr ""
 
@@ -1184,20 +1078,12 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
@@ -1216,138 +1102,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr ""
@@ -1369,19 +1207,11 @@ msgid "Validated"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,19 +1219,11 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
@@ -1528,18 +1350,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1581,6 +1391,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr ""
 
diff --git a/locale/it_IT.po b/locale/it_IT.po
index d668971..4e30d2d 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -5,82 +5,107 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 msgctxt "error:account.fiscalyear:"
 msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same invoice sequence."
 msgstr ""
+"Gli esercizi \"%(first)s\" e \"%(second)s\" hanno la stessa sequenza di "
+"fatturazione"
 
 msgctxt "error:account.fiscalyear:"
 msgid ""
 "You can not change invoice sequence in fiscal year \"%s\" because there are "
 "already posted invoices in this fiscal year."
 msgstr ""
+"La sequenza di fatturazione nell'esercizio \"%s\" non è modificabile perché "
+"ci sono già fatture registrate"
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it has payments."
 msgstr ""
+"Non è possibile accreditare con rimborso la fattura \"%s\" perché ha dei "
+"pagamenti."
 
 msgctxt "error:account.invoice.credit:"
 msgid ""
 "You can not credit with refund invoice \"%s\" because it is a supplier "
 "invoice/credit note."
 msgstr ""
+"Non è possibile accreditare con un rimborso la fattura \"%s\" in quanto è "
+"una fattura /nota credito fornitore."
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it is not posted."
 msgstr ""
+"Non è possibile accreditare con rimborso la fattura \"%s\" perché non è "
+"registrata."
 
 msgctxt "error:account.invoice.line:"
 msgid "Line with \"line\" type must have an account."
-msgstr ""
+msgstr "La riga con tipo \"line\" deve avere un conto."
 
 msgctxt "error:account.invoice.line:"
 msgid "Line without \"line\" type must have an invoice."
-msgstr ""
+msgstr "La riga senza tipo \"line\" deve appartenere ad una fattura."
 
 msgctxt "error:account.invoice.line:"
 msgid ""
 "You can not add a line to invoice \"%(invoice)s\" that is posted, paid or "
 "cancelled."
 msgstr ""
+"Non è possibile aggiungere una riga alla fattura \"%(invoice)s\", che è "
+"registrata, pagata o cancellata."
 
 msgctxt "error:account.invoice.line:"
 msgid ""
 "You can not create invoice line \"%(line)s\" on invoice \"%(invoice)s\" "
 "because the invoice uses the same account (%(account)s)."
 msgstr ""
+"La riga di fattura \"%(line)s\" nella fattura \"%(invoice)s\" non si può "
+"creare perché la fattura movimenta lo stesso conto (%(account)s)."
 
 msgctxt "error:account.invoice.line:"
 msgid ""
 "You can not modify line \"%(line)s\" from invoice \"%(invoice)s\" that is "
 "posted or paid."
 msgstr ""
+"Non è possibile modificare la riga \"%(line)s nella fattura \"%(invoice)s\" "
+"già registrata o pagata."
 
 msgctxt "error:account.invoice.pay:"
 msgid ""
 "On invoice \"%s\" you can not create a partial payment with an amount "
 "greater than the amount to pay."
 msgstr ""
+"Nella fattura \"%s\" non è possibile fare un pagamento parziale di importo "
+"maggiore rispetto all'importo da pagare"
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
+"I valori di percentuale e divisore non sono coerenti nella riga \"%(line)s\""
+" del termine di pagamento \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
-msgstr ""
+msgstr "Riga \"%(line)s\" invalida nel termine di pagamento \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Last line of payment term \"%s\" must be of type remainder."
 msgstr ""
+"L'ultima riga del termine di pagamento \"%s\" dev'essere di tipo rimanenza."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
-msgstr ""
+msgstr "Manca la riga della rimanenza nel termine di pagamento \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
+"La riga \"%(line)s\" non si può aggiungere alla fattura \"%(invoice)s\" "
+"perché è registrata, pagata o cancellata."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -88,6 +113,9 @@ msgid ""
 "\"%(invoice_company)s\" using base tax code \"%(base_code)s\" from company "
 "\"%(base_code_company)s\"."
 msgstr ""
+"Fattura \"%(invoice)s\" non producibile nell'azienda \"%(invoice_company)s\""
+" usando codice imponibile \"%(base_code)s\" da azienda "
+"\"%(base_code_company)s\"."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
@@ -95,1293 +123,1156 @@ msgid ""
 "\"%(invoice_company)s\" using tax code \"%(tax_code)s\" from company "
 "\"%(tax_code_company)s\"."
 msgstr ""
+"Fattura \"%(invoice)s\" non creabile nell'azienda \"%(invoice_company)s\" "
+"con l'utilizzo del codice imposta \"%(tax_code)s\" dall'azienda "
+"\"%(tax_code_company)s\"."
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
 "You can not modify tax \"%(tax)s\" from invoice \"%(invoice)s\" because it "
 "is posted or paid."
 msgstr ""
+"L'imposta \"%(tax)s\" non è modificabile nella fattura \"%(invoice)s\" "
+"perché è registrata o pagata."
 
 msgctxt "error:account.invoice:"
 msgid "Customer invoice/credit note \"%s\" can not be cancelled once posted."
 msgstr ""
+"La fattura / nota di credito cliente \"%s\" non può essere cancellata una "
+"volta registrata"
 
 msgctxt "error:account.invoice:"
 msgid ""
 "Invoice \"%(invoice)s\" uses the same account \"%(account)s\" for the "
 "invoice and in line \"%(line)s\"."
 msgstr ""
+"La fattura \"%(invoice)s\" utilizza lo stesso conto \"%(accounto)s\" per la "
+"fattura e nella riga \"%(line)s\"."
 
 msgctxt "error:account.invoice:"
 msgid ""
 "Invoice \"%s\" has taxes defined but not on invoice lines.\n"
 "Re-compute the invoice."
 msgstr ""
+"La fattura \"%s\" ha imposte definite ma non nelle righe. Ricalcolare la "
+"fattura."
 
 msgctxt "error:account.invoice:"
 msgid ""
 "Invoice \"%s\" has taxes on invoice lines that are not in the invoice.\n"
 "Re-compute the invoice."
-msgstr ""
+msgstr "La fattura \"%s\" ha imposte nelle righe che non sono nella fattura."
 
 msgctxt "error:account.invoice:"
 msgid "Invoice \"%s\" must be cancelled before deletion."
-msgstr ""
+msgstr "La fattura \"%s\" dev'essere cancellata prima di essere eliminata."
 
 msgctxt "error:account.invoice:"
 msgid ""
 "Invoice \"%s\" tax bases are different from invoice lines.\n"
 "Re-compute the invoice."
-msgstr ""
+msgstr "L'imponibile della fattura \"%s\" è diverso rispetto a quelli delle righe"
 
 msgctxt "error:account.invoice:"
 msgid ""
 "The credit account on journal \"%(journal)s\" is the same as invoice "
 "\"%(invoice)s\"'s account."
 msgstr ""
+"Il conto AVERE nel registro %(journal)s\" è lo stesso conto della fattura "
+"\"%(invoice)s\""
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
-msgstr ""
+msgid "The credit account on journal \"%s\" is missing."
+msgstr "Manca il conto AVERE nel registro \"%s\"."
 
 msgctxt "error:account.invoice:"
 msgid ""
 "The debit account on journal \"%(journal)s\" is the same as invoice "
 "\"%(invoice)s\"'s account."
 msgstr ""
+"Il conto DARE nel regostro \"%(journal)s\" è lo stesso rispetto al conto "
+"della fattura \"%(invoice)s\""
 
 msgctxt "error:account.invoice:"
 msgid "The debit account on journal \"%s\" is missing."
-msgstr ""
+msgstr "Manca il conto DARE nel registro \"%s\". "
 
 msgctxt "error:account.invoice:"
 msgid "The numbered invoice \"%s\" can not be deleted."
-msgstr ""
+msgstr "La fattura numerata \"%s\" non può essere eliminata."
 
 msgctxt "error:account.invoice:"
 msgid ""
 "There is no invoice sequence for invoice \"%(invoice)s\" on the "
 "period/fiscal year \"%(period)s\"."
 msgstr ""
+"Non c'è sequenza di fatturazione per la fattura \"%(invoice)s\" nel "
+"periodo/esercizio \"%(period)s\"."
 
 msgctxt "error:account.invoice:"
 msgid "You can not modify invoice \"%s\" because it is posted, paid or cancelled."
-msgstr ""
+msgstr "Fattura \"%s\" non modificabile perché registrata, pagata o cancellata."
 
 msgctxt "error:account.period:"
 msgid "Period \"%(first)s\" and \"%(second)s\" have the same invoice sequence."
 msgstr ""
+"Il periodo \"%first)s\" e \"%(second)s\" hanno la stessa sequenza di "
+"fatturazione"
 
 msgctxt "error:account.period:"
 msgid ""
 "Period \"%(period)s\" must have the same company as its fiscal year "
 "(%(fiscalyear)s)."
-msgstr ""
+msgstr "Il periodo \"%(period)s\" "
 
 msgctxt "error:account.period:"
 msgid ""
 "You can not change the invoice sequence in period \"%s\" because there is "
 "already an invoice posted in this period"
 msgstr ""
-
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
+"Sequenza di fatturazione nel periodo \"%s\" non modificabile perché esiste "
+"già una fattura registrata nel periodo"
 
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
-msgstr ""
+msgstr "Sequenza nota di credito fornitore"
 
 msgctxt "field:account.fiscalyear,in_invoice_sequence:"
 msgid "Supplier Invoice Sequence"
-msgstr ""
+msgstr "Sequenza fattura fornitore"
 
 msgctxt "field:account.fiscalyear,out_credit_note_sequence:"
 msgid "Customer Credit Note Sequence"
-msgstr ""
+msgstr "Sequenza nota di credito cliente"
 
 msgctxt "field:account.fiscalyear,out_invoice_sequence:"
 msgid "Customer Invoice Sequence"
-msgstr ""
+msgstr "Sequenza fattura cliente"
 
 msgctxt "field:account.invoice,account:"
 msgid "Account"
-msgstr ""
+msgstr "Conto"
 
 msgctxt "field:account.invoice,accounting_date:"
 msgid "Accounting Date"
-msgstr ""
+msgstr "Data contabile"
 
 msgctxt "field:account.invoice,amount_to_pay:"
 msgid "Amount to Pay"
-msgstr ""
+msgstr "Importo da pagare"
 
 msgctxt "field:account.invoice,amount_to_pay_today:"
 msgid "Amount to Pay Today"
-msgstr ""
+msgstr "Ammontare da pagare oggi"
 
 msgctxt "field:account.invoice,cancel_move:"
 msgid "Cancel Move"
-msgstr ""
+msgstr "Cancella movimento"
 
 msgctxt "field:account.invoice,comment:"
 msgid "Comment"
-msgstr ""
+msgstr "Commento"
 
 msgctxt "field:account.invoice,company:"
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 msgctxt "field:account.invoice,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 msgctxt "field:account.invoice,currency_date:"
 msgid "Currency Date"
-msgstr ""
+msgstr "Data valuta"
 
 msgctxt "field:account.invoice,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice,description:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 msgctxt "field:account.invoice,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice,invoice_address:"
 msgid "Invoice Address"
-msgstr ""
+msgstr "Indirizzo di fatturazione"
 
 msgctxt "field:account.invoice,invoice_date:"
 msgid "Invoice Date"
-msgstr ""
+msgstr "Data fattura"
 
 msgctxt "field:account.invoice,invoice_report_cache:"
 msgid "Invoice Report"
-msgstr ""
+msgstr "Rapporto fattura"
 
 msgctxt "field:account.invoice,invoice_report_format:"
 msgid "Invoice Report Format"
-msgstr ""
+msgstr "Formato Rapporto fattura"
 
 msgctxt "field:account.invoice,journal:"
 msgid "Journal"
-msgstr ""
+msgstr "Registro"
 
 msgctxt "field:account.invoice,lines:"
 msgid "Lines"
-msgstr ""
+msgstr "Righe"
 
 msgctxt "field:account.invoice,lines_to_pay:"
 msgid "Lines to Pay"
-msgstr ""
+msgstr "Righe pagamento"
 
 msgctxt "field:account.invoice,move:"
 msgid "Move"
-msgstr ""
+msgstr "Movimento"
 
 msgctxt "field:account.invoice,number:"
 msgid "Number"
-msgstr ""
+msgstr "Numero"
 
 msgctxt "field:account.invoice,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Origini"
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
-msgstr ""
+msgstr "Controparti"
 
 msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
-msgstr ""
+msgstr "Lingua Controparte"
 
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
-msgstr ""
+msgstr "Righe del pagamento"
 
 msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Termine di pagamento"
 
 msgctxt "field:account.invoice,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
-msgstr ""
+msgstr "Riconciliato"
 
 msgctxt "field:account.invoice,reference:"
 msgid "Reference"
-msgstr ""
+msgstr "Riferimento"
 
 msgctxt "field:account.invoice,state:"
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 msgctxt "field:account.invoice,tax_amount:"
 msgid "Tax"
-msgstr ""
+msgstr "Imposta"
 
 msgctxt "field:account.invoice,taxes:"
 msgid "Tax Lines"
-msgstr ""
+msgstr "Righe Imposta"
 
 msgctxt "field:account.invoice,total_amount:"
 msgid "Total"
-msgstr ""
+msgstr "Totale"
 
 msgctxt "field:account.invoice,type:"
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 msgctxt "field:account.invoice,type_name:"
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 msgctxt "field:account.invoice,untaxed_amount:"
 msgid "Untaxed"
-msgstr ""
+msgstr "Ante imposta"
 
 msgctxt "field:account.invoice,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice-account.move.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice-account.move.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice-account.move.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice-account.move.line,invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
-msgstr ""
+msgstr "Riga pagamento"
 
 msgctxt "field:account.invoice-account.move.line,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice-account.move.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.credit.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.credit.start,with_refund:"
 msgid "With Refund"
-msgstr ""
+msgstr "Con rimborso"
 
 msgctxt "field:account.invoice.line,account:"
 msgid "Account"
-msgstr ""
+msgstr "Conto"
 
 msgctxt "field:account.invoice.line,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.line,company:"
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 msgctxt "field:account.invoice.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.line,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 msgctxt "field:account.invoice.line,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice.line,description:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 msgctxt "field:account.invoice.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.line,invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "field:account.invoice.line,invoice_taxes:"
 msgid "Invoice Taxes"
-msgstr ""
+msgstr "Imposte fattura"
 
 msgctxt "field:account.invoice.line,invoice_type:"
 msgid "Invoice Type"
-msgstr ""
+msgstr "Tipo fattura"
 
 msgctxt "field:account.invoice.line,note:"
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 msgctxt "field:account.invoice.line,origin:"
 msgid "Origin"
-msgstr ""
+msgstr "Origine"
 
 msgctxt "field:account.invoice.line,party:"
 msgid "Party"
-msgstr ""
+msgstr "Controparti"
 
 msgctxt "field:account.invoice.line,party_lang:"
 msgid "Party Language"
-msgstr ""
+msgstr "Lingua Controparte"
 
 msgctxt "field:account.invoice.line,product:"
 msgid "Product"
-msgstr ""
+msgstr "Prodotto"
 
 msgctxt "field:account.invoice.line,product_uom_category:"
 msgid "Product Uom Category"
-msgstr ""
+msgstr "Categoria unità di misura prodotto"
 
 msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
 msgctxt "field:account.invoice.line,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
 
 msgctxt "field:account.invoice.line,taxes:"
 msgid "Taxes"
-msgstr ""
+msgstr "Imposte"
 
 msgctxt "field:account.invoice.line,type:"
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 msgctxt "field:account.invoice.line,unit:"
 msgid "Unit"
-msgstr ""
+msgstr "Unità"
 
 msgctxt "field:account.invoice.line,unit_digits:"
 msgid "Unit Digits"
-msgstr ""
+msgstr "Posizioni Unità"
 
 msgctxt "field:account.invoice.line,unit_price:"
 msgid "Unit Price"
-msgstr ""
+msgstr "Prezzo unitario"
 
 msgctxt "field:account.invoice.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.line-account.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.line-account.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.line-account.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
 
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
-msgstr ""
+msgstr "Imposta"
 
 msgctxt "field:account.invoice.line-account.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.line-account.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.pay.ask,amount:"
 msgid "Payment Amount"
-msgstr ""
+msgstr "Importo pagamento"
 
 msgctxt "field:account.invoice.pay.ask,amount_writeoff:"
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Importo Svalutazione"
 
 msgctxt "field:account.invoice.pay.ask,company:"
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 msgctxt "field:account.invoice.pay.ask,currency:"
 msgid "Payment Currency"
-msgstr ""
+msgstr "Pagamento Valuta"
 
 msgctxt "field:account.invoice.pay.ask,currency_digits:"
 msgid "Payment Currency Digits"
-msgstr ""
+msgstr "Posizioni valuta pagamento"
 
 msgctxt "field:account.invoice.pay.ask,currency_digits_writeoff:"
 msgid "Write-Off Currency Digits"
-msgstr ""
+msgstr "Posizioni svalutazione valuta"
 
 msgctxt "field:account.invoice.pay.ask,currency_writeoff:"
 msgid "Write-Off Currency"
-msgstr ""
+msgstr "Svalutazione valuta"
 
 msgctxt "field:account.invoice.pay.ask,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.pay.ask,invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "field:account.invoice.pay.ask,journal_writeoff:"
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Registro per svalutazione"
 
 msgctxt "field:account.invoice.pay.ask,lines:"
 msgid "Lines"
-msgstr ""
+msgstr "Righe"
 
 msgctxt "field:account.invoice.pay.ask,lines_to_pay:"
 msgid "Lines to Pay"
-msgstr ""
+msgstr "Righe da pagare"
 
 msgctxt "field:account.invoice.pay.ask,payment_lines:"
 msgid "Payment Lines"
-msgstr ""
+msgstr "Righe del pagamento"
 
 msgctxt "field:account.invoice.pay.ask,type:"
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 msgctxt "field:account.invoice.pay.start,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.pay.start,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 msgctxt "field:account.invoice.pay.start,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice.pay.start,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.pay.start,description:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 msgctxt "field:account.invoice.pay.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.pay.start,journal:"
 msgid "Journal"
-msgstr ""
+msgstr "Registro"
 
 msgctxt "field:account.invoice.payment_term,active:"
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 msgctxt "field:account.invoice.payment_term,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.payment_term,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.payment_term,description:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 msgctxt "field:account.invoice.payment_term,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term,lines:"
 msgid "Lines"
-msgstr ""
+msgstr "Righe"
 
 msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.payment_term,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.payment_term.line,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.payment_term.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.payment_term.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.payment_term.line,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 msgctxt "field:account.invoice.payment_term.line,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice.payment_term.line,divisor:"
 msgid "Divisor"
-msgstr ""
+msgstr "Divisore"
 
 msgctxt "field:account.invoice.payment_term.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Termine di pagamento"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
-msgstr ""
+msgstr "Delta"
 
 msgctxt "field:account.invoice.payment_term.line,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
 
 msgctxt "field:account.invoice.payment_term.line,type:"
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 msgctxt "field:account.invoice.payment_term.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.payment_term.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,day:"
 msgid "Day of Month"
-msgstr ""
+msgstr "Giorno del mese"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,days:"
 msgid "Number of Days"
-msgstr ""
+msgstr "Numero di giorni"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,line:"
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Riga termine pagamento"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,month:"
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,months:"
 msgid "Number of Months"
-msgstr ""
+msgstr "Numero di mesi"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Day of Week"
-msgstr ""
+msgstr "Giorno della settimana"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,weeks:"
 msgid "Number of Weeks"
-msgstr ""
+msgstr "Numero di settimane"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.invoice.payment_term.test,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.payment_term.test,currency:"
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 msgctxt "field:account.invoice.payment_term.test,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice.payment_term.test,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.payment_term.test,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.test,payment_term:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Termine di pagamento"
 
 msgctxt "field:account.invoice.payment_term.test,result:"
 msgid "Result"
-msgstr ""
+msgstr "Risultato"
 
 msgctxt "field:account.invoice.payment_term.test.result,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.payment_term.test.result,currency_digits:"
 msgid "Currency Digits"
-msgstr ""
+msgstr "Posizioni Valuta"
 
 msgctxt "field:account.invoice.payment_term.test.result,date:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.print.warning,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
-msgstr ""
+msgstr "Conto"
 
 msgctxt "field:account.invoice.tax,amount:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 msgctxt "field:account.invoice.tax,base:"
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 msgctxt "field:account.invoice.tax,base_code:"
 msgid "Base Code"
-msgstr ""
+msgstr "Codice Imponibile"
 
 msgctxt "field:account.invoice.tax,base_sign:"
 msgid "Base Sign"
-msgstr ""
+msgstr "Segno Imponibile"
 
 msgctxt "field:account.invoice.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "Creazione Data"
 
 msgctxt "field:account.invoice.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "Creazione Utente"
 
 msgctxt "field:account.invoice.tax,description:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 msgctxt "field:account.invoice.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgctxt "field:account.invoice.tax,invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
-msgstr ""
+msgstr "Manuale"
 
 msgctxt "field:account.invoice.tax,rec_name:"
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
-msgstr ""
+msgstr "Sequenza"
 
 msgctxt "field:account.invoice.tax,sequence_number:"
 msgid "Sequence Number"
-msgstr ""
+msgstr "Numero sequenza"
 
 msgctxt "field:account.invoice.tax,tax:"
 msgid "Tax"
-msgstr ""
+msgstr "Imposta"
 
 msgctxt "field:account.invoice.tax,tax_code:"
 msgid "Tax Code"
-msgstr ""
+msgstr "Codice Imposta"
 
 msgctxt "field:account.invoice.tax,tax_sign:"
 msgid "Tax Sign"
-msgstr ""
+msgstr "Segno imposta"
 
 msgctxt "field:account.invoice.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "Data di Scrittura"
 
 msgctxt "field:account.invoice.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "Utente Scrittura"
 
 msgctxt "field:account.period,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
-msgstr ""
+msgstr "Sequenza nota di credito fornitore"
 
 msgctxt "field:account.period,in_invoice_sequence:"
 msgid "Supplier Invoice Sequence"
-msgstr ""
+msgstr "Sequenza fattura fornitore"
 
 msgctxt "field:account.period,out_credit_note_sequence:"
 msgid "Customer Credit Note Sequence"
-msgstr ""
+msgstr "Sequenza nota di credito cliente"
 
 msgctxt "field:account.period,out_invoice_sequence:"
 msgid "Customer Invoice Sequence"
-msgstr ""
+msgstr "Sequenza fattura cliente"
 
 msgctxt "field:party.address,invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Termine di pagamento cliente"
 
 msgctxt "field:party.party,supplier_payment_term:"
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Termine di pagamento fornitore"
 
 msgctxt "help:account.invoice.credit.start,with_refund:"
 msgid "If true, the current invoice(s) will be paid."
-msgstr ""
+msgstr "Se true, la fattura attuale verrà pagata"
 
 msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
-msgstr ""
-
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
+msgstr "Uso per ordinare le righe in ordine crescente"
 
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "model:account.invoice-account.move.line,name:"
 msgid "Invoice - Payment Line"
-msgstr ""
+msgstr "Fattura - riga pagamento"
 
 msgctxt "model:account.invoice.credit.start,name:"
 msgid "Credit Invoice"
-msgstr ""
+msgstr "Fattura credito"
 
 msgctxt "model:account.invoice.line,name:"
 msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
 
 msgctxt "model:account.invoice.line-account.tax,name:"
 msgid "Invoice Line - Tax"
-msgstr ""
+msgstr "Riga fattura - Imposta"
 
 msgctxt "model:account.invoice.pay.ask,name:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga fattura"
 
 msgctxt "model:account.invoice.pay.start,name:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga fattura"
 
 msgctxt "model:account.invoice.payment_term,name:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Termine di pagamento"
 
 msgctxt "model:account.invoice.payment_term.line,name:"
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Riga termine pagamento"
 
+#, fuzzy
 msgctxt "model:account.invoice.payment_term.line.relativedelta,name:"
 msgid "Payment Term Line Relative Delta"
-msgstr ""
+msgstr "Delta relativo riga termine pagamento"
 
 msgctxt "model:account.invoice.payment_term.test,name:"
 msgid "Test Payment Term"
-msgstr ""
+msgstr "Testa il termine di pagamento"
 
 msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
-msgstr ""
+msgstr "Testa il termine di pagamento"
 
 msgctxt "model:account.invoice.print.warning,name:"
 msgid "Print Invoice Report Warning"
-msgstr ""
+msgstr "Avviso nel rapporto di stampa fattura"
 
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Imposta fattura"
 
 msgctxt "model:ir.action,name:act_invoice_form"
 msgid "Invoices"
-msgstr ""
+msgstr "Fatture"
 
 msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
+msgstr "Fatture"
 
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Fatture fornitore"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Termini di pagamento"
 
 msgctxt "model:ir.action,name:credit"
 msgid "Credit"
-msgstr ""
+msgstr "AVERE"
 
 msgctxt "model:ir.action,name:print"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "model:ir.action,name:wizard_pay"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga fattura"
 
 msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
+msgstr "Testa il termine di pagamento"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
-msgstr ""
+msgstr "Tutti"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
-msgstr ""
+msgstr "Registrato"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
-msgstr ""
+msgstr "Validato"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
-msgstr ""
+msgstr "Tutti"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
-msgstr ""
+msgstr "Registrato"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
-msgstr ""
+msgstr "Validato"
 
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
+msgstr "Fattura"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr ""
+msgstr "Fatture fornitore"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
-msgstr ""
+msgstr "Fatture"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_form"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Termini di pagamento"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_test"
 msgid "Test Payment Term"
-msgstr ""
+msgstr "Testa il termine di pagamento"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Termini di pagamento"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
-msgstr ""
+msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
+msgstr "Base"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
-msgstr ""
+msgstr "Descrizione:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
+msgstr "Bozza Fattura"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
-msgstr ""
+msgstr "Fattura n°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
+msgstr "Termine di pagamento"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
-msgstr ""
+msgstr "Fattura pro forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
-msgstr ""
+msgstr "Quantità"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
+msgstr "Riferimento"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
-msgstr ""
+msgstr "Fattura fornitore n°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
-msgstr ""
+msgstr "Imposta"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
-msgstr ""
+msgstr "Imposte"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
-msgstr ""
+msgstr "Imposte:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
-msgstr ""
+msgstr "Totale (escluse tasse):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
-msgstr ""
+msgstr "Totale:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
-msgstr ""
+msgstr "Prezzo unitario"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
+msgstr "IVA:"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
-msgstr ""
+msgstr "Cancellato"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Paid"
-msgstr ""
+msgstr "Pagato"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Posted"
-msgstr ""
+msgstr "Registrato"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Validated"
-msgstr ""
+msgstr "Validata"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,60 +1280,52 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
-msgstr ""
+msgstr "Commento"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Line"
-msgstr ""
+msgstr "Riga"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotale"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Title"
-msgstr ""
+msgstr "Titolo"
 
 msgctxt "selection:account.invoice.pay.ask,type:"
 msgid "Partial Payment"
-msgstr ""
+msgstr "Pagamento Parziale"
 
 msgctxt "selection:account.invoice.pay.ask,type:"
 msgid "Write-Off"
-msgstr ""
+msgstr "Svalutazione"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Fixed"
-msgstr ""
+msgstr "Fissa"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Percentage on Remainder"
-msgstr ""
+msgstr "Percentuale su rimanenza"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Percentage on Total"
-msgstr ""
+msgstr "Percentuale su totale"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Remainder"
-msgstr ""
+msgstr "Rimanenza"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid ""
@@ -1450,51 +1333,51 @@ msgstr ""
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,month:"
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid ""
@@ -1502,159 +1385,152 @@ msgstr ""
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Friday"
-msgstr ""
+msgstr "Venerdì"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Monday"
-msgstr ""
+msgstr "Lunedì"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Saturday"
-msgstr ""
+msgstr "Sabato"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Sunday"
-msgstr ""
+msgstr "Domenica"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Thursday"
-msgstr ""
+msgstr "Giovedì"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Tuesday"
-msgstr ""
+msgstr "Martedì"
 
 msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
+msgstr "Mercoledì"
 
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
-msgstr ""
+msgstr "Sei sicuro di accreditare queste/questa fattura(e)?"
 
 msgctxt "view:account.invoice.credit.start:"
 msgid "Credit Invoice"
-msgstr ""
+msgstr "Fattura credito"
 
 msgctxt "view:account.invoice.line:"
 msgid "General"
-msgstr ""
+msgstr "Generale"
 
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Line"
-msgstr ""
+msgstr "Riga fattura"
 
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Righe fattura"
 
 msgctxt "view:account.invoice.line:"
 msgid "Notes"
-msgstr ""
+msgstr "Note"
 
 msgctxt "view:account.invoice.pay.ask:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga fattura"
 
 msgctxt "view:account.invoice.pay.start:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Paga fattura"
 
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Delta"
-msgstr ""
+msgstr "Delta relativo riga termine pagamento"
 
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
+msgstr "Delta relativi riga termine pagamento"
+
+msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Riga termine pagamento"
 
 msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
-msgstr ""
+msgstr "Risultati test termine pagamento"
 
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "Test termine di pagamento"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
-msgstr ""
+msgstr "Termine di pagamento"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Termini di pagamento"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "Print Invoice"
-msgstr ""
+msgstr "Stampa fattura"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "The invoices will be sent directly to the printer."
-msgstr ""
+msgstr "Le fatture saranno inviate direttamente alla stampante"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "You have selected more than one invoice to print."
-msgstr ""
+msgstr "Più di una fattura selezionate per la stampa"
 
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Imposta fattura"
 
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Taxes"
-msgstr ""
+msgstr "Imposte Fattura"
 
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
-msgstr ""
+msgstr "Codice Imposta"
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Taxes"
-msgstr ""
+msgstr "Imposte"
 
 msgctxt "view:account.invoice:"
 msgid "Also known as Pro Forma"
-msgstr ""
+msgstr "Descritta anche come Pro Forma"
 
 msgctxt "view:account.invoice:"
 msgid "Are you sure to cancel the invoice?"
-msgstr ""
+msgstr "Sei sicuro di cancellare la fattura?"
 
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
-msgstr ""
+msgstr "Fattura"
 
 msgctxt "view:account.invoice:"
 msgid "Invoices"
-msgstr ""
+msgstr "Fatture"
 
 msgctxt "view:account.invoice:"
 msgid "Other Info"
-msgstr ""
+msgstr "Altre Info"
 
 msgctxt "view:account.invoice:"
 msgid "Pay"
@@ -1662,72 +1538,72 @@ msgstr ""
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
-msgstr ""
+msgstr "Pagamento"
 
 msgctxt "view:account.invoice:"
 msgid "Post"
-msgstr ""
+msgstr "Registra"
 
 msgctxt "view:account.invoice:"
 msgid "Validate"
-msgstr ""
+msgstr "Valida"
 
 msgctxt "view:account.move.line:"
 msgid "Amount Second Currency"
-msgstr ""
+msgstr "Importo seconda valuta"
 
 msgctxt "view:account.move.line:"
 msgid "Credit"
-msgstr ""
+msgstr "AVERE"
 
 msgctxt "view:account.move.line:"
 msgid "Debit"
-msgstr ""
+msgstr "DARE"
 
 msgctxt "view:account.move.line:"
 msgid "Lines to Pay"
-msgstr ""
+msgstr "Righe pagamento"
 
 msgctxt "view:account.move.line:"
 msgid "Payment Lines"
-msgstr ""
+msgstr "Righe del pagamento"
 
 msgctxt "view:party.party:"
 msgid "Payment Terms"
-msgstr ""
+msgstr "Termini di pagamento"
 
 msgctxt "wizard_button:account.invoice.credit,start,credit:"
 msgid "Credit"
-msgstr ""
+msgstr "AVERE"
 
 msgctxt "wizard_button:account.invoice.credit,start,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgctxt "wizard_button:account.invoice.pay,ask,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgctxt "wizard_button:account.invoice.pay,ask,pay:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:account.invoice.pay,start,choice:"
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 msgctxt "wizard_button:account.invoice.pay,start,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
-msgstr ""
+msgstr "Chiusura"
 
 msgctxt "wizard_button:account.invoice.print,warning,end:"
 msgid "Cancel"
-msgstr ""
+msgstr "Cancella"
 
 msgctxt "wizard_button:account.invoice.print,warning,print_:"
 msgid "Print"
-msgstr ""
+msgstr "Stampa"
diff --git a/locale/ja_JP.po b/locale/ja_JP.po
index d668971..5082bd8 100644
--- a/locale/ja_JP.po
+++ b/locale/ja_JP.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,54 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr ""
@@ -748,8 +700,8 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
@@ -992,10 +944,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr ""
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr ""
@@ -1060,20 +1008,12 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
@@ -1100,83 +1040,37 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr ""
 
@@ -1184,20 +1078,12 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
@@ -1216,138 +1102,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr ""
@@ -1369,19 +1207,11 @@ msgid "Validated"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,19 +1219,11 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
@@ -1528,18 +1350,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1581,6 +1391,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr ""
 
diff --git a/locale/nl_NL.po b/locale/lo_LA.po
similarity index 72%
copy from locale/nl_NL.po
copy to locale/lo_LA.po
index 462e686..bc11796 100644
--- a/locale/nl_NL.po
+++ b/locale/lo_LA.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,341 +184,306 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Bedrijf"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Instellingen"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Reeks"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
-msgstr "Credit inkoopnota reeks"
+msgstr ""
 
 msgctxt "field:account.fiscalyear,in_invoice_sequence:"
 msgid "Supplier Invoice Sequence"
-msgstr "Inkoopfactuurreeks"
+msgstr ""
 
 msgctxt "field:account.fiscalyear,out_credit_note_sequence:"
 msgid "Customer Credit Note Sequence"
-msgstr "Credit verkoopnota reeks"
+msgstr ""
 
 msgctxt "field:account.fiscalyear,out_invoice_sequence:"
 msgid "Customer Invoice Sequence"
-msgstr "Verkoopfactuur reeks"
+msgstr ""
 
 msgctxt "field:account.invoice,account:"
 msgid "Account"
-msgstr "Rekening"
+msgstr "ບັນຊີ"
 
 msgctxt "field:account.invoice,accounting_date:"
 msgid "Accounting Date"
-msgstr "Boekingsdatum"
+msgstr "ວັນຄິດໄລ່ບັນຊີ"
 
 msgctxt "field:account.invoice,amount_to_pay:"
 msgid "Amount to Pay"
-msgstr "Te betalen bedrag"
+msgstr "ມູນຄ່າຕ້ອງຈ່າຍ"
 
 msgctxt "field:account.invoice,amount_to_pay_today:"
 msgid "Amount to Pay Today"
-msgstr "Vandaag te betalen bedrag"
+msgstr "ມູນຄ່າຕ້ອງຈ່າຍມື້ນີ້"
 
 msgctxt "field:account.invoice,cancel_move:"
 msgid "Cancel Move"
-msgstr ""
+msgstr "ຍົກເລີກເຄື່ອນໄຫວບັນຊີ"
 
 msgctxt "field:account.invoice,comment:"
 msgid "Comment"
-msgstr "Opmerking"
+msgstr "ຄຳເຫັນ"
 
 msgctxt "field:account.invoice,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ບໍລິສັດ"
 
 msgctxt "field:account.invoice,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr "ສະກຸນເງິນ"
 
 msgctxt "field:account.invoice,currency_date:"
 msgid "Currency Date"
-msgstr ""
+msgstr "ວັນທີສະກຸນເງິນ"
 
 msgctxt "field:account.invoice,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 msgctxt "field:account.invoice,description:"
 msgid "Description"
-msgstr "Omschrijving"
+msgstr "ເນື້ອໃນລາຍການ"
 
 msgctxt "field:account.invoice,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice,invoice_address:"
 msgid "Invoice Address"
-msgstr "Factuuradres"
+msgstr "ທີ່ຢູ່"
 
 msgctxt "field:account.invoice,invoice_date:"
 msgid "Invoice Date"
-msgstr "Factuurdatum"
+msgstr "ວັນທີໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice,invoice_report_cache:"
 msgid "Invoice Report"
-msgstr ""
+msgstr "ສະຫຼຸບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice,invoice_report_format:"
 msgid "Invoice Report Format"
-msgstr "Opmaak factuuroverzicht"
+msgstr "ຮູບແບບສະຫຼຸບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice,journal:"
 msgid "Journal"
-msgstr "Dagboek"
+msgstr "ບັນຊີປະຈໍາວັນ"
 
 msgctxt "field:account.invoice,lines:"
 msgid "Lines"
-msgstr "Regels"
+msgstr "ຮ່ວງ"
 
 msgctxt "field:account.invoice,lines_to_pay:"
 msgid "Lines to Pay"
-msgstr "Te betalen boekingen"
+msgstr "ຮ່ວງຈ່າຍ"
 
 msgctxt "field:account.invoice,move:"
 msgid "Move"
-msgstr "Boeking"
+msgstr "ເຄື່ອນໄຫວ"
 
 msgctxt "field:account.invoice,number:"
 msgid "Number"
-msgstr "Nummer"
+msgstr "ເລກທີ"
 
 msgctxt "field:account.invoice,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "ຕົ້ນສະບັບ"
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
-msgstr "Relatie"
+msgstr "ພາກສ່ວນ"
 
 msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
-msgstr "Taal relatie"
+msgstr "ພາສາ"
 
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
-msgstr "Betalingen"
+msgstr "ຮ່ວງຊໍາລະ"
 
 msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "field:account.invoice,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice,reconciled:"
 msgid "Reconciled"
-msgstr "Afgeletterd"
+msgstr "ພິສູດຍອດແລ້ວ"
 
 msgctxt "field:account.invoice,reference:"
 msgid "Reference"
-msgstr "Referentie"
+msgstr "ເອກະສານອ້າງອີງ"
 
 msgctxt "field:account.invoice,state:"
 msgid "State"
-msgstr "Status"
+msgstr "ສະຖານະ"
 
 msgctxt "field:account.invoice,tax_amount:"
 msgid "Tax"
-msgstr "Belasting"
+msgstr "ອາກອນ"
 
 msgctxt "field:account.invoice,taxes:"
 msgid "Tax Lines"
-msgstr "Belastingregels"
+msgstr "ຮ່ວງພາສີ"
 
 msgctxt "field:account.invoice,total_amount:"
 msgid "Total"
-msgstr "Totaal"
+msgstr "ລວມທັງໝົດ"
 
 msgctxt "field:account.invoice,type:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 msgctxt "field:account.invoice,type_name:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 msgctxt "field:account.invoice,untaxed_amount:"
 msgid "Untaxed"
-msgstr "Onbelast"
+msgstr "ມູນຄ່າບໍ່ລວມອາກອນ"
 
 msgctxt "field:account.invoice,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice-account.move.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice-account.move.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice-account.move.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice-account.move.line,invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice-account.move.line,line:"
 msgid "Payment Line"
-msgstr "Betalingen"
+msgstr "ຮ່ວງຊໍາລະ"
 
+#, fuzzy
 msgctxt "field:account.invoice-account.move.line,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice-account.move.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice-account.move.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.credit.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice.credit.start,with_refund:"
 msgid "With Refund"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.line,account:"
 msgid "Account"
-msgstr "Rekening"
+msgstr "ບັນຊີ"
 
 msgctxt "field:account.invoice.line,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
 msgctxt "field:account.invoice.line,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr "ສະກຸນເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 msgctxt "field:account.invoice.line,description:"
 msgid "Description"
-msgstr "Omschrijving"
+msgstr "ເນື້ອໃນລາຍການ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,invoice_taxes:"
 msgid "Invoice Taxes"
-msgstr "Belastingen factuur"
+msgstr "ອາກອນໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,invoice_type:"
 msgid "Invoice Type"
-msgstr "Factuurtype"
+msgstr "ອາກອນໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,note:"
 msgid "Note"
-msgstr "Aantekening"
+msgstr "ໝາຍເຫດ"
 
 msgctxt "field:account.invoice.line,origin:"
 msgid "Origin"
-msgstr ""
+msgstr "ຕົ້ນສະບັບ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,party:"
 msgid "Party"
-msgstr "Relatie"
+msgstr "ພາກສ່ວນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,party_lang:"
 msgid "Party Language"
-msgstr "Taal relatie"
+msgstr "ພາສາ"
 
 msgctxt "field:account.invoice.line,product:"
 msgid "Product"
-msgstr "Product"
+msgstr "ຜະລິດຕະພັນ"
 
 msgctxt "field:account.invoice.line,product_uom_category:"
 msgid "Product Uom Category"
@@ -526,75 +491,79 @@ msgstr ""
 
 msgctxt "field:account.invoice.line,quantity:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
+#, fuzzy
 msgctxt "field:account.invoice.line,sequence:"
 msgid "Sequence"
-msgstr "Reeks"
+msgstr "ລໍາດັບ"
 
 msgctxt "field:account.invoice.line,taxes:"
 msgid "Taxes"
-msgstr "Belastingen"
+msgstr "ອາກອນ"
 
 msgctxt "field:account.invoice.line,type:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 msgctxt "field:account.invoice.line,unit:"
 msgid "Unit"
-msgstr "Eenheid"
+msgstr "ຫົວໜ່ວຍ"
 
 msgctxt "field:account.invoice.line,unit_digits:"
 msgid "Unit Digits"
-msgstr "Decimalen eenheid"
+msgstr ""
 
 msgctxt "field:account.invoice.line,unit_price:"
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "ລາຄາຫົວໜ່ວຍ"
 
 msgctxt "field:account.invoice.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.line-account.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice.line-account.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice.line-account.tax,line:"
 msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
 
+#, fuzzy
 msgctxt "field:account.invoice.line-account.tax,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice.line-account.tax,tax:"
 msgid "Tax"
-msgstr "Belasting"
+msgstr "ອາກອນ"
 
 msgctxt "field:account.invoice.line-account.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice.line-account.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.pay.ask,amount:"
 msgid "Payment Amount"
@@ -604,10 +573,9 @@ msgctxt "field:account.invoice.pay.ask,amount_writeoff:"
 msgid "Write-Off Amount"
 msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.pay.ask,company:"
 msgid "Company"
-msgstr "Bedrijf"
+msgstr "ສຳນັກງານ"
 
 msgctxt "field:account.invoice.pay.ask,currency:"
 msgid "Payment Currency"
@@ -625,14 +593,15 @@ msgctxt "field:account.invoice.pay.ask,currency_writeoff:"
 msgid "Write-Off Currency"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.pay.ask,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.ask,invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice.pay.ask,journal_writeoff:"
 msgid "Write-Off Journal"
@@ -641,165 +610,176 @@ msgstr ""
 #, fuzzy
 msgctxt "field:account.invoice.pay.ask,lines:"
 msgid "Lines"
-msgstr "Regels"
+msgstr "ຮ່ວງ"
 
-#, fuzzy
 msgctxt "field:account.invoice.pay.ask,lines_to_pay:"
 msgid "Lines to Pay"
-msgstr "Te betalen boekingen"
+msgstr "ລາຍການຕ້ອງຈ່າຍ"
 
-#, fuzzy
 msgctxt "field:account.invoice.pay.ask,payment_lines:"
 msgid "Payment Lines"
-msgstr "Betalingen"
+msgstr "ສາຍການຊໍາລະ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.ask,type:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.start,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.start,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr "ສະກຸນເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.start,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.start,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ:"
 
-#, fuzzy
 msgctxt "field:account.invoice.pay.start,description:"
 msgid "Description"
-msgstr "Specificatie"
+msgstr "ເນື້ອໃນລາຍການ"
 
+#, fuzzy
 msgctxt "field:account.invoice.pay.start,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.pay.start,journal:"
 msgid "Journal"
-msgstr "Dagboek"
+msgstr "ບັນຊີປະຈໍາວັນ"
 
 msgctxt "field:account.invoice.payment_term,active:"
 msgid "Active"
-msgstr "Actief"
+msgstr "ໃຊ້ງານຢູ່"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice.payment_term,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.payment_term,description:"
 msgid "Description"
-msgstr "Omschrijving"
+msgstr "ເນື້ອໃນລາຍການ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term,lines:"
 msgid "Lines"
-msgstr "Regels"
+msgstr "ຮ່ວງ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term,name:"
 msgid "Name"
-msgstr "Betalingstermijn"
+msgstr "ຊື່"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice.payment_term,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice.payment_term,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.payment_term.line,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice.payment_term.line,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr "ສະກຸນເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 msgctxt "field:account.invoice.payment_term.line,divisor:"
 msgid "Divisor"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ຮູບແບບການຈ່າຍ"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice.payment_term.line,relativedeltas:"
 msgid "Deltas"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line,sequence:"
 msgid "Sequence"
-msgstr "Reeks"
+msgstr "ລໍາດັບ"
 
 msgctxt "field:account.invoice.payment_term.line,type:"
 msgid "Type"
-msgstr "Type"
+msgstr "ປະເພດ"
 
 msgctxt "field:account.invoice.payment_term.line,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice.payment_term.line,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,day:"
 msgid "Day of Month"
@@ -809,19 +789,18 @@ msgctxt "field:account.invoice.payment_term.line.relativedelta,days:"
 msgid "Number of Days"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,line:"
 msgid "Payment Term Line"
-msgstr "Betalingstermijn regel"
+msgstr ""
 
-#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,month:"
 msgid "Month"
-msgstr "Maand"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,months:"
 msgid "Number of Months"
@@ -830,12 +809,12 @@ msgstr ""
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,rec_name:"
 msgid "Name"
-msgstr "Naam bijlage"
+msgstr "ຊື່"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,sequence:"
 msgid "Sequence"
-msgstr "Reeks"
+msgstr "ລໍາດັບ"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Day of Week"
@@ -845,42 +824,45 @@ msgctxt "field:account.invoice.payment_term.line.relativedelta,weeks:"
 msgid "Number of Weeks"
 msgstr ""
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.line.relativedelta,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,currency:"
 msgid "Currency"
-msgstr "Valuta"
+msgstr "ສະກຸນເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ:"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.test,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test,payment_term:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "field:account.invoice.payment_term.test,result:"
 msgid "Result"
@@ -889,121 +871,125 @@ msgstr ""
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test.result,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test.result,currency_digits:"
 msgid "Currency Digits"
-msgstr "Valuta decimalen"
+msgstr "ໂຕເລກສະກຸນເງິນ"
 
 #, fuzzy
 msgctxt "field:account.invoice.payment_term.test.result,date:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ:"
 
+#, fuzzy
 msgctxt "field:account.invoice.payment_term.test.result,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.print.warning,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice.tax,account:"
 msgid "Account"
-msgstr "Rekening"
+msgstr "ບັນຊີ"
 
 msgctxt "field:account.invoice.tax,amount:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
 msgctxt "field:account.invoice.tax,base:"
 msgid "Base"
-msgstr "Basis"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,base_code:"
 msgid "Base Code"
-msgstr "Basiscode"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,base_sign:"
 msgid "Base Sign"
-msgstr "Basisteken"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,create_date:"
 msgid "Create Date"
-msgstr ""
+msgstr "ສ້າງວັນທີ"
 
 msgctxt "field:account.invoice.tax,create_uid:"
 msgid "Create User"
-msgstr ""
+msgstr "ສ້າງຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.invoice.tax,description:"
 msgid "Description"
-msgstr "Omschrijving"
+msgstr "ເນື້ອໃນລາຍການ"
 
+#, fuzzy
 msgctxt "field:account.invoice.tax,id:"
 msgid "ID"
-msgstr ""
+msgstr "ລໍາດັບໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "field:account.invoice.tax,invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "field:account.invoice.tax,manual:"
 msgid "Manual"
-msgstr "Handmatig"
+msgstr "ໃສ່ເອົາເອງ"
 
 msgctxt "field:account.invoice.tax,rec_name:"
 msgid "Name"
-msgstr "Naam"
+msgstr "ຊື່"
 
 msgctxt "field:account.invoice.tax,sequence:"
 msgid "Sequence"
-msgstr "Reeks"
+msgstr "ລໍາດັບ"
 
 msgctxt "field:account.invoice.tax,sequence_number:"
 msgid "Sequence Number"
-msgstr "Reeksnummer"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,tax:"
 msgid "Tax"
-msgstr "Belasting"
+msgstr "ອາກອນ"
 
 msgctxt "field:account.invoice.tax,tax_code:"
 msgid "Tax Code"
-msgstr "Belastingcode"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,tax_sign:"
 msgid "Tax Sign"
-msgstr "Teken belasting"
+msgstr ""
 
 msgctxt "field:account.invoice.tax,write_date:"
 msgid "Write Date"
-msgstr ""
+msgstr "ຂຽນວັນທີ"
 
 msgctxt "field:account.invoice.tax,write_uid:"
 msgid "Write User"
-msgstr ""
+msgstr "ຂຽນຜູ້ໃຊ້ງານ"
 
 msgctxt "field:account.period,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
-msgstr "Credit inkoopnota reeks"
+msgstr ""
 
 msgctxt "field:account.period,in_invoice_sequence:"
 msgid "Supplier Invoice Sequence"
-msgstr "Inkoopfactuurreeks"
+msgstr ""
 
 msgctxt "field:account.period,out_credit_note_sequence:"
 msgid "Customer Credit Note Sequence"
-msgstr "Credit verkoopnota reeks"
+msgstr ""
 
 msgctxt "field:account.period,out_invoice_sequence:"
 msgid "Customer Invoice Sequence"
-msgstr "Verkoopfactuur reeks"
+msgstr ""
 
 msgctxt "field:party.address,invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
@@ -1011,7 +997,7 @@ msgstr ""
 
 msgctxt "field:party.party,supplier_payment_term:"
 msgid "Supplier Payment Term"
-msgstr "Betalingstermijn crediteur"
+msgstr ""
 
 msgctxt "help:account.invoice.credit.start,with_refund:"
 msgid "If true, the current invoice(s) will be paid."
@@ -1019,47 +1005,47 @@ msgstr ""
 
 msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
-msgstr "Gebruiken voor oplopend sorteren"
-
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
 msgstr ""
 
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "model:account.invoice-account.move.line,name:"
 msgid "Invoice - Payment Line"
-msgstr "Factuurbetalingen"
+msgstr ""
 
 msgctxt "model:account.invoice.credit.start,name:"
 msgid "Credit Invoice"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:account.invoice.line,name:"
 msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
 
 msgctxt "model:account.invoice.line-account.tax,name:"
 msgid "Invoice Line - Tax"
-msgstr "Factuurregel - belasting"
+msgstr ""
 
+#, fuzzy
 msgctxt "model:account.invoice.pay.ask,name:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "ຊໍາລະໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "model:account.invoice.pay.start,name:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "ຊໍາລະໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "model:account.invoice.payment_term,name:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "model:account.invoice.payment_term.line,name:"
 msgid "Payment Term Line"
-msgstr "Betalingstermijn regel"
+msgstr ""
 
 msgctxt "model:account.invoice.payment_term.line.relativedelta,name:"
 msgid "Payment Term Line Relative Delta"
@@ -1079,407 +1065,282 @@ msgstr ""
 
 msgctxt "model:account.invoice.tax,name:"
 msgid "Invoice Tax"
-msgstr "Belasting factuur"
+msgstr "ອາກອນໃບເກັບເງິນ"
 
-#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_form"
 msgid "Invoices"
-msgstr "Alle facturen"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
-msgstr "Verkoopfacturen"
-
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Credit inkoopnota's"
+msgstr "ໃບເກັບເງິນ"
 
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Inkoopfacturen"
-
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Credit verkoopnota's"
+msgstr "ໃບເກັບເງິນຂອງຜູ້ສະໜອງ"
 
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
-msgstr "Betalingstermijnen"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 #, fuzzy
 msgctxt "model:ir.action,name:credit"
 msgid "Credit"
-msgstr "Credit"
+msgstr "ມີ"
 
 #, fuzzy
 msgctxt "model:ir.action,name:print"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:report_invoice"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "model:ir.action,name:wizard_pay"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "ຊໍາລະໃບເກັບເງິນ"
 
 msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
-msgstr "Geboekt"
+msgstr "ແຈ້ງແລ້ວ"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
-msgstr "Goedgekeurd"
+msgstr "ກວດສອບແລ້ວ"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
-msgstr "Geboekt"
+msgstr "ແຈ້ງແລ້ວ"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
-msgid "All"
-msgstr ""
+msgstr "ກວດສອບແລ້ວ"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Concept"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Geboekt"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Concept"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Geboekt"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
-msgid "Validated"
-msgstr "Goedgekeurd"
-
 msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Credit inkoopnota's"
+msgstr "ໃບເກັບເງິນ"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
-msgstr "Inkoopfacturen"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Credit verkoopnota's"
+msgstr "ໃບເກັບເງິນຂອງຜູ້ສະໜອງ"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
-msgstr "Facturen"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_form"
 msgid "Payment Terms"
-msgstr "Betalingstermijnen"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
+#, fuzzy
 msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
-msgstr "Betalingstermijnen"
+msgstr "ຮູບແບບການຈ່າຍ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
-msgstr "Bedrag"
+msgstr "ມູນຄ່າ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
-msgstr "Basisbedrag"
-
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Creditnotanummer:"
+msgstr ""
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Date"
-msgstr "Vervaldatum"
+msgstr "ວັນທີ:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
-msgstr "Datum:"
+msgstr "ວັນທີ:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
-msgstr "Specificatie"
+msgstr "ເນື້ອໃນລາຍການ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
-msgstr "Betreft:"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Concept creditnota"
+msgstr "ເນື້ອໃນລາຍການ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
-msgstr "Concept verkoopfactuur"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Concept credit inkoopnota"
+msgstr "ໃບເກັບເງິນຊົ່ວຄາວ"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Concept inkoopfactuur"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
-msgstr "Factuur:"
+msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ໄລຍະຊໍາລະ"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Pro forma creditnota"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
-msgstr "Pro forma verkoopfactuur"
+msgstr "ໃບເກັບເງິນລ່ວງໜ້າ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
-msgstr "Hoeveelheid"
+msgstr "ຈຳນວນ"
 
 #, fuzzy
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
-msgstr "Referentie"
-
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Credit inkoopnotanummer:"
+msgstr "ເອກະສານອ້າງອີງ"
 
-msgctxt "odt:account.invoice:"
+#, fuzzy
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
-msgstr "Inkoopfactuurnummer:"
+msgstr "ໃບຮຽກເກັບເງິນຂອງຜູ້ສະໜອງ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
-msgstr "Belasting"
+msgstr "ອາກອນ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
-msgstr "Belastingen"
+msgstr "ອາກອນ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
-msgstr "Belastingen:"
+msgstr "ອາກອນ:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
-msgstr "Totaal (excl. belasting):"
+msgstr "ລວມເງິນ (ບໍ່ລວມອາກອນ):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
-msgstr "Totaal:"
+msgstr "ລວມເງິນ:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
-msgstr "Eenheids- prijs"
+msgstr "ລາຄາ"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
-msgstr "BTW:"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
 msgstr ""
 
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
-msgstr "Geannuleerd"
+msgstr "ຍົກເລີກແລ້ວ"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Draft"
-msgstr "Concept"
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "selection:account.invoice,state:"
 msgid "Paid"
-msgstr "Betaald"
+msgstr "ຈ່າຍແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:account.invoice,state:"
 msgid "Posted"
-msgstr "Geboekt"
+msgstr "ແຈ້ງແລ້ວ"
 
-#, fuzzy
 msgctxt "selection:account.invoice,state:"
 msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Credit verkoopnota"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ກວດສອບແລ້ວ"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Credit inkoopnota"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Inkoopfactuur"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Credit verkoopnota"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Verkoopfactuur"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Credit inkoopnota"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Inkoopfactuur"
+msgid "Supplier"
+msgstr ""
 
+#, fuzzy
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
-msgstr "Opmerking"
+msgstr "ຄຳເຫັນ"
 
+#, fuzzy
 msgctxt "selection:account.invoice.line,type:"
 msgid "Line"
-msgstr "Regel"
+msgstr "ຮ່ວງ"
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Subtotal"
-msgstr "Subtotaal"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Title"
-msgstr "Titel"
+msgstr ""
 
 msgctxt "selection:account.invoice.pay.ask,type:"
 msgid "Partial Payment"
 msgstr ""
 
-#, fuzzy
 msgctxt "selection:account.invoice.pay.ask,type:"
 msgid "Write-Off"
-msgstr "Afschrijven"
+msgstr ""
 
-#, fuzzy
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Fixed"
-msgstr "Vast"
+msgstr "ຄົງທີ່"
 
 msgctxt "selection:account.invoice.payment_term.line,type:"
 msgid "Percentage on Remainder"
@@ -1577,18 +1438,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1599,27 +1448,30 @@ msgstr ""
 
 msgctxt "view:account.invoice.line:"
 msgid "General"
-msgstr "Algemeen"
+msgstr "ທົ່ວໄປ"
 
+#, fuzzy
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Line"
-msgstr "Factuurregel"
+msgstr "ລາຍການ"
 
+#, fuzzy
 msgctxt "view:account.invoice.line:"
 msgid "Invoice Lines"
-msgstr "Factuurregels"
+msgstr "ລາຍການ"
 
 msgctxt "view:account.invoice.line:"
 msgid "Notes"
-msgstr "Aantekeningen"
+msgstr "ໝາຍເຫດ"
 
+#, fuzzy
 msgctxt "view:account.invoice.pay.ask:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "ຊໍາລະໃບເກັບເງິນ"
 
 msgctxt "view:account.invoice.pay.start:"
 msgid "Pay Invoice"
-msgstr ""
+msgstr "ຊໍາລະໃບເກັບເງິນ"
 
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Delta"
@@ -1629,30 +1481,36 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
-#, fuzzy
+msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
-msgstr "Betalingstermijn regel"
+msgstr ""
 
 msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "ຮູບແບບການຈ່າຍ"
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
-msgstr "Betalingstermijn"
+msgstr "ຮູບແບບການຈ່າຍ"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Terms"
-msgstr "Betalingstermijnen"
+msgstr "ຮູບແບບການຈ່າຍ"
 
+#, fuzzy
 msgctxt "view:account.invoice.print.warning:"
 msgid "Print Invoice"
-msgstr ""
+msgstr "ໃບເກັບເງິນຊົ່ວຄາວ"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "The invoices will be sent directly to the printer."
@@ -1662,22 +1520,23 @@ msgctxt "view:account.invoice.print.warning:"
 msgid "You have selected more than one invoice to print."
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Tax"
-msgstr "Belasting factuur"
+msgstr "ອາກອນໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Invoice Taxes"
-msgstr "Belastingen factuur"
+msgstr "ອາກອນໃບເກັບເງິນ"
 
 msgctxt "view:account.invoice.tax:"
 msgid "Tax Code"
-msgstr "Belastingcode"
+msgstr ""
 
-#, fuzzy
 msgctxt "view:account.invoice.tax:"
 msgid "Taxes"
-msgstr "Belastingen"
+msgstr "ອາກອນ"
 
 msgctxt "view:account.invoice:"
 msgid "Also known as Pro Forma"
@@ -1687,25 +1546,28 @@ msgctxt "view:account.invoice:"
 msgid "Are you sure to cancel the invoice?"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "ຊົ່ວຄາວ"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
-msgstr "Verkoopfactuur"
+msgstr "ໃບເກັບເງິນ"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgstr "ໃບເກັບເງິນ"
 
 msgctxt "view:account.invoice:"
 msgid "Other Info"
-msgstr "Aanvullende informatie"
+msgstr "ຂໍ້ມູນອື່ນໆ"
 
 msgctxt "view:account.invoice:"
 msgid "Pay"
@@ -1713,86 +1575,76 @@ msgstr ""
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
-msgstr "Betaling"
+msgstr "ການຈ່າຍ"
 
 msgctxt "view:account.invoice:"
 msgid "Post"
 msgstr ""
 
-#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Validate"
-msgstr "Goedkeuren"
+msgstr "ກວດສອບ"
 
-#, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Amount Second Currency"
-msgstr "Bedrag alternatieve valuta"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Credit"
-msgstr "Credit"
+msgstr "ມີ"
 
-#, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Debit"
-msgstr "Debit"
+msgstr ""
 
 #, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Lines to Pay"
-msgstr "Te betalen boekingen"
+msgstr "ຮ່ວງຈ່າຍ"
 
 #, fuzzy
 msgctxt "view:account.move.line:"
 msgid "Payment Lines"
-msgstr "Betalingen"
+msgstr "ຮ່ວງຊໍາລະ"
 
+#, fuzzy
 msgctxt "view:party.party:"
 msgid "Payment Terms"
-msgstr "Betalingstermijnen"
+msgstr "ຮູບແບບການຈ່າຍ"
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.credit,start,credit:"
 msgid "Credit"
-msgstr "Credit"
+msgstr "ມີ"
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.credit,start,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.pay,ask,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.pay,ask,pay:"
 msgid "OK"
-msgstr "Oké"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.pay,start,choice:"
 msgid "OK"
-msgstr "Oké"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.pay,start,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.payment_term.test,test,end:"
 msgid "Close"
-msgstr "Sluiten"
+msgstr ""
 
-#, fuzzy
 msgctxt "wizard_button:account.invoice.print,warning,end:"
 msgid "Cancel"
-msgstr "Annuleren"
+msgstr "ຍົກເລີກ"
 
 msgctxt "wizard_button:account.invoice.print,warning,print_:"
 msgid "Print"
-msgstr ""
+msgstr "ພິມ"
diff --git a/locale/lt_LT.po b/locale/lt_LT.po
index d668971..5082bd8 100644
--- a/locale/lt_LT.po
+++ b/locale/lt_LT.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,54 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr ""
@@ -748,8 +700,8 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
@@ -992,10 +944,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr ""
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr ""
@@ -1060,20 +1008,12 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
@@ -1100,83 +1040,37 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr ""
 
@@ -1184,20 +1078,12 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
@@ -1216,138 +1102,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr ""
@@ -1369,19 +1207,11 @@ msgid "Validated"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,19 +1219,11 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
@@ -1528,18 +1350,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1581,6 +1391,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr ""
 
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 462e686..2faf00d 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,58 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Bedrijf"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Instellingen"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Naam bijlage"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Reeks"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Credit inkoopnota reeks"
@@ -765,9 +713,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Betalingstermijn"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1005,9 +953,10 @@ msgctxt "field:party.address,invoice:"
 msgid "Invoice"
 msgstr "Verkoopfactuur"
 
+#, fuzzy
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Betalingstermijn crediteur"
 
 msgctxt "field:party.party,supplier_payment_term:"
 msgid "Supplier Payment Term"
@@ -1021,10 +970,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Gebruiken voor oplopend sorteren"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Verkoopfactuur"
@@ -1090,21 +1035,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Verkoopfacturen"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Credit inkoopnota's"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Inkoopfacturen"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Credit verkoopnota's"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1132,95 +1070,43 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Concept"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Geboekt"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Concept"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Geboekt"
-
-#, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Goedgekeurd"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Concept"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Geboekt"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Goedgekeurd"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Concept"
 
 #, fuzzy
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Geboekt"
 
 #, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Goedgekeurd"
 
@@ -1228,21 +1114,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Verkoopfactuur"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Credit inkoopnota's"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Inkoopfacturen"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Credit verkoopnota's"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Verkoopfacturen"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1260,139 +1139,91 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Betalingstermijnen"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Bedrag"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Basisbedrag"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Creditnotanummer:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Vervaldatum"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Specificatie"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Betreft:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Concept creditnota"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Concept verkoopfactuur"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Concept credit inkoopnota"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Concept inkoopfactuur"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Factuur:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Betalingstermijn"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Pro forma creditnota"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Pro forma verkoopfactuur"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Hoeveelheid"
 
 #, fuzzy
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referentie"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Credit inkoopnotanummer:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Inkoopfactuurnummer:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Belasting"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Belastingen"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Belastingen:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Totaal (excl. belasting):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Totaal:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Eenheids- prijs"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "BTW:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Geannuleerd"
@@ -1416,40 +1247,24 @@ msgid "Validated"
 msgstr "Goedgekeurd"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Credit verkoopnota"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Verkoopfactuur"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Credit inkoopnota"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Inkoopfactuur"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Credit verkoopnota"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Verkoopfactuur"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Credit inkoopnota"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Inkoopfactuur"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1577,18 +1392,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1629,6 +1432,10 @@ msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
+msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
 #, fuzzy
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
@@ -1638,9 +1445,10 @@ msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "Betalingstermijn regels"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
@@ -1650,9 +1458,10 @@ msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Terms"
 msgstr "Betalingstermijnen"
 
+#, fuzzy
 msgctxt "view:account.invoice.print.warning:"
 msgid "Print Invoice"
-msgstr ""
+msgstr "Concept verkoopfactuur"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "The invoices will be sent directly to the printer."
@@ -1687,13 +1496,15 @@ msgctxt "view:account.invoice:"
 msgid "Are you sure to cancel the invoice?"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
@@ -1707,9 +1518,10 @@ msgctxt "view:account.invoice:"
 msgid "Other Info"
 msgstr "Aanvullende informatie"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Pay"
-msgstr ""
+msgstr "_Betalen"
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 5197557..aa57069 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -5,16 +5,16 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 msgctxt "error:account.fiscalyear:"
 msgid "Fiscal year \"%(first)s\" and \"%(second)s\" have the same invoice sequence."
 msgstr ""
-"Ano fiscal \"%(first)s\" e \"%(second)s\" possuem a mesma sequencia de "
-"faturas."
+"Os exercícios fiscais \"%(first)s\" e \"%(second)s\" possuem a mesma "
+"sequência de faturas."
 
 msgctxt "error:account.fiscalyear:"
 msgid ""
 "You can not change invoice sequence in fiscal year \"%s\" because there are "
 "already posted invoices in this fiscal year."
 msgstr ""
-"Você não pode mudar a sequencia de fatura no ano fiscal \"%s\" por que já "
-"existem faturas lançadas para este ano fiscal."
+"Você não pode mudar a sequência de fatura no exercício fiscal \"%s\" porque "
+"já existem faturas lançadas para este exercício social."
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it has payments."
@@ -76,31 +76,33 @@ msgstr ""
 "Na fatura \"%s\" você não pode criar um pagamento parcial com um montante "
 "maior do que o montante a pagar."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Os valores de percentagem e divisor não são consistentes na linha "
-"\"%(line)s\" do termo de pagamento \"%(term)s\"."
+"\"%(line)s\" da forma de pagamento \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Invalid line \"%(line)s\" in payment term \"%(term)s\"."
-msgstr "Linha \"%(line)s\" inválida no termo de pagamento \"%(term)s\"."
+msgstr "Linha \"%(line)s\" inválida na forma de pagamento \"%(term)s\"."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Last line of payment term \"%s\" must be of type remainder."
 msgstr ""
-"A última linha do termo de pagamento \"%s\" deve ser do tipo remanescente."
+"A última linha da forma de pagamento \"%s\" deve ser do tipo remanescente."
 
 msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
-msgstr "Falta a linha de remanescente de pagamento no termo \"%s\"."
+msgstr "Falta a linha de remanescente de pagamento na forma \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "Você não pode adicionar a linha \"%(line)s\" à fatura \"%(invoice)s\" porque"
 " ela já foi confirmada, paga ou cancelada."
@@ -183,8 +185,9 @@ msgstr ""
 "A conta de crédito do diário \"%(journal)s\" é a mesma conta da fatura "
 "\"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Falta a conta de crédito do diário \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -208,8 +211,8 @@ msgid ""
 "There is no invoice sequence for invoice \"%(invoice)s\" on the "
 "period/fiscal year \"%(period)s\"."
 msgstr ""
-"Não há sequência de fatura para a fatura \"%(invoice)s\" no período/ano "
-"fiscal \"%(period)s\"."
+"Não há sequência de fatura para a fatura \"%(invoice)s\" no "
+"período/exercício social \"%(period)s\"."
 
 msgctxt "error:account.invoice:"
 msgid "You can not modify invoice \"%s\" because it is posted, paid or cancelled."
@@ -228,7 +231,7 @@ msgid ""
 "Period \"%(period)s\" must have the same company as its fiscal year "
 "(%(fiscalyear)s)."
 msgstr ""
-"O período \"%(period)s\" deve ter a mesma empresa e ano fiscal "
+"O período \"%(period)s\" deve ter a mesma empresa e exercício social "
 "(%(fiscalyear)s)."
 
 msgctxt "error:account.period:"
@@ -239,54 +242,6 @@ msgstr ""
 "Você não pode mudar a sequência de fatura no período \"%s\" porque já existe"
 " uma fatura confirmada para este período."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Arredondamento do Tributo"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Arredondamento de Tributos"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Empresa"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Configuração"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Data de criação"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Criado pelo usuário"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Método"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Nome"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Sequência"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Data de gravação"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Gravado pelo usuário"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Sequência de Nota de Crédito do Fornecedor"
@@ -301,7 +256,7 @@ msgstr "Sequência de Nota de Crédito do Cliente"
 
 msgctxt "field:account.fiscalyear,out_invoice_sequence:"
 msgid "Customer Invoice Sequence"
-msgstr "Sequência das Faturas do Cliente"
+msgstr "Sequência de Fatura do Cliente"
 
 msgctxt "field:account.invoice,account:"
 msgid "Account"
@@ -401,11 +356,11 @@ msgstr "Origem"
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
-msgstr "Parceiro"
+msgstr "Pessoa"
 
 msgctxt "field:account.invoice,party_lang:"
 msgid "Party Language"
-msgstr "Língua do parceiro"
+msgstr "Idioma da Pessoa"
 
 msgctxt "field:account.invoice,payment_lines:"
 msgid "Payment Lines"
@@ -413,7 +368,7 @@ msgstr "Linhas de Pagamento"
 
 msgctxt "field:account.invoice,payment_term:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
+msgstr "Forma de Pagamento"
 
 msgctxt "field:account.invoice,rec_name:"
 msgid "Name"
@@ -561,11 +516,11 @@ msgstr "Origem"
 
 msgctxt "field:account.invoice.line,party:"
 msgid "Party"
-msgstr "Parceiro"
+msgstr "Pessoa"
 
 msgctxt "field:account.invoice.line,party_lang:"
 msgid "Party Language"
-msgstr "Língua do parceiro"
+msgstr "Idioma da Pessoa"
 
 msgctxt "field:account.invoice.line,product:"
 msgid "Product"
@@ -697,7 +652,7 @@ msgstr "Linhas a Pagar"
 
 msgctxt "field:account.invoice.pay.ask,payment_lines:"
 msgid "Payment Lines"
-msgstr "Linas de Pagamento"
+msgstr "Linhas do Pagamento"
 
 msgctxt "field:account.invoice.pay.ask,type:"
 msgid "Type"
@@ -705,7 +660,7 @@ msgstr "Tipo"
 
 msgctxt "field:account.invoice.pay.start,amount:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
 msgctxt "field:account.invoice.pay.start,currency:"
 msgid "Currency"
@@ -773,7 +728,7 @@ msgstr "Gravado pelo usuário"
 
 msgctxt "field:account.invoice.payment_term.line,amount:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
 msgctxt "field:account.invoice.payment_term.line,create_date:"
 msgid "Create Date"
@@ -801,11 +756,11 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
+msgstr "Forma de Pagamento"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Porcentagem"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -853,7 +808,7 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,line:"
 msgid "Payment Term Line"
-msgstr "Linha do Prazo de Pagamento"
+msgstr "Linha da Forma de Pagamento"
 
 msgctxt "field:account.invoice.payment_term.line.relativedelta,month:"
 msgid "Month"
@@ -889,7 +844,7 @@ msgstr "Gravado pelo usuário"
 
 msgctxt "field:account.invoice.payment_term.test,amount:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
 msgctxt "field:account.invoice.payment_term.test,currency:"
 msgid "Currency"
@@ -909,7 +864,7 @@ msgstr "ID"
 
 msgctxt "field:account.invoice.payment_term.test,payment_term:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
+msgstr "Forma de Pagamento"
 
 msgctxt "field:account.invoice.payment_term.test,result:"
 msgid "Result"
@@ -917,7 +872,7 @@ msgstr "Resultado"
 
 msgctxt "field:account.invoice.payment_term.test.result,amount:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
 msgctxt "field:account.invoice.payment_term.test.result,currency_digits:"
 msgid "Currency Digits"
@@ -941,7 +896,7 @@ msgstr "Contas"
 
 msgctxt "field:account.invoice.tax,amount:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
 msgctxt "field:account.invoice.tax,base:"
 msgid "Base"
@@ -1033,11 +988,11 @@ msgstr "Faturar"
 
 msgctxt "field:party.party,customer_payment_term:"
 msgid "Customer Payment Term"
-msgstr "Prazo de Pagamento do Cliente"
+msgstr "Forma de Pagamento do Cliente"
 
 msgctxt "field:party.party,supplier_payment_term:"
 msgid "Supplier Payment Term"
-msgstr "Prazo de Pagamento do Fornecedor"
+msgstr "Forma de Pagamento do Fornecedor"
 
 msgctxt "help:account.invoice.credit.start,with_refund:"
 msgid "If true, the current invoice(s) will be paid."
@@ -1047,17 +1002,13 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Utilizar para ordenar as linhas em ordem ascendente."
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuração Contábil de Arredondamento de Tributos"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Faturar"
 
 msgctxt "model:account.invoice-account.move.line,name:"
 msgid "Invoice - Payment Line"
-msgstr "Fatura - Linha de Pagamentos"
+msgstr "Fatura - Linha de Pagamento"
 
 msgctxt "model:account.invoice.credit.start,name:"
 msgid "Credit Invoice"
@@ -1081,23 +1032,23 @@ msgstr "Pagar Fatura"
 
 msgctxt "model:account.invoice.payment_term,name:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
+msgstr "Forma de Pagamento"
 
 msgctxt "model:account.invoice.payment_term.line,name:"
 msgid "Payment Term Line"
-msgstr "Linha do Prazo de Pagamento"
+msgstr "Linha da Forma de Pagamento"
 
 msgctxt "model:account.invoice.payment_term.line.relativedelta,name:"
 msgid "Payment Term Line Relative Delta"
-msgstr "Linha do Prazo de Pagamento - Incremento Relativo"
+msgstr "Linha da Forma de Pagamento - Incremento Relativo"
 
 msgctxt "model:account.invoice.payment_term.test,name:"
 msgid "Test Payment Term"
-msgstr "Teste de Prazo de Pagamento"
+msgstr "Simulação da Forma de Pagamento"
 
 msgctxt "model:account.invoice.payment_term.test.result,name:"
 msgid "Test Payment Term"
-msgstr "Teste de Prazo de Pagamento"
+msgstr "Simulação da Forma de Pagamento"
 
 msgctxt "model:account.invoice.print.warning,name:"
 msgid "Print Invoice Report Warning"
@@ -1115,25 +1066,18 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Faturas"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de Crédito do Fornecedor"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Faturas de Fornecedor"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de Crédito"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Faturas"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
-msgstr "Condições de pagamento"
+msgstr "Formas de Pagamento"
 
 msgctxt "model:ir.action,name:credit"
 msgid "Credit"
@@ -1153,85 +1097,47 @@ msgstr "Pagar Fatura"
 
 msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
-msgstr "Teste de Prazo de Pagamento"
+msgstr "Simulação da Forma de Pagamento"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Todos"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Rascunho"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Todos"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Rascunho"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Confirmado"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
-msgid "All"
-msgstr "Todos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Rascunho"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Validado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr "Todos"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Rascunho"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Confirmado"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Validado"
 
@@ -1239,21 +1145,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Faturar"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Notas de Crédito do Fornecedor"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Faturas de Fornecedor"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Notas de Crédito"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Faturas"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1261,148 +1160,100 @@ msgstr "Faturas"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_form"
 msgid "Payment Terms"
-msgstr "Condições de pagamento"
+msgstr "Formas de Pagamento"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_term_test"
 msgid "Test Payment Term"
-msgstr "Prova de Prazo de Pagamento"
+msgstr "Simulação da Forma de Pagamento"
 
 msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
-msgstr "Condições de pagamento"
+msgstr "Formas de Pagamento"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Montante"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Base"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Nota de Crédito nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Data"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Data:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Descrição"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Descrição:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Rascunho de Nota de Crédito"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Rascunho de Fatura"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Rascunho de Nota de Crédito do Fornecedor"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Rascunho de Fatura de Fornecedor"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Fatura n°:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
-
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Nota de Crédito Pro Forma"
+msgstr "Forma de Pagamento"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Fatura Pro Forma"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Quantidade"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Referência"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Nota de Crédito de Fornecedor nº:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Fatura de Fornecedor nº:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Impostos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Impostos"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Tributos:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Total (sem tributos):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Total:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Preço unitário"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "IVA:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Nota de Crédito do Fornecedro Validada"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Fatura de Fornecedor Validada"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Por documento"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Por linha"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Por Documento"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Por Linha"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Cancelado"
@@ -1424,40 +1275,24 @@ msgid "Validated"
 msgstr "Validado"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Nota de Crédito"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Faturar"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de Crédito de Fornecedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Fatura de Fornecedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Nota de Crédito"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Faturar"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Nota de Crédito do Fornecedor"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Fatura do Fornecedor"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1583,18 +1418,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Quarta"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Configuração Contábil de Arredondamento de Tributo"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Configuração Contábil de Arredondamento de Tributo"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Faturar"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Você tem certeza que quer creditas estas faturas?"
@@ -1629,31 +1452,35 @@ msgstr "Pagar a Fatura"
 
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Delta"
-msgstr "Linha de Prazo de Pagamento - Incremento Relativo"
+msgstr "Linha de Forma de Pagamento - Incremento Relativo"
 
 msgctxt "view:account.invoice.payment_term.line.relativedelta:"
 msgid "Payment Term Line Relative Deltas"
-msgstr "Linha de Prazo de Pagamento - Incrementos Relativos"
+msgstr "Linha de Forma de Pagamento - Incrementos Relativos"
+
+msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
-msgstr "Linha do Prazo de Pagamento"
+msgstr "Linha da Forma de Pagamento"
 
 msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
-msgstr "Prazo de Pagamento - Resultados de Prova"
+msgstr "Forma de Pagamento - Resultados da Simulação"
 
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr "Prazo de Pagamento - Prova"
+msgstr "Forma de Pagamento - Simulação"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
-msgstr "Vencimento do pagamento"
+msgstr "Forma de Pagamento"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Terms"
-msgstr "Condições de pagamento"
+msgstr "Formas de Pagamento"
 
 msgctxt "view:account.invoice.print.warning:"
 msgid "Print Invoice"
@@ -1749,7 +1576,7 @@ msgstr "Linhas de Pagamento"
 
 msgctxt "view:party.party:"
 msgid "Payment Terms"
-msgstr "Condições de pagamento"
+msgstr "Formas de Pagamento"
 
 msgctxt "wizard_button:account.invoice.credit,start,credit:"
 msgid "Credit"
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 56d917f..6999735 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -22,11 +22,14 @@ msgstr ""
 "Вы не можете создать возврат для инвойса  \"%s\" так как он содержит "
 "платежи."
 
+#, fuzzy
 msgctxt "error:account.invoice.credit:"
 msgid ""
 "You can not credit with refund invoice \"%s\" because it is a supplier "
 "invoice/credit note."
 msgstr ""
+"Вы не можете создать возврат для инвойса  \"%s\" так как он содержит "
+"платежи."
 
 msgctxt "error:account.invoice.credit:"
 msgid "You can not credit with refund invoice \"%s\" because it is not posted."
@@ -71,10 +74,11 @@ msgid ""
 msgstr ""
 "У инвойса \"%s\" нельзя создать частичную оплату превышающую общую оплату."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "Проценты и делитель не совместимы в строке \"%(line)s\" правила оплаты "
 "\"%(term)s\"."
@@ -91,10 +95,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "Отсутствует строчка остатка в правиле оплаты \"%s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "Вы не можете добавить строчку \"%(line)s\" в инвойс \"%(invoice)s\" так как "
 "он \"Отправлен\", \"Оплачен\" или \"Отменен\"."
@@ -175,8 +180,9 @@ msgstr ""
 "Кредитный счет у журнала \"%(journal)s\" точно такой же как счет инвойса "
 "\"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "Отсутствует кредитный счет в журнале \"%s\"."
 
 msgctxt "error:account.invoice:"
@@ -231,64 +237,6 @@ msgstr ""
 "Вы не можете изменить нумерацию в периоде \"%s\" так как уже есть "
 "отправленные инвойсы в этом периоде."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Учет.орг."
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Конфигурация"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Дата создания"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Создано пользователем"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Метод"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Правило оплаты"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Последовательность"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Дата изменения"
-
-#, fuzzy
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Изменено пользователем"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Нумерация сторно поставщиков"
@@ -397,9 +345,10 @@ msgctxt "field:account.invoice,number:"
 msgid "Number"
 msgstr "Номер"
 
+#, fuzzy
 msgctxt "field:account.invoice,origins:"
 msgid "Origins"
-msgstr ""
+msgstr "Первоисточник"
 
 msgctxt "field:account.invoice,party:"
 msgid "Party"
@@ -806,9 +755,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Правило оплаты"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Процент"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1069,10 +1018,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Используется для сортировки строк в порядке возрастания"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Инвойс"
@@ -1138,21 +1083,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Инвойсы"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Сторно поставщиков"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Инвойсы поставщиков"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Сторно"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Инвойсы"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1178,83 +1116,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Все"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Черновик"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Отправлен"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Утвержденный"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr "Все"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr "Черновик"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr "Отправлен"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr "Утвержденный"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Все"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Черновик"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Отправлен"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Утвержденный"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Все"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Черновик"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Отправлен"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Утвержденный"
 
@@ -1262,21 +1162,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Инвойс"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Сторно поставщиков"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Инвойсы поставщиков"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Сторно"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Инвойсы"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1294,139 +1187,91 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Правила оплаты"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Сумма"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "База"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Сторно №:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Дата"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Дата:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Описание"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Описание:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Черновое сторно"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Черновой инвойс"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Черновое сторно поставщика"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Черновой инвойс поставщика"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Инвойс №:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Правило оплаты"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Предварительное сторно"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Предварительный инвойс"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Кол-во"
 
 #, fuzzy
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Ссылка"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Сторно поставщика №:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Инвойс поставщика №:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Налог"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Налоги"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Налоги:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Итого (без налогов):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Итого:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Цена за единицу"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "ИНН:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Утвержденное сторно поставщика"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Утвержденный инвойс поставщика"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Отменено"
@@ -1448,40 +1293,24 @@ msgid "Validated"
 msgstr "Утвержденный"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Сторно"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Инвойс"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Сторно поставщика"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Инвойс поставщика"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Сторно"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Инвойс"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Сторно поставщика"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Инвойс поставщика"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1614,18 +1443,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Среда"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Вы уверены, что хотите выставить Сторно для этих инвойсов?"
@@ -1667,6 +1484,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Строка правила оплаты"
 
@@ -1674,9 +1495,10 @@ msgctxt "view:account.invoice.payment_term.test.result:"
 msgid "Payment Term Test Results"
 msgstr ""
 
+#, fuzzy
 msgctxt "view:account.invoice.payment_term.test:"
 msgid "Payment Term Test"
-msgstr ""
+msgstr "Строки правила оплаты"
 
 msgctxt "view:account.invoice.payment_term:"
 msgid "Payment Term"
@@ -1724,11 +1546,11 @@ msgstr "Вы уверены что хотите отменить инвойс?"
 
 msgctxt "view:account.invoice:"
 msgid "Cancel"
-msgstr ""
+msgstr "Отменить"
 
 msgctxt "view:account.invoice:"
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 msgctxt "view:account.invoice:"
 msgid "Invoice"
@@ -1742,17 +1564,19 @@ msgctxt "view:account.invoice:"
 msgid "Other Info"
 msgstr "Другая информация"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Pay"
-msgstr ""
+msgstr "Оплата"
 
 msgctxt "view:account.invoice:"
 msgid "Payment"
 msgstr "Оплата"
 
+#, fuzzy
 msgctxt "view:account.invoice:"
 msgid "Post"
-msgstr ""
+msgstr "Отправить"
 
 msgctxt "view:account.invoice:"
 msgid "Validate"
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
index dcbb375..55beea4 100644
--- a/locale/sl_SI.po
+++ b/locale/sl_SI.po
@@ -74,10 +74,11 @@ msgstr ""
 "Pri računu \"%s\" ni možno izdelati delnega plačila z zneskom, ki je večji "
 "od zneska za plačilo."
 
+#, fuzzy
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 "V postavki \"%(line)s\" plačilnega roka \"%(term)s\" vrednosti odstotka in "
 "delitelja nista skladna."
@@ -94,10 +95,11 @@ msgctxt "error:account.invoice.payment_term:"
 msgid "Missing remainder line in payment term \"%s\"."
 msgstr "V plačilnem roku \"%s\" manjka postavka preostanka."
 
+#, fuzzy
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 "Postavke \"%(line)s\" pri računu \"%(invoice)s\" ni možno dodati, ker je "
 "bodisi knjižen ali plačan bodisi preklican."
@@ -177,8 +179,9 @@ msgstr ""
 "Kreditni konto v dnevniku \"%(journal)s\" je enak kontu računa "
 "\"%(invoice)s\"."
 
+#, fuzzy
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr "V dnevniku \"%s\" manjka kreditni konto."
 
 msgctxt "error:account.invoice:"
@@ -231,54 +234,6 @@ msgstr ""
 "Štetja računov v obdobju \"%s\" ni možno popravljati, ker je račun že "
 "knjižen v tem obdobju."
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr "Zaokrožitev davka"
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr "Zaokrožitve davka"
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr "Družba"
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr "Nastavitve"
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr "Izdelano"
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr "Izdelal"
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr "ID"
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr "Metoda"
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr "Ime"
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr "Štetje"
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr "Zapisano"
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr "Zapisal"
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr "Štetje prejetih dobropisov"
@@ -795,9 +750,9 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr "Plačilni rok"
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
-msgstr "Odstotek"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
+msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
 msgid "Name"
@@ -1039,10 +994,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr "Za naraščajoče razvrščanje postavk"
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Kontno zaokroževanje davkov"
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr "Račun"
@@ -1107,21 +1058,14 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr "Računi"
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Prejeti dobropisi"
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Prejeti računi"
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Dobropisi"
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Računi"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
 msgid "Payment Terms"
@@ -1147,83 +1091,45 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr "Preizkus plačilnega roka"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr "Vse"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr "Priprava"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr "Knjiženi"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Odobreni"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr "Vse"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr "Priprava"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr "Knjiženi"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr "Odobreni"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr "Vse"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr "Priprava"
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+#, fuzzy
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr "Knjiženi"
 
+#, fuzzy
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
-msgid "Validated"
-msgstr "Odobreni"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
-msgid "All"
-msgstr "Vse"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
-msgid "Draft"
-msgstr "Priprava"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
-msgid "Posted"
-msgstr "Knjiženi"
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr "Odobreni"
 
@@ -1231,21 +1137,14 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr "Račun"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr "Prejeti dobropisi"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+#, fuzzy
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr "Prejeti računi"
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr "Dobropisi"
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
-msgstr "Računi"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
+msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
 msgid "Invoices"
@@ -1263,138 +1162,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr "Plačilni roki"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ":"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr "Znesek"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr "Osnova"
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr "Dobropis št.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr "Datum"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr "Datum:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr "Opis"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr "Opis:"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr "Osnutek dobropisa"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr "Osnutek računa"
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr "Osnutek dobropisa dobavitelja"
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr "Osnutek računa dobavitelja"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr "Račun št."
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr "Plačilni rok"
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr "Formalen dobropis"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr "Predračun"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr "Količina"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr "Sklic"
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr "Prejeti dobropis št.:"
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr "Prejeti račun št.:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr "Davek"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr "Davki"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr "Davki:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr "Skupaj (brez davkov):"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr "Skupaj:"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr "Cena"
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr "DDV:"
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr "Odobreni prejeti dobropis"
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr "Odobreni prejeti račun"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr "Na dokument"
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr "Na postavko"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr "Na dokument"
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr "Na postavko"
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr "Preklicano"
@@ -1416,40 +1267,24 @@ msgid "Validated"
 msgstr "Odobreno"
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
-msgstr "Dobropis"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr "Račun"
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr "Prejeti dobropis"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
-msgstr "Prejeti račun"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
 msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr "Dobropis"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr "Račun"
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
-msgstr "Prejeti dobropis"
+msgid "Customer"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
-msgstr "Prejeti račun"
+msgid "Supplier"
+msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
 msgid "Comment"
@@ -1575,18 +1410,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr "Sreda"
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr "Zaokroževanje davkov"
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr "Zaokroževanja davkov"
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr "Račun"
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr "Ali res želite izvesti dobropis teh računov?"
@@ -1628,6 +1451,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr "Obroki postavk plačilnega roka"
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr "Postavka plačilnega roka"
 
diff --git a/locale/hu_HU.po b/locale/zh_CN.po
similarity index 83%
copy from locale/hu_HU.po
copy to locale/zh_CN.po
index d668971..5082bd8 100644
--- a/locale/hu_HU.po
+++ b/locale/zh_CN.po
@@ -60,8 +60,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.payment_term.line:"
 msgid ""
-"Percentage and Divisor values are not consistent in line \"%(line)s\" of "
-"payment term \"%(term)s\"."
+"Ratio and Divisor values are not consistent in line \"%(line)s\" of payment "
+"term \"%(term)s\"."
 msgstr ""
 
 msgctxt "error:account.invoice.payment_term:"
@@ -78,8 +78,8 @@ msgstr ""
 
 msgctxt "error:account.invoice.tax:"
 msgid ""
-"You can not add line \"%(line)s\" to invoice \"%(invoice)s\" because it is "
-"posted, paid or canceled."
+"You can not add tax to invoice \"%(invoice)s\" because it is posted, paid or"
+" canceled."
 msgstr ""
 
 msgctxt "error:account.invoice.tax:"
@@ -141,7 +141,7 @@ msgid ""
 msgstr ""
 
 msgctxt "error:account.invoice:"
-msgid "The credit account on journal %s\" is missing."
+msgid "The credit account on journal \"%s\" is missing."
 msgstr ""
 
 msgctxt "error:account.invoice:"
@@ -184,54 +184,6 @@ msgid ""
 "already an invoice posted in this period"
 msgstr ""
 
-msgctxt "field:account.configuration,tax_rounding:"
-msgid "Tax Rounding"
-msgstr ""
-
-msgctxt "field:account.configuration,tax_roundings:"
-msgid "Tax Roundings"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,company:"
-msgid "Company"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,configuration:"
-msgid "Configuration"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_date:"
-msgid "Create Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,create_uid:"
-msgid "Create User"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,id:"
-msgid "ID"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,method:"
-msgid "Method"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,rec_name:"
-msgid "Name"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,sequence:"
-msgid "Sequence"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_date:"
-msgid "Write Date"
-msgstr ""
-
-msgctxt "field:account.configuration.tax_rounding,write_uid:"
-msgid "Write User"
-msgstr ""
-
 msgctxt "field:account.fiscalyear,in_credit_note_sequence:"
 msgid "Supplier Credit Note Sequence"
 msgstr ""
@@ -748,8 +700,8 @@ msgctxt "field:account.invoice.payment_term.line,payment:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "field:account.invoice.payment_term.line,percentage:"
-msgid "Percentage"
+msgctxt "field:account.invoice.payment_term.line,ratio:"
+msgid "Ratio"
 msgstr ""
 
 msgctxt "field:account.invoice.payment_term.line,rec_name:"
@@ -992,10 +944,6 @@ msgctxt "help:account.invoice.payment_term.line,sequence:"
 msgid "Use to order lines in ascending order"
 msgstr ""
 
-msgctxt "model:account.configuration.tax_rounding,name:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
 msgctxt "model:account.invoice,name:"
 msgid "Invoice"
 msgstr ""
@@ -1060,20 +1008,12 @@ msgctxt "model:ir.action,name:act_invoice_form2"
 msgid "Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_in_invoice_form"
+msgctxt "model:ir.action,name:act_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.action,name:act_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.action,name:act_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.action,name:act_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.action,name:act_payment_term_form"
@@ -1100,83 +1040,37 @@ msgctxt "model:ir.action,name:wizard_payment_term_test"
 msgid "Test Payment Term"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_credit_note_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_all"
-msgid "All"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_draft"
-msgid "Draft"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_posted"
-msgid "Posted"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_in_invoice_domain_validated"
-msgid "Validated"
-msgstr ""
-
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_in_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_credit_note_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_in_domain_validated"
 msgid "Validated"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_all"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_all"
 msgid "All"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_draft"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_draft"
 msgid "Draft"
 msgstr ""
 
-msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_posted"
+msgctxt "model:ir.action.act_window.domain,name:act_invoice_out_domain_posted"
 msgid "Posted"
 msgstr ""
 
 msgctxt ""
-"model:ir.action.act_window.domain,name:act_invoice_out_invoice_domain_validated"
+"model:ir.action.act_window.domain,name:act_invoice_out_domain_validated"
 msgid "Validated"
 msgstr ""
 
@@ -1184,20 +1078,12 @@ msgctxt "model:ir.sequence.type,name:sequence_type_account_invoice"
 msgid "Invoice"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_credit_note_form"
-msgid "Supplier Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_in_invoice_form"
+msgctxt "model:ir.ui.menu,name:menu_invoice_in_form"
 msgid "Supplier Invoices"
 msgstr ""
 
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_credit_note_form"
-msgid "Credit Notes"
-msgstr ""
-
-msgctxt "model:ir.ui.menu,name:menu_invoice_out_invoice_form"
-msgid "Invoices"
+msgctxt "model:ir.ui.menu,name:menu_invoice_out_form"
+msgid "Customer Invoices"
 msgstr ""
 
 msgctxt "model:ir.ui.menu,name:menu_invoices"
@@ -1216,138 +1102,90 @@ msgctxt "model:ir.ui.menu,name:menu_payment_terms_configuration"
 msgid "Payment Terms"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid ":"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Amount"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Base"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Date:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Description:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Draft Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Draft Supplier Invoice"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Payment Term"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Pro forma Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Pro forma Invoice"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Quantity"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Reference"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Supplier Credit Note N°:"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Supplier Invoice N°:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Tax"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Taxes:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total (excl. taxes):"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Total:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "Unit Price"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
+msgctxt "report:account.invoice:"
 msgid "VAT:"
 msgstr ""
 
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Credit Note"
-msgstr ""
-
-msgctxt "odt:account.invoice:"
-msgid "Validated Supplier Invoice"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration,tax_rounding:"
-msgid "Per Line"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Document"
-msgstr ""
-
-msgctxt "selection:account.configuration.tax_rounding,method:"
-msgid "Per Line"
-msgstr ""
-
 msgctxt "selection:account.invoice,state:"
 msgid "Canceled"
 msgstr ""
@@ -1369,19 +1207,11 @@ msgid "Validated"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice,type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice,type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
@@ -1389,19 +1219,11 @@ msgid ""
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Credit Note"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Invoice"
-msgstr ""
-
-msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Credit Note"
+msgid "Customer"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,invoice_type:"
-msgid "Supplier Invoice"
+msgid "Supplier"
 msgstr ""
 
 msgctxt "selection:account.invoice.line,type:"
@@ -1528,18 +1350,6 @@ msgctxt "selection:account.invoice.payment_term.line.relativedelta,weekday:"
 msgid "Wednesday"
 msgstr ""
 
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Rounding"
-msgstr ""
-
-msgctxt "view:account.configuration.tax_rounding:"
-msgid "Account Configuration Tax Roundings"
-msgstr ""
-
-msgctxt "view:account.configuration:"
-msgid "Invoice"
-msgstr ""
-
 msgctxt "view:account.invoice.credit.start:"
 msgid "Are you sure to credit those/this invoice(s)?"
 msgstr ""
@@ -1581,6 +1391,10 @@ msgid "Payment Term Line Relative Deltas"
 msgstr ""
 
 msgctxt "view:account.invoice.payment_term.line:"
+msgid "%"
+msgstr ""
+
+msgctxt "view:account.invoice.payment_term.line:"
 msgid "Payment Term Line"
 msgstr ""
 
diff --git a/party.py b/party.py
index 769f514..c9dba11 100644
--- a/party.py
+++ b/party.py
@@ -4,10 +4,10 @@ from trytond.model import ModelView, ModelSQL, fields
 from trytond.pool import Pool, PoolMeta
 
 __all__ = ['Address', 'Party']
-__metaclass__ = PoolMeta
 
 
 class Address:
+    __metaclass__ = PoolMeta
     __name__ = 'party.address'
     invoice = fields.Boolean('Invoice')
 
diff --git a/party.xml b/party.xml
index 9bacb57..a697959 100644
--- a/party.xml
+++ b/party.xml
@@ -14,6 +14,13 @@ this repository contains the full copyright notices and license terms. -->
             <field name="name">address_form</field>
         </record>
 
+        <record model="ir.ui.view" id="address_view_tree_sequence">
+            <field name="model">party.address</field>
+            <field name="inherit" ref="party.address_view_tree_sequence"/>
+            <field name="name">address_tree_sequence</field>
+        </record>
+
+
         <record model="ir.ui.view" id="party_view_form">
             <field name="model">party.party</field>
             <field name="inherit" ref="party.party_view_form"/>
diff --git a/payment_term.py b/payment_term.py
index cc09f9d..6bde5f4 100644
--- a/payment_term.py
+++ b/payment_term.py
@@ -105,12 +105,12 @@ class PaymentTermLine(ModelSQL, ModelView):
             ('percent_on_total', 'Percentage on Total'),
             ('remainder', 'Remainder'),
             ], 'Type', required=True)
-    percentage = fields.Numeric('Percentage', digits=(16, 8),
+    ratio = fields.Numeric('Ratio', digits=(14, 10),
         states={
             'invisible': ~Eval('type').in_(['percent', 'percent_on_total']),
             'required': Eval('type').in_(['percent', 'percent_on_total']),
             }, depends=['type'])
-    divisor = fields.Numeric('Divisor', digits=(16, 8),
+    divisor = fields.Numeric('Divisor', digits=(10, 14),
         states={
             'invisible': ~Eval('type').in_(['percent', 'percent_on_total']),
             'required': Eval('type').in_(['percent', 'percent_on_total']),
@@ -135,7 +135,7 @@ class PaymentTermLine(ModelSQL, ModelView):
         super(PaymentTermLine, cls).__setup__()
         cls._order.insert(0, ('sequence', 'ASC'))
         cls._error_messages.update({
-                'invalid_percentage_and_divisor': ('Percentage and '
+                'invalid_ratio_and_divisor': ('Ratio and '
                     'Divisor values are not consistent in line "%(line)s" '
                     'of payment term "%(term)s".'),
                 })
@@ -145,8 +145,8 @@ class PaymentTermLine(ModelSQL, ModelView):
         TableHandler = backend.get('TableHandler')
         sql_table = cls.__table__()
         super(PaymentTermLine, cls).__register__(module_name)
-        cursor = Transaction().cursor
-        table = TableHandler(cursor, cls, module_name)
+        cursor = Transaction().connection.cursor()
+        table = TableHandler(cls, module_name)
 
         # Migration from 1.0 percent change into percentage
         if table.column_exist('percent'):
@@ -173,6 +173,13 @@ class PaymentTermLine(ModelSQL, ModelView):
         # Migration from 2.4: drop required on sequence
         table.not_null_action('sequence', action='remove')
 
+        # Migration from 3.8: rename percentage into ratio
+        if table.column_exist('percentage'):
+            cursor.execute(*sql_table.update(
+                    columns=[sql_table.ratio],
+                    values=[sql_table.percentage / 100]))
+            table.drop_column('percentage')
+
     @staticmethod
     def order_sequence(tables):
         table, _ = tables[None]
@@ -192,24 +199,24 @@ class PaymentTermLine(ModelSQL, ModelView):
             self.amount = Decimal('0.0')
             self.currency = None
         if self.type not in ('percent', 'percent_on_total'):
-            self.percentage = Decimal('0.0')
+            self.ratio = Decimal('0.0')
             self.divisor = Decimal('0.0')
 
-    @fields.depends('percentage')
-    def on_change_percentage(self):
-        if not self.percentage:
-            self.divisor = 0.0
+    @fields.depends('ratio')
+    def on_change_ratio(self):
+        if not self.ratio:
+            self.divisor = Decimal('0.0')
         else:
-            self.divisor = self.round(Decimal('100.0') / self.percentage,
+            self.divisor = self.round(1 / self.ratio,
                 self.__class__.divisor.digits[1])
 
     @fields.depends('divisor')
     def on_change_divisor(self):
         if not self.divisor:
-            self.percentage = 0.0
+            self.ratio = Decimal('0.0')
         else:
-            self.percentage = self.round(Decimal('100.0') / self.divisor,
-                self.__class__.percentage.digits[1])
+            self.ratio = self.round(1 / self.divisor,
+                self.__class__.ratio.digits[1])
 
     @fields.depends('currency')
     def on_change_with_currency_digits(self, name=None):
@@ -237,11 +244,9 @@ class PaymentTermLine(ModelSQL, ModelView):
         if self.type == 'fixed':
             return Currency.compute(self.currency, self.amount, currency)
         elif self.type == 'percent':
-            return currency.round(
-                remainder * self.percentage / Decimal('100'))
+            return currency.round(remainder * self.ratio)
         elif self.type == 'percent_on_total':
-            return currency.round(
-                amount * self.percentage / Decimal('100'))
+            return currency.round(amount * self.ratio)
         elif self.type == 'remainder':
             return currency.round(remainder)
         return None
@@ -254,33 +259,26 @@ class PaymentTermLine(ModelSQL, ModelView):
     @classmethod
     def validate(cls, lines):
         super(PaymentTermLine, cls).validate(lines)
-        cls.check_percentage_and_divisor(lines)
+        cls.check_ratio_and_divisor(lines)
 
     @classmethod
-    def check_percentage_and_divisor(cls, lines):
-        "Check consistency between percentage and divisor"
-        percentage_digits = cls.percentage.digits[1]
-        divisor_digits = cls.divisor.digits[1]
-        for line in lines:
+    def check_ratio_and_divisor(cls, lines):
+        "Check consistency between ratio and divisor"
+        # Use a copy because on_change will change the records
+        for line in cls.browse(lines):
             if line.type not in ('percent', 'percent_on_total'):
                 continue
-            if line.percentage is None or line.divisor is None:
-                cls.raise_user_error('invalid_percentage_and_divisor', {
+            if line.ratio is None or line.divisor is None:
+                cls.raise_user_error('invalid_ratio_and_divisor', {
                         'line': line.rec_name,
                         'term': line.payment.rec_name,
                         })
-            if line.percentage == line.divisor == Decimal('0.0'):
-                continue
-            percentage = line.percentage
+            ratio = line.ratio
             divisor = line.divisor
-            calc_percentage = cls.round(Decimal('100.0') / divisor,
-                    percentage_digits)
-            calc_divisor = cls.round(Decimal('100.0') / percentage,
-                    divisor_digits)
-            if (percentage == Decimal('0.0') or divisor == Decimal('0.0')
-                    or percentage != calc_percentage
-                    and divisor != calc_divisor):
-                cls.raise_user_error('invalid_percentage_and_divisor', {
+            line.on_change_ratio()
+            line.on_change_divisor()
+            if (line.divisor != divisor) or (line.ratio != ratio):
+                cls.raise_user_error('invalid_ratio_and_divisor', {
                         'line': line.rec_name,
                         'term': line.payment.rec_name,
                         })
@@ -334,7 +332,7 @@ class PaymentTermLineRelativeDelta(ModelSQL, ModelView):
     @classmethod
     def __register__(cls, module_name):
         TableHandler = backend.get('TableHandler')
-        cursor = Transaction().cursor
+        cursor = Transaction().connection.cursor()
         pool = Pool()
         Line = pool.get('account.invoice.payment_term.line')
         sql_table = cls.__table__()
@@ -342,7 +340,7 @@ class PaymentTermLineRelativeDelta(ModelSQL, ModelView):
 
         super(PaymentTermLineRelativeDelta, cls).__register__(module_name)
 
-        line_table = TableHandler(cursor, Line, module_name)
+        line_table = TableHandler(Line, module_name)
 
         # Migration from 3.4
         fields = ['day', 'month', 'weekday', 'months', 'weeks', 'days']
diff --git a/setup.py b/setup.py
index 6d3a2c9..cef8b18 100644
--- a/setup.py
+++ b/setup.py
@@ -5,11 +5,17 @@
 from setuptools import setup
 import re
 import os
-import ConfigParser
+import io
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
 
 
 def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+    return io.open(
+        os.path.join(os.path.dirname(__file__), fname),
+        'r', encoding='utf-8').read()
 
 
 def get_require_version(name):
@@ -21,7 +27,7 @@ def get_require_version(name):
         major_version, minor_version + 1)
     return require
 
-config = ConfigParser.ConfigParser()
+config = ConfigParser()
 config.readfp(open('tryton.cfg'))
 info = dict(config.items('tryton'))
 for key in ('depends', 'extras_depend', 'xml'):
@@ -43,7 +49,7 @@ if minor_version % 2:
 
 requires = ['python-dateutil', 'python-sql >= 0.4']
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res)(\W|$)', dep):
         requires.append(get_require_version('trytond_%s' % dep))
 requires.append(get_require_version('trytond'))
 
@@ -82,6 +88,7 @@ setup(name=name,
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
         'Natural Language :: Catalan',
+        'Natural Language :: Chinese (Simplified)',
         'Natural Language :: Czech',
         'Natural Language :: Dutch',
         'Natural Language :: English',
@@ -95,6 +102,9 @@ setup(name=name,
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Office/Business',
@@ -111,4 +121,10 @@ setup(name=name,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
     tests_require=tests_require,
+    use_2to3=True,
+    convert_2to3_doctests=[
+        'tests/scenario_invoice.rst',
+        'tests/scenario_invoice_alternate_currency.rst',
+        'tests/scenario_invoice_supplier.rst',
+        ],
     )
diff --git a/tests/__init__.py b/tests/__init__.py
index b2f4e54..82616d6 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,10 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
 
-from .test_account_invoice import suite
+try:
+    from trytond.modules.account_invoice.tests.test_account_invoice import (
+        suite, set_invoice_sequences)
+except ImportError:
+    from .test_account_invoice import suite, set_invoice_sequences
 
-__all__ = ['suite']
+__all__ = ['suite', 'set_invoice_sequences']
diff --git a/tests/scenario_invoice.rst b/tests/scenario_invoice.rst
index 95cd368..b5fbd45 100644
--- a/tests/scenario_invoice.rst
+++ b/tests/scenario_invoice.rst
@@ -12,7 +12,7 @@ Imports::
     ...     get_company
     >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
     ...     create_chart, get_accounts, create_tax, set_tax_code
-    >>> from.trytond.modules.account_invoice.tests.tools import \
+    >>> from trytond.modules.account_invoice.tests.tools import \
     ...     set_fiscalyear_invoice_sequences
     >>> today = datetime.date.today()
 
@@ -49,6 +49,7 @@ Create chart of accounts::
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
     >>> account_tax = accounts['tax']
+    >>> account_cash = accounts['cash']
 
 Create tax::
 
@@ -59,6 +60,23 @@ Create tax::
     >>> credit_note_base_code = tax.credit_note_base_code
     >>> credit_note_tax_code = tax.credit_note_tax_code
 
+Set Cash journal::
+
+    >>> Journal = Model.get('account.journal')
+    >>> journal_cash, = Journal.find([('type', '=', 'cash')])
+    >>> journal_cash.credit_account = account_cash
+    >>> journal_cash.debit_account = account_cash
+    >>> journal_cash.save()
+
+Create Write-Off journal::
+
+    >>> Sequence = Model.get('ir.sequence')
+    >>> sequence_journal, = Sequence.find([('code', '=', 'account.journal')])
+    >>> journal_writeoff = Journal(name='Write-Off', type='write-off',
+    ...     sequence=sequence_journal,
+    ...     credit_account=revenue, debit_account=expense)
+    >>> journal_writeoff.save()
+
 Create party::
 
     >>> Party = Model.get('party.party')
@@ -89,7 +107,7 @@ Create payment term::
 
     >>> PaymentTerm = Model.get('account.invoice.payment_term')
     >>> payment_term = PaymentTerm(name='Term')
-    >>> line = payment_term.lines.new(type='percent', percentage=Decimal(50))
+    >>> line = payment_term.lines.new(type='percent', ratio=Decimal('.5'))
     >>> delta = line.relativedeltas.new(days=20)
     >>> line = payment_term.lines.new(type='remainder')
     >>> delta = line.relativedeltas.new(days=40)
@@ -119,6 +137,18 @@ Create invoice::
     Decimal('20.00')
     >>> invoice.total_amount
     Decimal('240.00')
+    >>> invoice.save()
+
+Test change tax::
+
+    >>> tax_line, = invoice.taxes
+    >>> tax_line.tax == tax
+    True
+    >>> tax_line.tax = None
+    >>> tax_line.tax = tax
+
+Post invoice::
+
     >>> invoice.click('post')
     >>> invoice.state
     u'posted'
@@ -192,6 +222,62 @@ Credit invoice with refund::
     >>> credit_note_tax_code.sum
     Decimal('20.00')
 
+Pay invoice::
+
+    >>> invoice, = invoice.duplicate()
+    >>> invoice.click('post')
+
+    >>> pay = Wizard('account.invoice.pay', [invoice])
+    >>> pay.form.amount
+    Decimal('240.00')
+    >>> pay.form.amount = Decimal('120.00')
+    >>> pay.form.journal = journal_cash
+    >>> pay.execute('choice')
+    >>> pay.state
+    'end'
+
+    >>> pay = Wizard('account.invoice.pay', [invoice])
+    >>> pay.form.amount
+    Decimal('120.00')
+    >>> pay.form.amount = Decimal('20.00')
+    >>> pay.form.journal = journal_cash
+    >>> pay.execute('choice')
+    >>> pay.form.type = 'partial'
+    >>> pay.form.amount
+    Decimal('20.00')
+    >>> len(pay.form.lines_to_pay)
+    1
+    >>> len(pay.form.payment_lines)
+    0
+    >>> len(pay.form.lines)
+    1
+    >>> pay.form.amount_writeoff
+    Decimal('100.00')
+    >>> pay.execute('pay')
+
+    >>> pay = Wizard('account.invoice.pay', [invoice])
+    >>> pay.form.amount
+    Decimal('-20.00')
+    >>> pay.form.amount = Decimal('99.00')
+    >>> pay.form.journal = journal_cash
+    >>> pay.execute('choice')
+    >>> pay.form.type = 'writeoff'
+    >>> pay.form.journal_writeoff = journal_writeoff
+    >>> pay.form.amount
+    Decimal('99.00')
+    >>> len(pay.form.lines_to_pay)
+    1
+    >>> len(pay.form.payment_lines)
+    1
+    >>> len(pay.form.lines)
+    1
+    >>> pay.form.amount_writeoff
+    Decimal('1.00')
+    >>> pay.execute('pay')
+
+    >>> invoice.state
+    u'paid'
+
 Create empty invoice::
 
     >>> invoice = Invoice()
@@ -200,3 +286,29 @@ Create empty invoice::
     >>> invoice.click('post')
     >>> invoice.state
     u'paid'
+
+Create some complex invoice and test its taxes base rounding::
+
+    >>> invoice = Invoice()
+    >>> invoice.party = party
+    >>> invoice.payment_term = payment_term
+    >>> invoice.invoice_date = today
+    >>> line = invoice.lines.new()
+    >>> line.product = product
+    >>> line.quantity = 1
+    >>> line.unit_price = Decimal('0.0035')
+    >>> line = invoice.lines.new()
+    >>> line.product = product
+    >>> line.quantity = 1
+    >>> line.unit_price = Decimal('0.0035')
+    >>> invoice.save()
+    >>> invoice.untaxed_amount
+    Decimal('0.00')
+    >>> invoice.taxes[0].base == invoice.untaxed_amount
+    True
+    >>> found_invoice, = Invoice.find([('untaxed_amount', '=', Decimal(0))])
+    >>> found_invoice.id == invoice.id
+    True
+    >>> found_invoice, = Invoice.find([('total_amount', '=', Decimal(0))])
+    >>> found_invoice.id == invoice.id
+    True
diff --git a/tests/scenario_invoice_alternate_currency.rst b/tests/scenario_invoice_alternate_currency.rst
index 197dad6..b0b7e6c 100644
--- a/tests/scenario_invoice_alternate_currency.rst
+++ b/tests/scenario_invoice_alternate_currency.rst
@@ -14,7 +14,7 @@ Imports::
     ...     get_company
     >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
     ...     create_chart, get_accounts, create_tax, set_tax_code
-    >>> from.trytond.modules.account_invoice.tests.tools import \
+    >>> from trytond.modules.account_invoice.tests.tools import \
     ...     set_fiscalyear_invoice_sequences
     >>> today = datetime.date.today()
 
@@ -91,7 +91,7 @@ Create payment term::
 
     >>> PaymentTerm = Model.get('account.invoice.payment_term')
     >>> payment_term = PaymentTerm(name='Term')
-    >>> line = payment_term.lines.new(type='percent', percentage=Decimal(50))
+    >>> line = payment_term.lines.new(type='percent', ratio=Decimal('.5'))
     >>> delta = line.relativedeltas.new(days=20)
     >>> line = payment_term.lines.new(type='remainder')
     >>> delta = line.relativedeltas.new(days=40)
diff --git a/tests/scenario_invoice_supplier.rst b/tests/scenario_invoice_supplier.rst
index cb1e565..ff0d962 100644
--- a/tests/scenario_invoice_supplier.rst
+++ b/tests/scenario_invoice_supplier.rst
@@ -12,7 +12,7 @@ Imports::
     ...     get_company
     >>> from trytond.modules.account.tests.tools import create_fiscalyear, \
     ...     create_chart, get_accounts, create_tax, set_tax_code
-    >>> from.trytond.modules.account_invoice.tests.tools import \
+    >>> from trytond.modules.account_invoice.tests.tools import \
     ...     set_fiscalyear_invoice_sequences
     >>> today = datetime.date.today()
 
@@ -96,7 +96,7 @@ Create invoice::
     >>> Invoice = Model.get('account.invoice')
     >>> InvoiceLine = Model.get('account.invoice.line')
     >>> invoice = Invoice()
-    >>> invoice.type = 'in_invoice'
+    >>> invoice.type = 'in'
     >>> invoice.party = party
     >>> invoice.payment_term = payment_term
     >>> invoice.invoice_date = today
@@ -159,20 +159,21 @@ Credit invoice::
     >>> credit = Wizard('account.invoice.credit', [invoice])
     >>> credit.form.with_refund = False
     >>> credit.execute('credit')
-    >>> credit_note, = Invoice.find([('type', '=', 'in_credit_note')])
+    >>> credit_note, = Invoice.find(
+    ...     [('type', '=', 'in'), ('id', '!=', invoice.id)])
     >>> credit_note.state
     u'draft'
-    >>> credit_note.untaxed_amount == invoice.untaxed_amount
+    >>> credit_note.untaxed_amount == -invoice.untaxed_amount
     True
-    >>> credit_note.tax_amount == invoice.tax_amount
+    >>> credit_note.tax_amount == -invoice.tax_amount
     True
-    >>> credit_note.total_amount == invoice.total_amount
+    >>> credit_note.total_amount == -invoice.total_amount
     True
 
 Create a posted and a draft invoice  to cancel::
 
     >>> invoice = Invoice()
-    >>> invoice.type = 'in_invoice'
+    >>> invoice.type = 'in'
     >>> invoice.party = party
     >>> invoice.payment_term = payment_term
     >>> invoice.invoice_date = today
diff --git a/tests/test_account_invoice.py b/tests/test_account_invoice.py
index a9cc686..e478039 100644
--- a/tests/test_account_invoice.py
+++ b/tests/test_account_invoice.py
@@ -5,84 +5,93 @@ import doctest
 import datetime
 from decimal import Decimal
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-from trytond.tests.test_tryton import POOL, DB_NAME, USER, CONTEXT
+from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.tests.test_tryton import doctest_setup, doctest_teardown
-from trytond.transaction import Transaction
+from trytond.tests.test_tryton import doctest_checker
+from trytond.pool import Pool
+
+from trytond.modules.currency.tests import create_currency
+
+
+def set_invoice_sequences(fiscalyear):
+    pool = Pool()
+    Sequence = pool.get('ir.sequence.strict')
+
+    sequence = Sequence(name=fiscalyear.name, code='account.invoice')
+    sequence.company = fiscalyear.company
+    sequence.save()
+    for type_ in ['out', 'in']:
+        for invoice in ['invoice', 'credit_note']:
+            name = '%s_%s_sequence' % (type_, invoice)
+            setattr(fiscalyear, name, sequence)
+    return fiscalyear
 
 
 class AccountInvoiceTestCase(ModuleTestCase):
     'Test AccountInvoice module'
     module = 'account_invoice'
 
-    def setUp(self):
-        super(AccountInvoiceTestCase, self).setUp()
-        self.payment_term = POOL.get('account.invoice.payment_term')
-        self.currency = POOL.get('currency.currency')
-
-    def test0010payment_term(self):
+    @with_transaction()
+    def test_payment_term(self):
         'Test payment_term'
-        with Transaction().start(DB_NAME, USER, context=CONTEXT):
-            cu1, = self.currency.create([{
-                        'name': 'cu1',
-                        'symbol': 'cu1',
-                        'code': 'cu1'
-                        }])
+        pool = Pool()
+        PaymentTerm = pool.get('account.invoice.payment_term')
 
-            term, = self.payment_term.create([{
-                        'name': '30 days, 1 month, 1 month + 15 days',
-                        'lines': [
-                            ('create', [{
-                                        'sequence': 0,
-                                        'type': 'percent',
-                                        'divisor': 4,
-                                        'percentage': 25,
-                                        'relativedeltas': [('create', [{
-                                                        'days': 30,
-                                                        },
-                                                    ]),
-                                            ],
-                                        }, {
-                                        'sequence': 1,
-                                        'type': 'percent_on_total',
-                                        'divisor': 4,
-                                        'percentage': 25,
-                                        'relativedeltas': [('create', [{
-                                                        'months': 1,
-                                                        },
-                                                    ]),
-                                            ],
-                                        }, {
-                                        'sequence': 2,
-                                        'type': 'fixed',
-                                        'amount': Decimal('396.84'),
-                                        'currency': cu1.id,
-                                        'relativedeltas': [('create', [{
-                                                        'months': 1,
-                                                        'days': 30,
-                                                        },
-                                                    ]),
-                                            ],
-                                        }, {
-                                        'sequence': 3,
-                                        'type': 'remainder',
-                                        'relativedeltas': [('create', [{
-                                                        'months': 2,
-                                                        'days': 30,
-                                                        'day': 15,
-                                                        },
-                                                    ]),
-                                            ],
-                                        }])]
-                        }])
-            terms = term.compute(Decimal('1587.35'), cu1,
-                date=datetime.date(2011, 10, 1))
-            self.assertEqual(terms, [
-                    (datetime.date(2011, 10, 31), Decimal('396.84')),
-                    (datetime.date(2011, 11, 01), Decimal('396.84')),
-                    (datetime.date(2011, 12, 01), Decimal('396.84')),
-                    (datetime.date(2012, 01, 14), Decimal('396.83')),
-                    ])
+        cu1 = create_currency('cu1')
+        term, = PaymentTerm.create([{
+                    'name': '30 days, 1 month, 1 month + 15 days',
+                    'lines': [
+                        ('create', [{
+                                    'sequence': 0,
+                                    'type': 'percent',
+                                    'divisor': 4,
+                                    'ratio': Decimal('.25'),
+                                    'relativedeltas': [('create', [{
+                                                    'days': 30,
+                                                    },
+                                                ]),
+                                        ],
+                                    }, {
+                                    'sequence': 1,
+                                    'type': 'percent_on_total',
+                                    'divisor': 4,
+                                    'ratio': Decimal('.25'),
+                                    'relativedeltas': [('create', [{
+                                                    'months': 1,
+                                                    },
+                                                ]),
+                                        ],
+                                    }, {
+                                    'sequence': 2,
+                                    'type': 'fixed',
+                                    'amount': Decimal('396.84'),
+                                    'currency': cu1.id,
+                                    'relativedeltas': [('create', [{
+                                                    'months': 1,
+                                                    'days': 30,
+                                                    },
+                                                ]),
+                                        ],
+                                    }, {
+                                    'sequence': 3,
+                                    'type': 'remainder',
+                                    'relativedeltas': [('create', [{
+                                                    'months': 2,
+                                                    'days': 30,
+                                                    'day': 15,
+                                                    },
+                                                ]),
+                                        ],
+                                    }])]
+                    }])
+        terms = term.compute(Decimal('1587.35'), cu1,
+            date=datetime.date(2011, 10, 1))
+        self.assertEqual(terms, [
+                (datetime.date(2011, 10, 31), Decimal('396.84')),
+                (datetime.date(2011, 11, 1), Decimal('396.84')),
+                (datetime.date(2011, 12, 1), Decimal('396.84')),
+                (datetime.date(2012, 1, 14), Decimal('396.83')),
+                ])
 
 
 def suite():
@@ -91,12 +100,15 @@ def suite():
         AccountInvoiceTestCase))
     suite.addTests(doctest.DocFileSuite('scenario_invoice.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite('scenario_invoice_supplier.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     suite.addTests(doctest.DocFileSuite(
             'scenario_invoice_alternate_currency.rst',
             setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
+            checker=doctest_checker,
             optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
     return suite
diff --git a/tryton.cfg b/tryton.cfg
index 5ef228f..1ecb3d5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.2
+version=4.0.0
 depends:
     account
     account_product
diff --git a/trytond_account_invoice.egg-info/PKG-INFO b/trytond_account_invoice.egg-info/PKG-INFO
index 55ca2b7..b3345ee 100644
--- a/trytond_account_invoice.egg-info/PKG-INFO
+++ b/trytond_account_invoice.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-account-invoice
-Version: 3.8.2
+Version: 4.0.0
 Summary: Tryton module for invoicing
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: issue_tracker at tryton.org
 License: GPL-3
-Download-URL: http://downloads.tryton.org/3.8/
+Download-URL: http://downloads.tryton.org/4.0/
 Description: trytond_account_invoice
         =======================
         
@@ -54,6 +54,7 @@ Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: Catalan
+Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Natural Language :: Czech
 Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
@@ -67,6 +68,9 @@ Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Office/Business
diff --git a/trytond_account_invoice.egg-info/SOURCES.txt b/trytond_account_invoice.egg-info/SOURCES.txt
index b8f6713..31f4361 100644
--- a/trytond_account_invoice.egg-info/SOURCES.txt
+++ b/trytond_account_invoice.egg-info/SOURCES.txt
@@ -48,9 +48,6 @@ tryton.cfg
 ./tests/tools.py
 ./view/address_form.xml
 ./view/address_tree.xml
-./view/configuration_form.xml
-./view/configuration_tax_rounding_form.xml
-./view/configuration_tax_rounding_list.xml
 ./view/credit_start_form.xml
 ./view/fiscalyear_form.xml
 ./view/invoice_form.xml
@@ -92,11 +89,13 @@ locale/fr_FR.po
 locale/hu_HU.po
 locale/it_IT.po
 locale/ja_JP.po
+locale/lo_LA.po
 locale/lt_LT.po
 locale/nl_NL.po
 locale/pt_BR.po
 locale/ru_RU.po
 locale/sl_SI.po
+locale/zh_CN.po
 tests/scenario_invoice.rst
 tests/scenario_invoice_alternate_currency.rst
 tests/scenario_invoice_supplier.rst
@@ -109,9 +108,7 @@ trytond_account_invoice.egg-info/requires.txt
 trytond_account_invoice.egg-info/top_level.txt
 view/address_form.xml
 view/address_tree.xml
-view/configuration_form.xml
-view/configuration_tax_rounding_form.xml
-view/configuration_tax_rounding_list.xml
+view/address_tree_sequence.xml
 view/credit_start_form.xml
 view/fiscalyear_form.xml
 view/invoice_form.xml
diff --git a/trytond_account_invoice.egg-info/requires.txt b/trytond_account_invoice.egg-info/requires.txt
index 7a78079..4561aa5 100644
--- a/trytond_account_invoice.egg-info/requires.txt
+++ b/trytond_account_invoice.egg-info/requires.txt
@@ -1,9 +1,9 @@
 python-dateutil
 python-sql >= 0.4
-trytond_account >= 3.8, < 3.9
-trytond_account_product >= 3.8, < 3.9
-trytond_company >= 3.8, < 3.9
-trytond_currency >= 3.8, < 3.9
-trytond_party >= 3.8, < 3.9
-trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
+trytond_account >= 4.0, < 4.1
+trytond_account_product >= 4.0, < 4.1
+trytond_company >= 4.0, < 4.1
+trytond_currency >= 4.0, < 4.1
+trytond_party >= 4.0, < 4.1
+trytond_product >= 4.0, < 4.1
+trytond >= 4.0, < 4.1
\ No newline at end of file
diff --git a/view/address_tree_sequence.xml b/view/address_tree_sequence.xml
new file mode 100644
index 0000000..78553c6
--- /dev/null
+++ b/view/address_tree_sequence.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath
+        expr="/tree/field[@name='subdivision']" position="after">
+        <field name="invoice"/>
+    </xpath>
+</data>
diff --git a/view/configuration_form.xml b/view/configuration_form.xml
deleted file mode 100644
index 3150a0d..0000000
--- a/view/configuration_form.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<data>
-    <xpath expr="/form" position="inside">
-        <separator id="invoice" string="Invoice" colspan="4"/>
-        <label name="tax_rounding"/>
-        <field name="tax_rounding"/>
-        <field name="tax_roundings" colspan="2" yexpand="0"/>
-    </xpath>
-</data>
diff --git a/view/configuration_tax_rounding_form.xml b/view/configuration_tax_rounding_form.xml
deleted file mode 100644
index 92cac9c..0000000
--- a/view/configuration_tax_rounding_form.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<form string="Account Configuration Tax Rounding" cursor="company">
-    <label name="configuration"/>
-    <field name="configuration"/>
-    <label name="sequence"/>
-    <field name="sequence"/>
-    <label name="company"/>
-    <field name="company"/>
-    <label name="method"/>
-    <field name="method"/>
-</form>
diff --git a/view/configuration_tax_rounding_list.xml b/view/configuration_tax_rounding_list.xml
deleted file mode 100644
index a74a445..0000000
--- a/view/configuration_tax_rounding_list.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
-this repository contains the full copyright notices and license terms. -->
-<tree string="Account Configuration Tax Roundings" sequence="sequence">
-    <field name="configuration"/>
-    <field name="company"/>
-    <field name="method" expand="1"/>
-</tree>
diff --git a/view/invoice_tax_form.xml b/view/invoice_tax_form.xml
index 90125d7..abfc8e1 100644
--- a/view/invoice_tax_form.xml
+++ b/view/invoice_tax_form.xml
@@ -15,17 +15,17 @@ this repository contains the full copyright notices and license terms. -->
     <label name="manual"/>
     <field name="manual"/>
     <group col="6" colspan="4" string="Tax Code" id="tax_code">
-        <label name="amount"/>
-        <field name="amount"/>
-        <label name="tax_code"/>
-        <field name="tax_code"/>
-        <label name="tax_sign"/>
-        <field name="tax_sign"/>
         <label name="base"/>
         <field name="base"/>
         <label name="base_code"/>
         <field name="base_code"/>
         <label name="base_sign"/>
         <field name="base_sign"/>
+        <label name="amount"/>
+        <field name="amount"/>
+        <label name="tax_code"/>
+        <field name="tax_code"/>
+        <label name="tax_sign"/>
+        <field name="tax_sign"/>
     </group>
 </form>
diff --git a/view/payment_term_line_form.xml b/view/payment_term_line_form.xml
index ccdf112..b886a0d 100644
--- a/view/payment_term_line_form.xml
+++ b/view/payment_term_line_form.xml
@@ -10,8 +10,11 @@ this repository contains the full copyright notices and license terms. -->
     <field name="amount"/>
     <label name="currency"/>
     <field name="currency"/>
-    <label name="percentage"/>
-    <field name="percentage"/>
+    <label name="ratio"/>
+    <group col="2" id="ratio">
+        <field name="ratio" factor="100" xexpand="0"/>
+        <label name="ratio" string="%" xalign="0.0" xexpand="1"/>
+    </group>
     <label name="divisor"/>
     <field name="divisor"/>
     <field name="relativedeltas" mode="form,tree" colspan="4"
diff --git a/view/payment_term_line_list.xml b/view/payment_term_line_list.xml
index 7d91ed6..b162eb2 100644
--- a/view/payment_term_line_list.xml
+++ b/view/payment_term_line_list.xml
@@ -4,7 +4,9 @@ this repository contains the full copyright notices and license terms. -->
 <tree string="Payment Term Line">
     <field name="payment"/>
     <field name="type"/>
-    <field name="percentage"/>
+    <field name="ratio" factor="100">
+        <suffix string="%" name="ratio"/>
+    </field>
     <field name="amount"/>
     <field name="currency"/>
 </tree>
diff --git a/view/payment_term_line_list_sequence.xml b/view/payment_term_line_list_sequence.xml
index 8499bdd..d11c196 100644
--- a/view/payment_term_line_list_sequence.xml
+++ b/view/payment_term_line_list_sequence.xml
@@ -3,7 +3,9 @@
 this repository contains the full copyright notices and license terms. -->
 <tree string="Payment Term Line" sequence="sequence">
     <field name="type"/>
-    <field name="percentage"/>
+    <field name="ratio" factor="100">
+        <suffix string="%" name="ratio"/>
+    </field>
     <field name="amount"/>
     <field name="currency"/>
 </tree>
-- 
tryton-modules-account-invoice



More information about the tryton-debian-vcs mailing list