diff --git a/locale/ca.po b/locale/ca.po
index b3f0b25..4214455 100644
--- a/locale/ca.po
+++ b/locale/ca.po
@@ -2,124 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:account.invoice:"
-msgid ""
-"Error signing invoice \"%(invoice)s\".\n"
-"Message returned by signing process: %(process_output)s"
-msgstr ""
-"Error firmant la factura \"%(invoice)s\".\n"
-"Missatge retornat pel procés de firma: %(process_output)s"
-
-msgctxt "error:account.invoice:"
-msgid "Missing Factura-e Certificate in company \"%s\"."
-msgstr "Falta el Certificat Factura-e a l'empresa \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
-"invoice \"%s\"."
-msgstr ""
-"Falta el carrer, codi postal, ciutat, subdivisió o país a l'adreça de "
-"la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing Street, Zip, City, Subdivision or Country in default address of "
-"company's Party \"%s\"."
-msgstr ""
-"Falta el carrer, codi postal, ciutat, província o país de la direcció per "
-"defecte del tercer de l'empresa \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing VAT Identifier in company's Party \"%s\", or its length is not "
-"between 3 and 30."
-msgstr ""
-"Falta l'identificador VAT del tercer de l'empresa \"%s\", o la seva longitud"
-" no és superior a 3 i inferior a 30."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing VAT Identifier in party \"%(party)s\" of invoice \"%(invoice)s\", or"
-" its length is not between 3 and 30."
-msgstr ""
-"Falta l'identificador VAT del tercer \"%(party)s\" de la factura "
-"\"%(invoice)s\", o la seva longitud no és superior a 3 i inferior a 30."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing some Factura-e fields in party \"%(party)s\" of invoice "
-"\"%(invoice)s\": \"%(field)s\""
-msgstr ""
-"Falta alguns camps del tercer \"%(party)s\" per la Factura-e de la "
-"factura \"%(invoice)s\": \"%(field)s\""
-
-msgctxt "error:account.invoice:"
-msgid "No rate found for currency \"%(currency)s\" on \"%(date)s\""
-msgstr ""
-"No s'ha trobat cap taxa de canvi per a la moneda \"%(currency)s\" a la data "
-"\"%(date)s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Bank Account \"%(bank_account)s\" used in invoice \"%(invoice)s\" "
-"doesn't have an IBAN number and it's required to generate the Factura-e "
-"document."
-msgstr ""
-"El compte bancari \"%(bank_account)s\" utilitzat a la factura "
-"\"%(invoice)s\" no té número IBAN i es requereix per generar el document "
-"Factura-e."
-
-msgctxt "error:account.invoice:"
-msgid "The Bank Account is missing in some move lines of invoice \"%s\"."
-msgstr "Falta el compte bancari en algun dels apunts de la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Factura-e Type is missing in payment type \"%(payment_type)s\" used in "
-"invoice \"%(invoice)s\"."
-msgstr ""
-"Falta el Tipus Factura-e al tipus de pagament \"%(payment_type)s\" utilitzat"
-" a la factura \"%(invoice)s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Factura-e file (XML) generated for invoice \"%s\" is not valid against "
-"the oficial XML Schema Definition:\n"
-"%s"
-msgstr ""
-"El fitxer Factura-e (XML) generat per la factura \"%s\" no és vàlid segons "
-"el XML Schema Definition oficial:\n"
-"%s"
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The name of \"%(party)s\" of invoice \"%(invoice)s\" doesn't contain the Name and the, at least, First Surname.\n"
-"They must to be separated by one space: Name Surname."
-msgstr ""
-"El nom del tercer \"%(party)s\" de la factura \"%(invoice)s\" no conté el nom i, al menys, el primer cognom.\n"
-"Aquests han d'anar separats per un espai: Nom Cognom."
-
-msgctxt "error:account.invoice:"
-msgid "The payment type is missing in some move lines of invoice \"%s\"."
-msgstr "Falta el tipus de pagament en alguns apunts de la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"You must to install \"account_bank\" module to inform the Bank Account in invoices.\n"
-"The payment type \"%(payment_type)s\" used in invoice \"%(invoice)s\" is configured as \"Direct Debit\" or \"Credit Transfer\" and it requires the company/party bank account."
-msgstr ""
-"S'ha d'instal·lar el mòdul \"account_bank\" per poder indicar el compte bancari a les factures.\n"
-"El tipus de pagament \"%(payment_type)s\" utilitzat a la factura \"%(invoice)s\" està configurat com \"Rebut domiciliat\" o \"Transferència\" i es requereix el copmte bancari de l'empresa o del tercer."
-
-msgctxt "error:account.payment.type:"
-msgid ""
-"The Factura-e Type and Account Bank Kind of Payment Type \"%s\" are not "
-"compatible."
-msgstr ""
-"El Tipus Fatura-e i el Tipus compte bancari del Tipus de pagament \"%s\" no "
-"són compatibles."
-
 msgctxt "field:account.invoice,credited_invoices:"
 msgid "Credited Invoices"
 msgstr "Factures abonades"
@@ -144,10 +26,6 @@ msgctxt "field:account.invoice.generate_facturae.start,certificate_password:"
 msgid "Certificate Password"
 msgstr "Contrasenya certificat"
 
-msgctxt "field:account.invoice.generate_facturae.start,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.generate_facturae.start,service:"
 msgid "Service"
 msgstr "Servei"
@@ -204,9 +82,134 @@ msgctxt "model:ir.action,name:wizard_generate_signed_facturae"
 msgid "Generate Factura-e"
 msgstr "Genera Factura-e"
 
+msgctxt "model:ir.message,text:company_address_fields"
+msgid ""
+"Missing Street, Zip, City, Subdivision or Country in default address of "
+"company\\'s Party \"%(party)s\"."
+msgstr ""
+"Falta el carrer, codi postal, ciutat, província o país de la direcció per "
+"defecte del tercer de l'empresa \"%(party)s\"."
+
+msgctxt "model:ir.message,text:company_vat_identifier"
+msgid ""
+"Missing VAT Identifier in company\\'s Party \"%(party)s\", or its length is "
+"not between 3 and 30."
+msgstr ""
+"Falta l'identificador VAT del tercer de l'empresa \"%(party)s\", o la seva "
+"longitud no és superior a 3 i inferior a 30."
+
+msgctxt "model:ir.message,text:error_signing"
+msgid ""
+"Error signing invoice \"%(invoice)s\".\\nMessage returned by signing "
+"process: %(process_output)s"
+msgstr ""
+"Error firmant la factura \"%(invoice)s\".\n"
+"Missatge retornat pel procés de firma: %(process_output)s"
+
+msgctxt "model:ir.message,text:incompatible_facturae_type_account_bank"
+msgid ""
+"The Factura-e Type and Account Bank Kind of Payment Type \"%(paymen_type)s\""
+" are not compatible."
+msgstr ""
+"El Tipus Fatura-e i el Tipus compte bancari del Tipus de pagament "
+"\"%(paymen_type)s\" no són compatibles."
+
+msgctxt "model:ir.message,text:invalid_factura_xml_file"
+msgid ""
+"The Factura-e file (XML) generated for invoice \"%(invoice)s\" is not valid "
+"against the oficial XML Schema Definition:\\n%(message)s"
+msgstr ""
+"El fitxer Factura-e (XML) generat per la factura \"%(invoice)s\" no és vàlid segons el XML Schema Definition oficial:\n"
+"%(message)s"
+
+msgctxt "model:ir.message,text:invoice_address_fields"
+msgid ""
+"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
+"invoice \"%(invoice)s\"."
+msgstr ""
+"Falta el carrer, codi postal, ciutat, subdivisió o país a l'adreça de la "
+"factura \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_account_bank_module"
+msgid ""
+"You must to install \"account_bank\" module to inform the Bank Account in "
+"invoices.\\nThe payment type \"%(payment_type)s\" used in invoice "
+"\"%(invoice)s\" is configured as \"Direct Debit\" or \"Credit Transfer\" and"
+" it requires the company/party bank account."
+msgstr ""
+"S'ha d'instal·lar el mòdul \"account_bank\" per poder indicar el compte bancari a les factures.\n"
+"El tipus de pagament \"%(payment_type)s\" utilitzat a la factura \"%(invoice)s\" està configurat com \"Rebut domiciliat\" o \"Transferència\" i es requereix el copmte bancari de l'empresa o del tercer."
+
+msgctxt "model:ir.message,text:missing_bank_account"
+msgid "The Bank Account is missing in some move lines of invoice \"%(invoice)s\"."
+msgstr ""
+"Falta el compte bancari en algun dels apunts de la factura \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_certificate"
+msgid "Missing Factura-e Certificate in company \"%(company)s\"."
+msgstr "Falta el Certificat Factura-e a l'empresa \"%(company)s\"."
+
+msgctxt "model:ir.message,text:missing_iban"
+msgid ""
+"The Bank Account \"%(bank_account)s\" used in invoice \"%(invoice)s\" "
+"doesn\\'t have an IBAN number and it\\'s required to generate the Factura-e "
+"document."
+msgstr ""
+"El compte bancari \"%(bank_account)s\" utilitzat a la factura "
+"\"%(invoice)s\" no té número IBAN i es requereix per generar el document "
+"Factura-e."
+
+msgctxt "model:ir.message,text:missing_payment_type"
+msgid "The payment type is missing in some move lines of invoice \"%(invoice)s\"."
+msgstr ""
+"Falta el tipus de pagament en alguns apunts de la factura \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_payment_type_facturae_type"
+msgid ""
+"The Factura-e Type is missing in payment type \"%(payment_type)s\" used in "
+"invoice \"%(invoice)s\"."
+msgstr ""
+"Falta el Tipus Factura-e al tipus de pagament \"%(payment_type)s\" utilitzat"
+" a la factura \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:no_rate"
+msgid "No rate found for currency \"%(currency)s\" on \"%(date)s\""
+msgstr ""
+"No s'ha trobat cap taxa de canvi per a la moneda \"%(currency)s\" a la data "
+"\"%(date)s\"."
+
+msgctxt "model:ir.message,text:party_facturae_fields"
+msgid ""
+"Missing some Factura-e fields in party \"%(party)s\" of invoice "
+"\"%(invoice)s\": \"%(field)s\""
+msgstr ""
+"Falta alguns camps del tercer \"%(party)s\" per la Factura-e de la factura "
+"\"%(invoice)s\": \"%(field)s\""
+
+msgctxt "model:ir.message,text:party_name_surname"
+msgid ""
+"The name of \"%(party)s\" of invoice \"%(invoice)s\" doesn\\'t contain the "
+"Name and the, at least, First Surname.\\n They must to be separated by one "
+"space: Name Surname."
+msgstr ""
+"El nom del tercer \"%(party)s\" de la factura \"%(invoice)s\" no conté el nom i, al menys, el primer cognom.\n"
+"Aquests han d'anar separats per un espai: Nom Cognom."
+
+msgctxt "model:ir.message,text:party_vat_identifier"
+msgid ""
+"Missing VAT Identifier in party \"%(party)s\" of invoice \"%(invoice)s\", or"
+" its length is not between 3 and 30"
+msgstr ""
+"Falta l'identificador VAT del tercer \"%(party)s\" de la factura "
+"\"%(invoice)s\", o la seva longitud no és superior a 3 i inferior a 30."
+
+msgctxt "model:ir.model.button,string:generate_facturae_button"
+msgid "Generate Facturae"
+msgstr "Genera Facturae"
+
 msgctxt "selection:account.invoice,rectificative_reason_code:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.invoice,rectificative_reason_code:"
 msgid "Applicable Date/Period"
@@ -404,7 +407,7 @@ msgstr "Per defecte"
 
 msgctxt "selection:account.payment.type,facturae_type:"
 msgid ""
-msgstr ""
+msgstr " "
 
 msgctxt "selection:account.payment.type,facturae_type:"
 msgid "Accepted bill of exchange"
@@ -482,14 +485,248 @@ msgctxt "selection:account.payment.type,facturae_type:"
 msgid "Transferable promissory note"
 msgstr "Pagaré a l'ordre"
 
+msgctxt "selection:account.tax,report_type:"
+msgid "Corporation Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Excise duty applied to manufactured tobacco in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "ICIO: Tax on construction, installation and works"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IDEC: Tax on bank deposits"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IE: Excise duties and consumption taxes"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IECDPCAC: Excise duties on oil derivates in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGFEI: Tax on Fluorinated Greenhouse Gases"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGIC:Canaries General Indirect Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGTECM: Sales tax in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"IIIMAB: Tax on premises that affect the environment in the Balearic Islands"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMGSN: Local sumptuary tax in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMPN: Local tax on advertising in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMSN: Local tax on building plots in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMVDN: Local tax on unoccupied homes in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IPS: Insurance premiums Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IRNR: Non-resident Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IRPF:Personal Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "ITPAJD:Tax on wealth transfers and stamp duty"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IVPEE: Tax on the value of electricity generation"
+msgstr ""
+
 msgctxt "selection:account.tax,report_type:"
 msgid "Other"
 msgstr "Un altre"
 
+msgctxt "selection:account.tax,report_type:"
+msgid "REIGIC: Special IGIC: for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "REIPSI: Special IPSI for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "REIVA: Special VAT for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Ra: Customs duties"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "SWUA: Surcharge for Winding Up Activity"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"Tax on the production of spent nuclear fuel and radioactive waste from the "
+"generation of nuclear electric power"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"Tax on the storage of spent nuclear energy and radioactive waste in "
+"centralised facilities"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Taxes on production, services and imports in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Value-Added Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Corporation Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Excise duty applied to manufactured tobacco in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "ICIO: Tax on construction, installation and works"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IDEC: Tax on bank deposits"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IE: Excise duties and consumption taxes"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IECDPCAC: Excise duties on oil derivates in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGFEI: Tax on Fluorinated Greenhouse Gases"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGIC:Canaries General Indirect Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGTECM: Sales tax in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid ""
+"IIIMAB: Tax on premises that affect the environment in the Balearic Islands"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMGSN: Local sumptuary tax in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMPN: Local tax on advertising in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMSN: Local tax on building plots in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMVDN: Local tax on unoccupied homes in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IPS: Insurance premiums Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IRNR: Non-resident Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IRPF:Personal Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "ITPAJD:Tax on wealth transfers and stamp duty"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IVPEE: Tax on the value of electricity generation"
+msgstr ""
+
 msgctxt "selection:account.tax.template,report_type:"
 msgid "Other"
 msgstr "Un altre"
 
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIGIC: Special IGIC: for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIPSI: Special IPSI for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIVA: Special VAT for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Ra: Customs duties"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "SWUA: Surcharge for Winding Up Activity"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid ""
+"Tax on the production of spent nuclear fuel and radioactive waste from the "
+"generation of nuclear electric power"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid ""
+"Tax on the storage of spent nuclear energy and radioactive waste in "
+"centralised facilities"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Taxes on production, services and imports in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Value-Added Tax"
+msgstr ""
+
 msgctxt "selection:party.party,facturae_person_type:"
 msgid ""
 msgstr " "
@@ -518,18 +755,14 @@ msgctxt "selection:party.party,facturae_residence_type:"
 msgid "Resident in other EU country"
 msgstr "Resident a la Unió Europea (excepte Espanya)"
 
-msgctxt "view:account.invoice.generate_facturae.start:"
-msgid "Generate Signed Factura-e"
-msgstr "Genera Factura-e firmada"
-
 msgctxt "view:account.invoice.generate_facturae.start:"
 msgid ""
 "It will generate a Factura-e file for selected invoices, will sign them with"
 " the certificate stored in the company and will save the resulting files in "
 "each invoice."
 msgstr ""
-"Es generarà un fitxer Factura-e per cada factura seleccionada, es firma "
-"amb el certificat de l'empresa i es guarda els fitxers resultants a cada "
+"Es generarà un fitxer Factura-e per cada factura seleccionada, es firma amb "
+"el certificat de l'empresa i es guarda els fitxers resultants a cada "
 "factura."
 
 msgctxt "view:account.invoice:"
diff --git a/locale/es.po b/locale/es.po
index 5ceda50..985aef6 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -2,123 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "error:account.invoice:"
-msgid ""
-"Error signing invoice \"%(invoice)s\".\n"
-"Message returned by signing process: %(process_output)s"
-msgstr ""
-"Error firmando la factura \"%(invoice)s\".\n"
-"Mensaje devuelto por el proceso de firma: %(process_output)s"
-
-msgctxt "error:account.invoice:"
-msgid "Missing Factura-e Certificate in company \"%s\"."
-msgstr "Falta el Certificado Factura-e en la empresa \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
-"invoice \"%s\"."
-msgstr ""
-"Falta la calle, código postal, ciudad, província o país de la dirección de "
-"la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing Street, Zip, City, Subdivision or Country in default address of "
-"company's Party \"%s\"."
-msgstr ""
-"Falta la calle, código postal, ciudad, provincia o país de la dirección por "
-"defecto del tercero de la empresa \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing VAT Identifier in company's Party \"%s\", or its length is not "
-"between 3 and 30."
-msgstr ""
-"Falta el identificador VAT del tercero de la empresa \"%s\", o su longitud "
-"no es superior a 3 e inferior a 30."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing VAT Identifier in party \"%(party)s\" of invoice \"%(invoice)s\", or"
-" its length is not between 3 and 30."
-msgstr ""
-"Falta el identificador VAT del tercero \"%(party)s\" de la factura "
-"\"%(invoice)s\", o su longitud no es superior a 3 e inferior a 30."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"Missing some Factura-e fields in party \"%(party)s\" of invoice "
-"\"%(invoice)s\": \"%(field)s\""
-msgstr ""
-"Faltan algunos campos del tercero \"%(party)s\" para Factura-e de "
-"la factura \"%(invoice)s\": \"%(field)s\""
-
-msgctxt "error:account.invoice:"
-msgid "No rate found for currency \"%(currency)s\" on \"%(date)s\""
-msgstr ""
-"No se ha encontrado ninguna tasa de cambio para la moneda \"%(currency)s\" "
-"en la fecha \"%(date)s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Bank Account \"%(bank_account)s\" used in invoice \"%(invoice)s\" "
-"doesn't have an IBAN number and it's required to generate the Factura-e "
-"document."
-msgstr ""
-"La cuenta bancaria \"%(bank_account)s\" usada en la factura \"%(invoice)s\" "
-"no tiene número IBAN y se requiere para generar el documento Factura-e."
-
-msgctxt "error:account.invoice:"
-msgid "The Bank Account is missing in some move lines of invoice \"%s\"."
-msgstr "Falta la cuenta bancaria en alguno de los apuntes de la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Factura-e Type is missing in payment type \"%(payment_type)s\" used in "
-"invoice \"%(invoice)s\"."
-msgstr ""
-"Falta el Tipo Factura-e en el tipo de pago \"%(payment_type)s\" usado en la "
-"factura \"%(invoice)s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The Factura-e file (XML) generated for invoice \"%s\" is not valid against "
-"the oficial XML Schema Definition:\n"
-"%s"
-msgstr ""
-"El fichero Factura-e (XML) generado por la factura \"%s\" no es válido "
-"según el XML Schema Definition oficial:\n"
-"%s"
-
-msgctxt "error:account.invoice:"
-msgid ""
-"The name of \"%(party)s\" of invoice \"%(invoice)s\" doesn't contain the Name and the, at least, First Surname.\n"
-"They must to be separated by one space: Name Surname."
-msgstr ""
-"El nombre del tercero \"%(party)s\" de la factura \"%(invoice)s\" no contiene el nombre y, al menos, el primer apellido.\n"
-"Éstos deben ir separados por un espaio: Nombre Apellido."
-
-msgctxt "error:account.invoice:"
-msgid "The payment type is missing in some move lines of invoice \"%s\"."
-msgstr "Falta el tipo de pago en algunos apuntes de la factura \"%s\"."
-
-msgctxt "error:account.invoice:"
-msgid ""
-"You must to install \"account_bank\" module to inform the Bank Account in invoices.\n"
-"The payment type \"%(payment_type)s\" used in invoice \"%(invoice)s\" is configured as \"Direct Debit\" or \"Credit Transfer\" and it requires the company/party bank account."
-msgstr ""
-"Se debe instalar el módulo \"account_bank\" para poder indicar la cuenta bancaria en las facturas.\n"
-"El tipo de pago \"%(payment_type)s\" usado en la factura \"%(invoice)s\" está configurado como \"Recibo domiciliado\" o \"Transferencia\" y este requiere de la cuenta bancária de la empresa o del tercero."
-
-msgctxt "error:account.payment.type:"
-msgid ""
-"The Factura-e Type and Account Bank Kind of Payment Type \"%s\" are not "
-"compatible."
-msgstr ""
-"El Tipo Factura-e y el Tipo cuenta bancaria del Tipo de pago \"%s\" no son "
-"compatibles."
-
 msgctxt "field:account.invoice,credited_invoices:"
 msgid "Credited Invoices"
 msgstr "Facturas abonadas"
@@ -143,10 +26,6 @@ msgctxt "field:account.invoice.generate_facturae.start,certificate_password:"
 msgid "Certificate Password"
 msgstr "Contraseña certificado"
 
-msgctxt "field:account.invoice.generate_facturae.start,id:"
-msgid "ID"
-msgstr "ID"
-
 msgctxt "field:account.invoice.generate_facturae.start,service:"
 msgid "Service"
 msgstr "Servicio"
@@ -204,8 +83,125 @@ msgctxt "model:ir.action,name:wizard_generate_signed_facturae"
 msgid "Generate Factura-e"
 msgstr "Generar Factura-e"
 
-msgctxt "selection:account.invoice,rectificative_reason_code:"
+msgctxt "model:ir.message,text:company_address_fields"
 msgid ""
+"Missing Street, Zip, City, Subdivision or Country in default address of "
+"company\\'s Party \"%(party)s\"."
+msgstr ""
+"Falta la calle, código postal, ciudad, provincia o país de la dirección por "
+"defecto del tercero de la empresa \"%(party)s\"."
+
+msgctxt "model:ir.message,text:company_vat_identifier"
+msgid ""
+"Missing VAT Identifier in company\\'s Party \"%(party)s\", or its length is "
+"not between 3 and 30."
+msgstr ""
+"Falta el identificador VAT del tercero de la empresa \"%(party)s\", o su "
+"longitud no es superior a 3 e inferior a 30."
+
+msgctxt "model:ir.message,text:error_signing"
+msgid ""
+"Error signing invoice \"%(invoice)s\".\n"
+"Message returned by signing process: %(process_output)s"
+msgstr ""
+"Error firmando la factura \"%(invoice)s\".\n"
+"Mensaje devuelto por el proceso de firma: %(process_output)s"
+
+msgctxt "model:ir.message,text:incompatible_facturae_type_account_bank"
+msgid ""
+"The Factura-e Type and Account Bank Kind of Payment Type \"%(paymen_type)s\""
+" are not compatible."
+msgstr ""
+"El Tipo Factura-e y el Tipo cuenta bancaria del Tipo de pago "
+"\"%(paymen_type)s\" no son compatibles."
+
+msgctxt "model:ir.message,text:invalid_factura_xml_file"
+msgid ""
+"The Factura-e file (XML) generated for invoice \"%(invoice)s\" is not valid against the oficial XML Schema Definition:\n"
+"%(message)s"
+msgstr ""
+"El fichero Factura-e (XML) generado por la factura \"%(invoice)s\" no es válido según el XML Schema Definition oficial:\n"
+"%(message)s"
+
+msgctxt "model:ir.message,text:invoice_address_fields"
+msgid ""
+"Missing Street, Zip, City, Subdivision or Country in Invoice Address of "
+"invoice \"%(invoice)s\"."
+msgstr ""
+"Falta la calle, código postal, ciudad, província o país de la dirección de "
+"la factura  \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_account_bank_module"
+msgid ""
+"You must to install \"account_bank\" module to inform the Bank Account in invoices.\n"
+"The payment type \"%(payment_type)s\" used in invoice \"%(invoice)s\" is configured as \"Direct Debit\" or \"Credit Transfer\" and it requires the company/party bank account."
+msgstr ""
+"Se debe instalar el módulo \"account_bank\" para poder indicar la cuenta bancaria en las facturas.\n"
+"\"El tipo de pago \"%(payment_type)s\" usado en la factura \"%(invoice)s\" está configurado como \"Recibo domiciliado\" o \"Transferencia\" y este requiere de la cuenta bancária de la empresa o del tercero."
+
+msgctxt "model:ir.message,text:missing_bank_account"
+msgid "The Bank Account is missing in some move lines of invoice \"%(invoice)s\"."
+msgstr ""
+"Falta la cuenta bancaria en alguno de los apuntes de la factura "
+"\"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_certificate"
+msgid "Missing Factura-e Certificate in company \"%(company)s\"."
+msgstr "Falta el Certificado Factura-e en la empresa \"%(company)s\"."
+
+msgctxt "model:ir.message,text:missing_iban"
+msgid ""
+"The Bank Account \"%(bank_account)s\" used in invoice \"%(invoice)s\" "
+"doesn\\'t have an IBAN number and it\\'s required to generate the Factura-e "
+"document."
+msgstr ""
+"La cuenta bancaria \"%(bank_account)s\" usada en la factura \"%(invoice)s\" "
+"no tiene número IBAN y se requiere para generar el documento Factura-e."
+
+msgctxt "model:ir.message,text:missing_payment_type"
+msgid "The payment type is missing in some move lines of invoice \"%(invoice)s\"."
+msgstr "Falta el tipo de pago en algunos apuntes de la factura \"%(invoice)s\"."
+
+msgctxt "model:ir.message,text:missing_payment_type_facturae_type"
+msgid ""
+"The Factura-e Type is missing in payment type \"%(payment_type)s\" used in "
+"invoice \"%(invoice)s\"."
+msgstr ""
+"Falta el Tipo Factura-e en el tipo de pago \"%(payment_type)s\" usado en la "
+"factura \"%(invoice)s\""
+
+msgctxt "model:ir.message,text:no_rate"
+msgid "No rate found for currency \"%(currency)s\" on \"%(date)s\""
+msgstr ""
+"No se ha encontrado ninguna tasa de cambio para la moneda \"%(currency)s\" "
+"en la fecha \"%(date)s\"."
+
+msgctxt "model:ir.message,text:party_facturae_fields"
+msgid ""
+"Missing some Factura-e fields in party \"%(party)s\" of invoice "
+"\"%(invoice)s\": \"%(field)s\""
+msgstr ""
+"Faltan algunos campos del tercero \"%(party)s\" para Factura-e de la factura"
+" \"%(invoice)s\": \"%(field)s\""
+
+msgctxt "model:ir.message,text:party_name_surname"
+msgid ""
+"The name of \"%(party)s\" of invoice \"%(invoice)s\" doesn\\'t contain the Name and the, at least, First Surname.\n"
+"They must to be separated by one space: Name Surname."
+msgstr ""
+"El nombre del tercero \"%(party)s\" de la factura \"%(invoice)s\" no contiene el nombre y, al menos, el primer apellido.\n"
+"Éstos deben ir separados por un espaio: Nombre Apellido."
+
+msgctxt "model:ir.message,text:party_vat_identifier"
+msgid ""
+"Missing VAT Identifier in party \"%(party)s\" of invoice \"%(invoice)s\", or"
+" its length is not between 3 and 30"
+msgstr ""
+"Falta el identificador VAT del tercero \\\"%(party)s\\\" de la factura "
+"\"%(invoice)s\", o su longitud no es superior a 3 e inferior a 30."
+
+msgctxt "model:ir.model.button,string:generate_facturae_button"
+msgid "Generate Facturae"
 msgstr ""
 
 msgctxt "selection:account.invoice,rectificative_reason_code:"
@@ -402,10 +398,6 @@ msgctxt "selection:account.invoice.generate_facturae.start,service:"
 msgid "Default"
 msgstr "Por defecto"
 
-msgctxt "selection:account.payment.type,facturae_type:"
-msgid ""
-msgstr ""
-
 msgctxt "selection:account.payment.type,facturae_type:"
 msgid "Accepted bill of exchange"
 msgstr "Letra Aceptada"
@@ -482,16 +474,246 @@ msgctxt "selection:account.payment.type,facturae_type:"
 msgid "Transferable promissory note"
 msgstr "Pagaré a la  Orden"
 
+msgctxt "selection:account.tax,report_type:"
+msgid "Corporation Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Excise duty applied to manufactured tobacco in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "ICIO: Tax on construction, installation and works"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IDEC: Tax on bank deposits"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IE: Excise duties and consumption taxes"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IECDPCAC: Excise duties on oil derivates in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGFEI: Tax on Fluorinated Greenhouse Gases"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGIC:Canaries General Indirect Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IGTECM: Sales tax in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"IIIMAB: Tax on premises that affect the environment in the Balearic Islands"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMGSN: Local sumptuary tax in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMPN: Local tax on advertising in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMSN: Local tax on building plots in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IMVDN: Local tax on unoccupied homes in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IPS: Insurance premiums Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IRNR: Non-resident Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IRPF:Personal Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "ITPAJD:Tax on wealth transfers and stamp duty"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "IVPEE: Tax on the value of electricity generation"
+msgstr ""
+
 msgctxt "selection:account.tax,report_type:"
 msgid "Other"
 msgstr "Otro"
 
+msgctxt "selection:account.tax,report_type:"
+msgid "REIGIC: Special IGIC: for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "REIPSI: Special IPSI for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "REIVA: Special VAT for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Ra: Customs duties"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "SWUA: Surcharge for Winding Up Activity"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"Tax on the production of spent nuclear fuel and radioactive waste from the "
+"generation of nuclear electric power"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid ""
+"Tax on the storage of spent nuclear energy and radioactive waste in "
+"centralised facilities"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Taxes on production, services and imports in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax,report_type:"
+msgid "Value-Added Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Corporation Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Excise duty applied to manufactured tobacco in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "ICIO: Tax on construction, installation and works"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IDEC: Tax on bank deposits"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IE: Excise duties and consumption taxes"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IECDPCAC: Excise duties on oil derivates in Canaries"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGFEI: Tax on Fluorinated Greenhouse Gases"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGIC:Canaries General Indirect Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IGTECM: Sales tax in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid ""
+"IIIMAB: Tax on premises that affect the environment in the Balearic Islands"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMGSN: Local sumptuary tax in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMPN: Local tax on advertising in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMSN: Local tax on building plots in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IMVDN: Local tax on unoccupied homes in Navarre"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IPS: Insurance premiums Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IRNR: Non-resident Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IRPF:Personal Income Tax"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "ITPAJD:Tax on wealth transfers and stamp duty"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "IVPEE: Tax on the value of electricity generation"
+msgstr ""
+
 msgctxt "selection:account.tax.template,report_type:"
 msgid "Other"
 msgstr "Otro"
 
-msgctxt "selection:party.party,facturae_person_type:"
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIGIC: Special IGIC: for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIPSI: Special IPSI for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "REIVA: Special VAT for travel agencies"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Ra: Customs duties"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "SWUA: Surcharge for Winding Up Activity"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
 msgid ""
+"Tax on the production of spent nuclear fuel and radioactive waste from the "
+"generation of nuclear electric power"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid ""
+"Tax on the storage of spent nuclear energy and radioactive waste in "
+"centralised facilities"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Taxes on production, services and imports in Ceuta and Melilla"
+msgstr ""
+
+msgctxt "selection:account.tax.template,report_type:"
+msgid "Value-Added Tax"
 msgstr ""
 
 msgctxt "selection:party.party,facturae_person_type:"
@@ -502,10 +724,6 @@ msgctxt "selection:party.party,facturae_person_type:"
 msgid "Legal Entity"
 msgstr "Persona jurídica"
 
-msgctxt "selection:party.party,facturae_residence_type:"
-msgid ""
-msgstr ""
-
 msgctxt "selection:party.party,facturae_residence_type:"
 msgid "Foreigner"
 msgstr "Extranjero (Fuera Unión Europea)"
@@ -518,19 +736,15 @@ msgctxt "selection:party.party,facturae_residence_type:"
 msgid "Resident in other EU country"
 msgstr "Residente en la Unión Europea (excepto España)"
 
-msgctxt "view:account.invoice.generate_facturae.start:"
-msgid "Generate Signed Factura-e"
-msgstr "Generar Factura-e firmada"
-
 msgctxt "view:account.invoice.generate_facturae.start:"
 msgid ""
 "It will generate a Factura-e file for selected invoices, will sign them with"
 " the certificate stored in the company and will save the resulting files in "
 "each invoice."
 msgstr ""
-"Se generara un fichero Factura-e por cada factura seleccionada, se firma "
-"con el certificado de la empresa y se guarda los ficheros resultantes en "
-"cada factura."
+"Se generara un fichero Factura-e por cada factura seleccionada, se firma con"
+" el certificado de la empresa y se guarda los ficheros resultantes en cada "
+"factura."
 
 msgctxt "view:account.invoice:"
 msgid "Generate Factura-e"
diff --git a/message.xml b/message.xml
index 4dcd147..6de3669 100644
--- a/message.xml
+++ b/message.xml
@@ -19,7 +19,8 @@ this repository contains the full copyright notices and license terms. -->
           <field name="text">Missing VAT Identifier in party "%(party)s" of invoice "%(invoice)s", or its length is not between 3 and 30</field>
       </record>
       <record model="ir.message" id="party_name_surname">
-          <field name="text">The name of "%(party)s" of invoice "%(invoice)s" doesn\'t contain the Name and the, at least, First Surname.\n They must to be separated by one space: Name Surname.</field>
+          <field name="text">The name of "%(party)s" of invoice "%(invoice)s" doesn\'t contain the Name and the, at least, First Surname.
+They must to be separated by one space: Name Surname.</field>
       </record>
       <record model="ir.message" id="invoice_address_fields">
           <field name="text">Missing Street, Zip, City, Subdivision or Country in Invoice Address of invoice "%(invoice)s".</field>
@@ -34,7 +35,8 @@ this repository contains the full copyright notices and license terms. -->
           <field name="text">The Factura-e Type is missing in payment type "%(payment_type)s" used in invoice "%(invoice)s".</field>
       </record>
       <record model="ir.message" id="missing_account_bank_module">
-          <field name="text">You must to install "account_bank" module to inform the Bank Account in invoices.\nThe payment type "%(payment_type)s" used in invoice "%(invoice)s" is configured as "Direct Debit" or "Credit Transfer" and it requires the company/party bank account.</field>
+          <field name="text">You must to install "account_bank" module to inform the Bank Account in invoices.
+The payment type "%(payment_type)s" used in invoice "%(invoice)s" is configured as "Direct Debit" or "Credit Transfer" and it requires the company/party bank account.</field>
       </record>
       <record model="ir.message" id="missing_bank_account">
           <field name="text">The Bank Account is missing in some move lines of invoice "%(invoice)s".</field>
@@ -43,10 +45,12 @@ this repository contains the full copyright notices and license terms. -->
           <field name="text">The Bank Account "%(bank_account)s" used in invoice "%(invoice)s" doesn\'t have an IBAN number and it\'s required to generate the Factura-e document.</field>
       </record>
       <record model="ir.message" id="invalid_factura_xml_file">
-          <field name="text">The Factura-e file (XML) generated for invoice "%(invoice)s" is not valid against the oficial XML Schema Definition:\n%(message)s</field>
+          <field name="text">The Factura-e file (XML) generated for invoice "%(invoice)s" is not valid against the oficial XML Schema Definition:
+%(message)s</field>
       </record>
       <record model="ir.message" id="error_signing">
-          <field name="text">Error signing invoice "%(invoice)s".\nMessage returned by signing process: %(process_output)s</field>
+          <field name="text">Error signing invoice "%(invoice)s".
+Message returned by signing process: %(process_output)s</field>
       </record>
       <record model="ir.message" id="incompatible_facturae_type_account_bank">
           <field name="text">The Factura-e Type and Account Bank Kind of Payment Type "%(paymen_type)s" are not compatible.</field>