[MERGE] forward port branch 12.0 up to 82a1e1dcc33

author: Christophe Simonis <chs@odoo.com> 2018-11-29 20:06:16 +0100
committer: Christophe Simonis <chs@odoo.com> 2018-11-29 20:06:16 +0100
commit: ce4cc24621bf6430d7d3a2d469b375b59120c200 (patch)
tree: 3837b5fe41ff88b24136ab53c871bc01f965cab1 /addons
parent: 4d7aa97da38e497fef31a06543bfa5d2c8785708 (diff)
parent: 82a1e1dcc33d7c123e50d3e1aacb5e127f57c521 (diff)
315 files changed, 4566 insertions, 2105 deletions
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 4381b3b14f9..a8c1d83daef 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -195,6 +195,7 @@
             <field name="match_same_currency" eval="True"/>
             <field name="match_total_amount" eval="True"/>
             <field name="match_total_amount_param" eval="100"/>
+            <field name="match_partner" eval="True"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 36359a44ba3..6ba48c6d710 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4709,6 +4709,12 @@ msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
 msgstr ""
 
 #. module: account
+#: code:addons/account/models/account_bank_statement.py:335
+#, python-format
+msgid "The currency of the bank statement line must be different than the statement currency."
+msgstr ""
+
+#. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement__message_unread
 #: model:ir.model.fields,help:account.field_account_invoice__message_unread
 #: model:ir.model.fields,help:account.field_account_payment__message_unread
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 3b9e1f6d36b..4af463c5b9d 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -194,6 +194,34 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"    <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"        Apreciat ${object.partner_id.name}\n"
+"        % if object.partner_id.parent_id:\n"
+"            (${object.partner_id.parent_id.name})\n"
+"        % endif\n"
+"        <br/><br/>\n"
+"        Li fem arribar la seva \n"
+"        % if object.number:\n"
+"            factura <strong>${object.number}</strong>\n"
+"        % else:\n"
+"            factura\n"
+"        %endif\n"
+"        % if object.origin:\n"
+"            (amb referència: ${object.origin})\n"
+"        % endif\n"
+"        per valor de <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
+"        de ${object.company_id.name}.\n"
+"        % if object.state=='paid':\n"
+"            Aquesta factura ja està pagada.\n"
+"        % else:\n"
+"            Si us plau, feu aquest pagament amb la major brevetat possible.\n"
+"        % endif\n"
+"        <br/><br/>\n"
+"        No dubti en contactar amb nosaltres si té qualsevol dubte.\n"
+"    </p>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index f8f8b97b0f8..4200c336102 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -86,7 +86,7 @@ msgstr "%s (kopi)"
 #: code:addons/account/models/account.py:688
 #, python-format
 msgid "%s Sequence"
-msgstr "Nummerserie"
+msgstr "%s Nummerserie"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
@@ -763,7 +763,7 @@ msgstr "Der kan indstilles en advarsel på en partner (konto)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Adgang advarsel"
 
 #. module: account
 #. openerp-web
@@ -1263,7 +1263,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
 msgid "Add a note"
-msgstr ""
+msgstr "Tilføj en note"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -3050,7 +3050,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -3645,7 +3645,7 @@ msgstr "Kundebetalinger"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Kundeportal URL"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_product_template__taxes_id
@@ -4042,7 +4042,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_config_settings__group_products_in_bills
@@ -4151,6 +4151,7 @@ msgstr "Vis på fakturaer"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete_message
@@ -4580,7 +4581,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.actions_account_fiscal_year
 #: model:ir.model.fields,field_description:account.field_res_config_settings__group_fiscal_year
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Regnskabasår"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op__fiscalyear_last_day
@@ -6306,7 +6307,7 @@ msgstr "Seneste dato for udligning af faktura og betaling"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__layout
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_position_form
@@ -6893,7 +6894,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__sequence_number_next
@@ -7912,7 +7913,7 @@ msgstr "Plus anden indkomst"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portal adgangs URL"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_form
@@ -9142,7 +9143,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_search
@@ -9357,6 +9358,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index c959e0506e3..0a105c8eb7c 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -36,6 +36,7 @@
 # Cris Martin <cristina.marrod@gmail.com>, 2018
 # luisg123v <lgonzalez@vauxoo.com>, 2018
 # Pilar Marín <pilar@odooperu.pe>, 2018
+# Rodrigo Aragon <conectacoatepec@gmail.com>, 2018
 # 
 msgid ""
 msgstr ""
@@ -43,7 +44,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:14+0000\n"
-"Last-Translator: Pilar Marín <pilar@odooperu.pe>, 2018\n"
+"Last-Translator: Rodrigo Aragon <conectacoatepec@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -8053,7 +8054,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
 msgid "Please use the following communication for your payment :"
-msgstr ""
+msgstr "Por favor utilice la siguiente referencia al realizar su pago: "
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index e0e024dd470..3d0b1b5b35d 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -69,7 +69,7 @@ msgstr "${(object.name or '').replace('/','-')}"
 #. module: account
 #: model:mail.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr "${object.company_id.name} Fattura (Rif. ${object.number or 'n/d'})"
+msgstr "Fattura (Rif. ${object.number or 'n/d'}) - ${object.company_id.name}"
 
 #. module: account
 #: model:mail.template,subject:account.mail_template_data_payment_receipt
@@ -114,12 +114,12 @@ msgstr "&amp;times;"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
 msgid "-> Reconcile"
-msgstr "-> riconciliazione"
+msgstr "→ Riconcilia"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_line_form
 msgid "-> View partially reconciled entries"
-msgstr "-> vedere voci riconciliate parzialmente"
+msgstr "→ Registrazioni parzialmente riconciliate "
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_dashboard_onboarding_panel
@@ -457,7 +457,7 @@ msgstr "<span name=\"button_import_placeholder\"/> estratti conto"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span role=\"separator\">New</span>"
-msgstr "<span>Nuovo</span>"
+msgstr "<span>Nuovo/a</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -898,7 +898,7 @@ msgstr "Rendiconto contabile ordinario"
 #: model:ir.model.fields,field_description:account.field_account_account__currency_id
 #: model:ir.model.fields,field_description:account.field_account_account_template__currency_id
 msgid "Account Currency"
-msgstr "Valuta contabile"
+msgstr "Valuta del conto"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account_template__account_dest_id
@@ -1030,7 +1030,7 @@ msgstr "Imposta conto"
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_template_form
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_template_tree
 msgid "Account Tax Template"
-msgstr "Modello imposta conto"
+msgstr "Modello imposta del conto"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_taxcloud
@@ -1049,7 +1049,7 @@ msgstr "Modello conto"
 #: model:ir.model.fields,field_description:account.field_account_chart_template__property_stock_valuation_account_id
 #: model:ir.model.fields,field_description:account.field_res_company__property_stock_valuation_account_id
 msgid "Account Template for Stock Valuation"
-msgstr "Modello conto per valutazione inventariale"
+msgstr "Modello del conto per valutazione magazzino"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
@@ -1088,7 +1088,7 @@ msgstr "Tipi conto"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__type_control_ids
 msgid "Account Types Allowed"
-msgstr "Tipi di conto consentiti"
+msgstr "Tipi conto consentiti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -1098,12 +1098,12 @@ msgstr "De-riconciliazione "
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_group_search
 msgid "Account group"
-msgstr "Gruppo conto"
+msgstr "Gruppo del conto"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_group_search
 msgid "Account groups"
-msgstr "Gruppi conto"
+msgstr "Gruppi del conto"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__acc_holder_name
@@ -1120,7 +1120,7 @@ msgstr "Conto su prodotto"
 #. module: account
 #: model:ir.model,name:account.model_report_account_report_invoice_with_payments
 msgid "Account report with payment lines"
-msgstr "Report di conto co righe di pagamento"
+msgstr "Rendiconto con righe di pagamento"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template__tag_ids
@@ -1316,7 +1316,7 @@ msgstr "Aggiungi nota di credito"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__add_sign
 msgid "Add Sign"
-msgstr "Aggiungi Firma"
+msgstr "Aggiungi firma"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step
@@ -1331,7 +1331,7 @@ msgstr "Aggiungi un registro"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
 msgid "Add a line"
-msgstr "Aggiungi una riga"
+msgstr "Aggiungi riga"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_form
@@ -1346,7 +1346,7 @@ msgstr "Aggiungi un tag"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
 msgid "Add a note"
-msgstr "Aggiungi un commento"
+msgstr "Aggiungi nota"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1368,7 +1368,7 @@ msgstr "Aggiungi una seconda riga"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
 msgid "Add a section"
-msgstr "Aggiungi una sezione"
+msgstr "Aggiungi sezione"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1534,7 +1534,7 @@ msgstr "Consentire annullamento registrazioni"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_template__reconcile
 msgid "Allow Invoices & payments Matching"
-msgstr "Permettere l'accoppiamento fra fattura e pagamento"
+msgstr "Permettere l'abbinamento tra fatture e pagamenti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_product_margin
@@ -1647,7 +1647,7 @@ msgstr "Importo dovuto in valuta documento"
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_total_amount
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_total_amount
 msgid "Amount Matching"
-msgstr ""
+msgstr "Abbinamento importo"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_total_amount_param
@@ -1671,7 +1671,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_nature
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_nature
 msgid "Amount Nature"
-msgstr ""
+msgstr "Natura importo"
 
 #. module: account
 #: selection:account.reconcile.model,match_nature:0
@@ -1710,7 +1710,7 @@ msgstr "Tipo importo"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_partial_reconcile__amount
 msgid "Amount concerned by this matching. Assumed to be always positive"
-msgstr "Importo utilizzato in questo accoppiamento. Si presume positivo."
+msgstr "Importo coinvolto in questo abbinamento. Supposto sempre positivo"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile__amount_currency
@@ -2038,7 +2038,7 @@ msgstr "Compilazione automatica da una fattura precedente."
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Auto-detect"
-msgstr "Autorilevazione"
+msgstr "Autorilevamento"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__auto_reconcile
@@ -2494,8 +2494,8 @@ msgstr ""
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM you will not use."
 msgstr ""
-"Deselezionando il campo attivo, è possibile nascondere un INCOTERM che non "
-"si utilizzerà."
+"Deselezionando il campo attivo è possibile nascondere un INCOTERM da non "
+"utilizzare."
 
 #. module: account
 #: code:addons/account/models/chart_template.py:389
@@ -2512,22 +2512,22 @@ msgstr "Importazione CAMT"
 #. module: account
 #: model:account.incoterms,name:account.incoterm_CIP
 msgid "CARRIAGE AND INSURANCE PAID TO"
-msgstr "TRASPORTO E ASSICURAZIONE PAGATI A"
+msgstr "TRASPORTO E ASSICURAZIONE PAGATI FINO A"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_CPT
 msgid "CARRIAGE PAID TO"
-msgstr "TRASPORTO PAGATO A"
+msgstr "PORTO PAGATO FINO A"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_CFR
 msgid "COST AND FREIGHT"
-msgstr "COSTO E TRASPORTO"
+msgstr "COSTO E NOLO"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_CIF
 msgid "COST, INSURANCE AND FREIGHT"
-msgstr "COSTO, ASSICURAZIONE E TRASPORTO"
+msgstr "COSTO, ASSICURAZIONE E NOLO"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -2537,7 +2537,7 @@ msgstr "Importazione CSV"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__visible
 msgid "Can be Visible?"
-msgstr "Dev essere visibile?"
+msgstr "Può essere visibile?"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_common_report_view
@@ -2631,8 +2631,8 @@ msgstr "Impossibile generare un codice conto inutilizzato."
 msgid ""
 "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
 msgstr ""
-"Impossibile generare un codice registro inutilizzato. Compilare il campo "
-"\"codice abbreviato\""
+"Impossibile generare un codice per un registro inutilizzato. Compilare il "
+"campo \"Codice breve\""
 
 #. module: account
 #: selection:account.journal,type:0
@@ -2692,7 +2692,7 @@ msgstr "Arrotondamento di cassa"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__cash_rounding_id
 msgid "Cash Rounding Method"
-msgstr "Metodo di arrotondamento di cassa"
+msgstr "Metodo arrotondamento di cassa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.rounding_list_action
@@ -2705,7 +2705,7 @@ msgstr "Arrotondamenti di cassa"
 #: code:addons/account/models/account_bank_statement.py:187
 #, python-format
 msgid "Cash difference observed during the counting (%s)"
-msgstr "Differenza di cassa rilevata durante il periodo (%s)"
+msgstr "Differenza di cassa rilevata durante il conteggio (%s)"
 
 #. module: account
 #: code:addons/account/models/account_journal_dashboard.py:34
@@ -2716,17 +2716,17 @@ msgstr "Cassa: saldo"
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Riga: registratore di cassa"
+msgstr "Riga cassa contanti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_cashbox_line__cashbox_id
 msgid "Cashbox"
-msgstr "Registratore di cassa"
+msgstr "Cassa contanti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox__cashbox_lines_ids
 msgid "Cashbox Lines"
-msgstr "Righe registratore di cassa"
+msgstr "Righe cassa contanti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__property_account_expense_categ_id
@@ -2754,9 +2754,8 @@ msgid ""
 "Changing VAT number is not allowed once invoices have been issued for your "
 "account. Please contact us directly for this operation."
 msgstr ""
-"La modifica del numero di partita IVA non è consentita quando sono già state"
-" emesse delle fatture per il tuo account. Vi preghiamo di contattarci "
-"direttamente per questa operazione."
+"La modifica della partita IVA non è consentita dopo l'emissione delle "
+"fatture per il conto. Per questa operazione contattarci direttamente."
 
 #. module: account
 #: code:addons/account/controllers/portal.py:111
@@ -2820,7 +2819,7 @@ msgstr "Modelli del piano dei conti"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
 msgid "Chart of account set."
-msgstr "Piano dei conti configurata."
+msgstr "Piano dei conti impostato."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_list
@@ -2925,8 +2924,8 @@ msgid ""
 "Choose how you want to credit this invoice. You cannot Modify and Cancel if "
 "the invoice is already reconciled"
 msgstr ""
-"Scegli come vuoi accreditare questa fattura. Non puoi Modificare o "
-"Cancellare una fattura già riconciliata."
+"Scegliere come accreditare questa fattura. Non è possibile modificare o "
+"annullare una fattura già riconciliata"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.actions_account_fiscal_year
@@ -3016,7 +3015,8 @@ msgstr "Valore moneta/banconota"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Collect customer payments in one-click using Euro SEPA Service"
-msgstr "Colleziona pagamenti con un click usando il SEPA Service"
+msgstr ""
+"Riscossione dei pagamenti clienti in un clic con il servizio europeo SEPA"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -3024,8 +3024,8 @@ msgid ""
 "Collect information and produce statistics on the trade in goods in Europe "
 "with intrastat."
 msgstr ""
-"Colleziona Informazioni e produci report sui prodotti commerciati in Europa "
-"con Infrastat"
+"Raccolta informazioni e creazione resoconti sul commercio di beni in Europa "
+"con Intrastat."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_tag__color
@@ -3044,8 +3044,8 @@ msgstr "Ente commerciale"
 #, python-format
 msgid "Commercial partner and vendor account owners must be identical."
 msgstr ""
-"Il partner commerciale e il proprietario di account vendita devono essere lo"
-" stesso."
+"Il partner commerciale e il titolare del conto fornitore devono essere "
+"identici."
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -3648,7 +3648,7 @@ msgstr "Note di credito: numero successivo"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__credit_account_id
 msgid "Credit account"
-msgstr "Conto \"Avere\""
+msgstr "Conto avere"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line__matched_credit_ids
@@ -3701,7 +3701,7 @@ msgstr "Differenza cambio valuta"
 #: model:account.account.type,name:account.data_account_type_current_assets
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
 msgid "Current Assets"
-msgstr "Attivita' correnti"
+msgstr "Attività correnti"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_current_liabilities
@@ -3711,7 +3711,7 @@ msgstr "Passività correnti"
 #. module: account
 #: model:account.account.type,name:account.data_unaffected_earnings
 msgid "Current Year Earnings"
-msgstr "Ricavi Anno Corrente"
+msgstr "Ricavi anno corrente"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_send__starred
@@ -3791,27 +3791,27 @@ msgstr "Personalizza"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
 msgid "Customize the look of your invoices."
-msgstr "Modifica il formato della fattura."
+msgstr "Personalizza l'aspetto della fattura."
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DAF
 msgid "DELIVERED AT FRONTIER"
-msgstr "CONSEGNATO ALLA FRONTIERA"
+msgstr "RESO FRONTIERA"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DAP
 msgid "DELIVERED AT PLACE"
-msgstr "RECAPITATO SUL POSTO"
+msgstr "RESO AL LUOGO DI DESTINAZIONE"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DAT
 msgid "DELIVERED AT TERMINAL"
-msgstr "CONSEGNATO A TERMINALE"
+msgstr "RESO AL TERMINAL"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DDP
 msgid "DELIVERED DUTY PAID"
-msgstr "SPEDITO TASSE PAGATE"
+msgstr "RESO SDOGANATO"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DDU
@@ -3821,17 +3821,17 @@ msgstr "RESO NON SDOGANATO"
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DEQ
 msgid "DELIVERED EX QUAY"
-msgstr "CONSEGNATO DA BANCHINA"
+msgstr "RESO BANCHINA SDOGANATO"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_DES
 msgid "DELIVERED EX SHIP"
-msgstr "SPEDIZIONE DA NAVE"
+msgstr "FRANCO NAVE"
 
 #. module: account
 #: selection:account.cash.rounding,rounding_method:0
 msgid "DOWN"
-msgstr "GIU"
+msgstr "GIÙ"
 
 #. module: account
 #. openerp-web
@@ -3868,7 +3868,7 @@ msgid ""
 "Date from which the accounting is managed in Odoo. It is the date of the "
 "opening entry."
 msgstr ""
-"Data dalla quale la contabilita' e' gestita in Odoo. E' la data della "
+"Data di inizio gestione della contabilità con Odoo. È la data della "
 "registrazione di apertura."
 
 #. module: account
@@ -3948,7 +3948,7 @@ msgstr "Movimento in dare"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__debit_account_id
 msgid "Debit account"
-msgstr "Conto \"Dare\""
+msgstr "Conto dare"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line__matched_debit_ids
@@ -3973,12 +3973,12 @@ msgstr "Tipo di comunicazione predefinito"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__default_credit_account_id
 msgid "Default Credit Account"
-msgstr "Conto \"Avere\" predefinito"
+msgstr "Conto avere predefinito"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__default_debit_account_id
 msgid "Default Debit Account"
-msgstr "Conto \"Dare\" predefinito"
+msgstr "Conto dare predefinito"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__account_purchase_tax_id
@@ -4013,7 +4013,7 @@ msgstr "Imposte predefinite"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__incoterm_id
 msgid "Default incoterm"
-msgstr "Predefiniti Incoterm"
+msgstr "Incoterm predefinito"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -4054,7 +4054,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_fiscal_year_step
 msgid "Define your fiscal years opening &amp; closing dates."
-msgstr "Scegli le date di apertura &amp; date di chiusura."
+msgstr "Indica le date di apertura e chiusura degli anni fiscali."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__bank_statements_source
@@ -4354,7 +4354,7 @@ msgstr "Debito"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report__residual
 msgid "Due Amount"
-msgstr "Importo a debito"
+msgstr "Importo dovuto"
 
 #. module: account
 #. openerp-web
@@ -4372,7 +4372,7 @@ msgstr "Data scadenza"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_payment_term_line_form
 msgid "Due Date Computation"
-msgstr "Calcolo della data di scadenza"
+msgstr "Calcolo data di scadenza"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_payment_term_line_tree
@@ -4402,7 +4402,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports
 msgid "Dynamic Reports"
-msgstr "Resoconti dinamici."
+msgstr "Rendiconti dinamici"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_l10n_eu_service
@@ -4412,7 +4412,7 @@ msgstr "IVA comunitaria su beni digitali"
 #. module: account
 #: model:account.incoterms,name:account.incoterm_EXW
 msgid "EX WORKS"
-msgstr "Franco Fabbrica"
+msgstr "FRANCO FABBRICA"
 
 #. module: account
 #: code:addons/account/models/chart_template.py:387
@@ -4444,19 +4444,19 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found and replaces the author_id field in the chatter."
 msgstr ""
-"Indirizzo email del mittente. Questo campo viene impostato quando nessun "
-"partner collegato viene trovato, e sostituisce il campo author_id "
-"all'interno del chatter."
+"Indirizzo email del mittente. Questo campo è impostato quando non sono "
+"presenti partner abbinati, sostituisce il campo author_id nella "
+"conversazione."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__invoice_is_email
 msgid "Email by default"
-msgstr "Email pre-impostata"
+msgstr "Email predefinita"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Email your Vendor Bills"
-msgstr "Invia fatture fornitore via email"
+msgstr "Invio fatture fornitore via email"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report__date_to
@@ -4479,12 +4479,12 @@ msgstr "Saldo finale"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__cashbox_end_id
 msgid "Ending Cashbox"
-msgstr "Consistenza finale di cassa"
+msgstr "Chiusura cassa contanti"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_year__date_to
 msgid "Ending Date, included in the fiscal year."
-msgstr "Data di chiusura, inclusa nell'anno fiscale"
+msgstr "Data di chiusura, inclusa nell'anno fiscale."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_move_line_form
@@ -4541,7 +4541,7 @@ msgstr "Errore."
 #: code:addons/account/models/chart_template.py:412
 #, python-format
 msgid "Exchange Difference"
-msgstr "Differenza cambio"
+msgstr "Differenza di cambio"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__currency_exchange_journal_id
@@ -4552,7 +4552,7 @@ msgstr "Registro utili - perdite su cambi"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile__exchange_move_id
 msgid "Exchange Move"
-msgstr "Scrittura cambi"
+msgstr "Movimento di cambio"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_company__expects_chart_of_accounts
@@ -4562,7 +4562,7 @@ msgstr "Atteso un piano dei conti"
 #. module: account
 #: selection:account.account.type,internal_group:0
 msgid "Expense"
-msgstr "Spese"
+msgstr "Costo"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_product_category__property_account_expense_categ_id
@@ -4599,17 +4599,17 @@ msgstr "Collegamento esterno"
 #. module: account
 #: model:account.incoterms,name:account.incoterm_FAS
 msgid "FREE ALONGSIDE SHIP"
-msgstr "SPEDIZIONE GRATUITA SULLA NAVE"
+msgstr "FRANCO SOTTO BORDO"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_FCA
 msgid "FREE CARRIER"
-msgstr "FREE CARRIER"
+msgstr "FRANCO VETTORE"
 
 #. module: account
 #: model:account.incoterms,name:account.incoterm_FOB
 msgid "FREE ON BOARD"
-msgstr "FREE ON BOARD"
+msgstr "FRANCO A BORDO"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__starred_partner_ids
@@ -4728,13 +4728,13 @@ msgstr "Anni fiscali"
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op__fiscalyear_last_day
 #: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_last_day
 msgid "Fiscalyear Last Day"
-msgstr "Ultimo giorno dell'esercizio"
+msgstr "Ultimo giorno dell'anno fiscale"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_financial_year_op__fiscalyear_last_month
 #: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_last_month
 msgid "Fiscalyear Last Month"
-msgstr "Ultimo mese dell'esercizio"
+msgstr "Ultimo mese dell'anno fiscale"
 
 #. module: account
 #: selection:account.reconcile.model,amount_type:0
@@ -4754,7 +4754,7 @@ msgstr "Importo fisso"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_fixed_assets
 msgid "Fixed Assets"
-msgstr "Immobilizzazioni"
+msgstr "Attività immobilizzate"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_reconcile_model__amount
@@ -4765,7 +4765,7 @@ msgid ""
 "Fixed amount will count as a debit if it is negative, as a credit if it is "
 "positive."
 msgstr ""
-"L'importo fisso verrà computato in DARE se negativo, in AVERE se positivo"
+"L'importo fisso verrà computato in dare se negativo, in avere se positivo."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports_followup
@@ -4849,7 +4849,7 @@ msgstr ""
 #: code:addons/account/report/account_journal.py:101
 #, python-format
 msgid "Form content is missing, this report cannot be printed."
-msgstr "Manca il contenuto del modulo, il rapporto non si puo' stampare."
+msgstr "Contenuto del modulo mancante, impossibile stampare il rendiconto."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__email_from
@@ -5380,7 +5380,7 @@ msgstr ""
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr "Pagamento immediato"
+msgstr "Rimessa diretta"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_invoice_import_wizard_form_view
@@ -5425,7 +5425,7 @@ msgstr "Importazione automatica estratti conto bancari"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Import your bank statements in CAMT.053"
-msgstr "Importazione estratti conto in CAMT .053"
+msgstr "Importazione estratti conto in CAMT.053"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -5528,12 +5528,12 @@ msgstr "Operazione errata"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__incoterm_id
 msgid "Incoterm"
-msgstr "Condizioni di consegna"
+msgstr "Incoterm"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_incoterms__code
 msgid "Incoterm Standard Code"
-msgstr "Codice Standard Incoterm"
+msgstr "Codice standard Incoterm"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_incoterms_tree
@@ -5543,7 +5543,7 @@ msgstr "Codice Standard Incoterm"
 #: model_terms:ir.ui.view,arch_db:account.account_incoterms_view_search
 #: model_terms:ir.ui.view,arch_db:account.view_incoterms_tree
 msgid "Incoterms"
-msgstr "Incoterms"
+msgstr "Incoterm"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_incoterms__name
@@ -5552,9 +5552,9 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-"
 "the-art transportation practices."
 msgstr ""
-"Gli Incoterms sono una serie di termini di vendita. Sono usati per dividere "
-"i costi e le responsabilità di transazione tra acquirente e venditore e "
-"riflettono pratiche di trasporto all’avanguardia."
+"Gli Incoterm sono una serie di termini di vendita. Servono per dividere "
+"costi e responsabilità di transazione tra acquirente e venditore. Riflettono"
+" pratiche di trasporto all’avanguardia."
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_incoterms_tree
@@ -5562,15 +5562,15 @@ msgid ""
 "Incoterms are used to divide transaction costs and responsibilities between "
 "buyer and seller."
 msgstr ""
-"Incoterms sono usati per dividire costi e responsabilità tra compratori e "
-"venditori."
+"Gli Incoterm sono usati per dividere costi e responsabilità di transazione "
+"tra acquirente e venditore."
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_payment.xml:25
 #, python-format
 msgid "Info"
-msgstr "Informazione"
+msgstr "Informazioni"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_line_form
@@ -5718,7 +5718,7 @@ msgstr "Icona fattura"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
 msgid "Invoice Layout"
-msgstr "Struttura fattura"
+msgstr "Struttura della fattura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_line
@@ -5880,7 +5880,7 @@ msgstr "fatture da validare"
 #: model:ir.model.fields,help:account.field_account_payment__reconciled_invoice_ids
 msgid "Invoices whose journal items have been reconciled with this payment's."
 msgstr ""
-"Fatture per le quali le scritture contabili sono state riconciliate con "
+"Fatture i cui movimenti contabili sono stati riconciliati con questi "
 "pagamenti."
 
 #. module: account
@@ -5950,13 +5950,13 @@ msgstr "È zero"
 #: model:ir.model.fields,help:account.field_account_journal__default_credit_account_id
 #: model:ir.model.fields,help:account.field_res_company__income_currency_exchange_account_id
 msgid "It acts as a default account for credit amount"
-msgstr "Funziona come un conto di default per l'importo AVERE"
+msgstr "Opera come conto predefinito per l'importo avere"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__default_debit_account_id
 #: model:ir.model.fields,help:account.field_res_company__expense_currency_exchange_account_id
 msgid "It acts as a default account for debit amount"
-msgstr "Funziona come conto di default per l'importo DARE"
+msgstr "Opera come conto predefinito per l'importo dare"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__alias_name
@@ -5975,7 +5975,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__sent
 msgid "It indicates that the invoice has been sent."
-msgstr "Indica che la fattura e' stata spedita"
+msgstr "Indica che la fattura è stata inviata."
 
 #. module: account
 #: code:addons/account/models/account_move.py:971
@@ -6137,7 +6137,7 @@ msgstr "Nome registro"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter
 msgid "Journal items where matching number isn't set"
-msgstr "Movimenti mancanti del numero di corrispondenza"
+msgstr "Movimenti con numero abbinato non impostato"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company__account_opening_journal_id
@@ -6172,7 +6172,7 @@ msgstr "Registri"
 #. module: account
 #: model:ir.actions.report,name:account.action_report_journal
 msgid "Journals Audit"
-msgstr "Registro"
+msgstr "Revisione registri"
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -6406,7 +6406,7 @@ msgstr "Ultima riconciliazione:"
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__write_uid
 #: model:ir.model.fields,field_description:account.field_validate_account_move__write_uid
 msgid "Last Updated by"
-msgstr "Ultimo aggiornamento di:"
+msgstr "Ultimo aggiornamento di"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__write_date
@@ -6528,7 +6528,7 @@ msgstr "Consentire ai clienti di pagare le fatture online"
 #: selection:account.account.type,internal_group:0
 #: model_terms:ir.ui.view,arch_db:account.view_account_search
 msgid "Liability"
-msgstr "Passivita'"
+msgstr "Passività"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report__nbr
@@ -6774,12 +6774,12 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__matched_credit_ids
 msgid "Matched Credit"
-msgstr "Importo AVERE abbinato"
+msgstr "Avere abbinato"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__matched_debit_ids
 msgid "Matched Debit"
-msgstr "Importo DARE abbinato"
+msgstr "Dare abbinato"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_full_reconcile__reconciled_line_ids
@@ -6796,7 +6796,7 @@ msgstr "Abbinamento"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__full_reconcile_id
 msgid "Matching Number"
-msgstr "Numero di abbinamento"
+msgstr "Numero abbinamento"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_partial_reconcile__max_date
@@ -6832,7 +6832,7 @@ msgstr "Promemoria:"
 #: model:ir.model.fields,field_description:account.field_account_invoice__message_has_error
 #: model:ir.model.fields,field_description:account.field_account_payment__message_has_error
 msgid "Message Delivery error"
-msgstr "Errore nella consegna del messaggio"
+msgstr "Errore di consegna del messaggio"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__record_name
@@ -7169,7 +7169,7 @@ msgstr "Attività non correnti"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_non_current_liabilities
 msgid "Non-current Liabilities"
-msgstr "Passivita' differite"
+msgstr "Passività non correnti"
 
 #. module: account
 #: selection:account.tax,type_tax_use:0
@@ -7336,8 +7336,8 @@ msgid ""
 "Odoo allows you to reconcile a statement line directly with\n"
 "                the related sale or puchase invoice(s)."
 msgstr ""
-"Odoo permette di riconciliare un estratto conto direttamente\n"
-"\t\tcon la relativa fattura di vendita o acquisto."
+"Odoo consente di riconciliare direttamente una riga di estratto\n"
+"                conto con le relative fatture di vendita o acquisto."
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -7345,8 +7345,8 @@ msgid ""
 "Odoo allows you to reconcile a statement line directly with\n"
 "                the related sale or puchase invoices."
 msgstr ""
-"Odoo permette di riconciliare un estratto conto direttamente\n"
-"\t\tcon le relative fatture di vendita o acquisto."
+"Odoo consente di riconciliare direttamente una riga di estratto\n"
+"                conto con le relative fatture di vendita o acquisto."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__tax_line_grouping_key
@@ -7466,22 +7466,22 @@ msgstr "Saldo di apertura"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__opening_credit
 msgid "Opening credit"
-msgstr "Apertura AVERE"
+msgstr "Avere di apertura"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account__opening_credit
 msgid "Opening credit value for this account."
-msgstr "Importo AVERE di apertura per questo conto"
+msgstr "Valore avere di apertura per questo conto."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account__opening_debit
 msgid "Opening debit"
-msgstr "Apertura DARE"
+msgstr "Dare di apertura"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account__opening_debit
 msgid "Opening debit value for this account."
-msgstr "Importo DARE di apertura per questo conto"
+msgstr "Valore dare di apertura per questo conto."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_reconcile_model_form
@@ -7765,14 +7765,14 @@ msgstr "Precedenti"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Pay your bills in one-click using Euro SEPA Service"
-msgstr "Paga le tue fatture in un clic con il servizio Euro SEPA"
+msgstr "Pagamento delle fatture in un clic con il servizio europeo SEPA"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.account.type,type:0
 #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter
 msgid "Payable"
-msgstr "Debiti Fornitori"
+msgstr "Debiti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__property_account_payable_id
@@ -7793,7 +7793,7 @@ msgstr "Limite debito fornitori"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.product_template_form_view
 msgid "Payables"
-msgstr "Debiti fornitori"
+msgstr "Debiti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment__amount
@@ -7814,7 +7814,7 @@ msgstr "Data pagamento"
 #: model:ir.model.fields,field_description:account.field_account_payment__payment_difference
 #: model:ir.model.fields,field_description:account.field_account_register_payments__payment_difference
 msgid "Payment Difference"
-msgstr "Differenza pagamento"
+msgstr "Differenza di pagamento"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_abstract_payment__payment_difference_handling
@@ -7833,7 +7833,7 @@ msgstr "Registro pagamenti"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_form
 msgid "Payment Matching"
-msgstr "Abbinamento di pagamento"
+msgstr "Abbinamento pagamento"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
@@ -8120,7 +8120,7 @@ msgstr "+ banca"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
 msgid "Plus Fixed Assets"
-msgstr "+ immobilizzazioni"
+msgstr "+ attività immobilizzate"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
@@ -8217,7 +8217,7 @@ msgstr ""
 #: model:account.account.type,name:account.data_account_type_prepayments
 #: model_terms:ir.ui.view,arch_db:account.view_account_form
 msgid "Prepayments"
-msgstr "Anticipi"
+msgstr "Risconti attivi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_reconcile_model
@@ -8335,6 +8335,8 @@ msgid ""
 "Programmation Error: Can't call _get_invoice_matching_query() for different "
 "rules than 'invoice_matching'"
 msgstr ""
+"Errore di programmazione: Impossibile chiamare _get_invoice_matching_query()"
+" per regole diverse da \"invoice_matching\""
 
 #. module: account
 #: code:addons/account/models/account_reconcile_model.py:489
@@ -8431,7 +8433,7 @@ msgstr "Motivo..."
 #: selection:account.account.type,type:0
 #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter
 msgid "Receivable"
-msgstr "Crediti clienti"
+msgstr "Crediti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__property_account_receivable_id
@@ -8453,7 +8455,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.product_template_form_view
 msgid "Receivables"
-msgstr "Crediti clienti"
+msgstr "Crediti"
 
 #. module: account
 #: selection:account.abstract.payment,payment_type:0
@@ -8834,7 +8836,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
 msgid "Review"
-msgstr "Revisiona"
+msgstr "Esamina"
 
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
@@ -8936,7 +8938,7 @@ msgstr "Addetto vendite"
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_same_currency
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_same_currency
 msgid "Same Currency Matching"
-msgstr ""
+msgstr "Abbinamento valuta equivalente"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
@@ -9221,12 +9223,12 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
 msgid "Send an invoice to test the customer portal."
-msgstr ""
+msgstr "Invia una fattura per provare il portale clienti."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
 msgid "Send sample"
-msgstr "Invia un esempio"
+msgstr "Invia campione"
 
 #. module: account
 #: selection:account.payment,state:0
@@ -9331,17 +9333,17 @@ msgstr "Installazione"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step
 msgid "Setup your bank account to sync bank feeds."
-msgstr ""
+msgstr "Imposta il conto per sincronizzare i feed bancari."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_chart_of_account_step
 msgid "Setup your chart of accounts and record initial balances."
-msgstr ""
+msgstr "Imposta il piano dei conti e registra i saldi iniziali."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.dashboard_onboarding_company_step
 msgid "Setup your company's data for reports headers."
-msgstr ""
+msgstr "Imposta le informazioni aziendali per le intestazioni dei rendiconti."
 
 #. module: account
 #: model:ir.actions.server,name:account.model_account_invoice_action_share
@@ -9351,7 +9353,7 @@ msgstr "Condividi"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__code
 msgid "Short Code"
-msgstr "Codice abbreviato"
+msgstr "Codice breve"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_register_payments__show_communication_field
@@ -9480,7 +9482,7 @@ msgstr "Saldo iniziale"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__cashbox_start_id
 msgid "Starting Cashbox"
-msgstr "Consistenza di cassa iniziale"
+msgstr "Cassa contanti iniziale"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search
@@ -9537,7 +9539,7 @@ msgstr "Stato del movimento padre"
 #: model:ir.model.fields,field_description:account.field_account_move_line__statement_id
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Statement"
-msgstr ""
+msgstr "Estratto conto"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:248
@@ -9548,20 +9550,20 @@ msgstr "Documento %s confermato, i movimenti sono stati creati"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_line_form
 msgid "Statement Line"
-msgstr "Riga documenti"
+msgstr "Riga estratto conto"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__line_ids
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_line_tree
 msgid "Statement lines"
-msgstr "Righe documenti"
+msgstr "Righe estratto conto"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_tree
 msgid "Statements"
-msgstr "Documenti"
+msgstr "Estratti conto"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_line_form
@@ -9571,7 +9573,7 @@ msgstr "Condizioni"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position__states_count
 msgid "States Count"
-msgstr "Conta stati"
+msgstr "Totale stati"
 
 #. module: account
 #: code:addons/account/controllers/portal.py:43
@@ -9700,7 +9702,7 @@ msgstr "Imposta %.2f%%"
 #: model:ir.model.fields,field_description:account.field_account_tax__account_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template__account_id
 msgid "Tax Account"
-msgstr "Conto Imposta"
+msgstr "Conto imposta"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_tax__refund_account_id
@@ -9902,12 +9904,12 @@ msgstr "Imposta da applicare"
 #. module: account
 #: selection:res.config.settings,show_line_subtotals_tax_selection:0
 msgid "Tax-Excluded"
-msgstr "IVA-esclusa"
+msgstr "Imposta esclusa"
 
 #. module: account
 #: selection:res.config.settings,show_line_subtotals_tax_selection:0
 msgid "Tax-Included"
-msgstr "IVA-inclusa"
+msgstr "Imposta inclusa"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -9955,8 +9957,8 @@ msgid ""
 "Taxes, fiscal positions, chart of accounts &amp; legal statements for your "
 "country"
 msgstr ""
-"Imposte, posizioni fiscali, piano dei conti &amp; documenti legali per il "
-"tuo Paese"
+"Imposte, posizioni fiscali, piano dei conti e documenti legali per la tua "
+"nazione"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment__invoice_ids
@@ -10081,8 +10083,8 @@ msgstr ""
 msgid ""
 "Technical field used to adapt the interface to the payment type selected."
 msgstr ""
-"Campo tecnico utilizzato per adattare l'interfaccia al tipo di pagamento "
-"selezionato"
+"Campo tecnico usato per adeguare l'interfaccia al tipo di pagamento "
+"selezionato."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_partial_reconcile__max_date
@@ -10504,7 +10506,7 @@ msgstr "Il movimento di questa riga di registrazione."
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__name
 msgid "The name that will be used on account move lines"
-msgstr "Il nome che verra' usato nelle righe del movimento contabile."
+msgstr "Il nome che verrà usato nelle righe di movimento contabile."
 
 #. module: account
 #: code:addons/account/models/company.py:149
@@ -10554,7 +10556,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__account_id
 msgid "The partner account used for this invoice."
-msgstr "Il conto cliente - fornitore usato per questa fattura"
+msgstr "Il conto del partner usato per questa fattura."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner__has_unreconciled_entries
@@ -10562,8 +10564,8 @@ msgid ""
 "The partner has at least one unreconciled debit and credit since last time "
 "the invoices & payments matching was performed."
 msgstr ""
-"La controparte ha almeno un importo DARE o AVERE non riconciliato da quando "
-"e' stato fatto l'ultimo abbinamento fra fatture e pagamenti."
+"Il partner possiede almeno un importo dare o avere non riconciliato "
+"dall'ultimo abbinamento effettuato tra fatture e pagamenti."
 
 #. module: account
 #: code:addons/account/models/account.py:648
@@ -10571,13 +10573,14 @@ msgstr ""
 msgid ""
 "The partners of the journal's company and the related bank account mismatch."
 msgstr ""
-"I partner del sezionale dell'azienda e il conto bancario non corrispondono. "
+"Nel registro, i partner dell'azienda e il relativo conto bancario non "
+"corrispondono. "
 
 #. module: account
 #: code:addons/account/models/account_payment.py:118
 #, python-format
 msgid "The payment amount cannot be negative."
-msgstr "L'importo del pagamento non puo' essere negativo"
+msgstr "L'importo di pagamento non può essere negativo."
 
 #. module: account
 #: code:addons/account/models/account_payment.py:602
@@ -10981,7 +10984,7 @@ msgid ""
 "This journal already contains items, therefore you cannot modify its short "
 "name."
 msgstr ""
-"Impossibile modificare il nome abbreviato, questo registro contiene già dei "
+"Impossibile modificare il nome breve, questo registro contiene già dei "
 "movimenti."
 
 #. module: account
@@ -11025,13 +11028,15 @@ msgid ""
 "This parameter will be bypassed in case of a statement line communication "
 "matching exactly existing entries"
 msgstr ""
+"Il parametro verrà ignorato se la riga di estratto conto è abbinata in modo "
+"esatto alle registrazioni esistenti"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_reconciliation.xml:294
 #, python-format
 msgid "This payment is registered but not reconciled."
-msgstr "Questo pagamento e' registrato ma non riconciliato."
+msgstr "Questo pagamento è registrato ma non riconciliato."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner__property_supplier_payment_term_id
@@ -11204,7 +11209,7 @@ msgstr "Totale importo dovuto dal cliente"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line__price_total
 msgid "Total amount with taxes"
-msgstr "Totale importo imposte comprese."
+msgstr "Importo totale comprese imposte"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_line__price_subtotal
@@ -11214,7 +11219,7 @@ msgstr "Totale imponibile"
 #. module: account
 #: model:ir.model.fields,help:account.field_res_partner__debit
 msgid "Total amount you have to pay to this vendor."
-msgstr "Totale importo da pagare al fornitore"
+msgstr "Importo totale da pagare a questo fornitore."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__amount_total_company_signed
@@ -11224,7 +11229,7 @@ msgstr "Totale nella valuta dell'azienda"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__amount_total_signed
 msgid "Total in Invoice Currency"
-msgstr "Totale in valuta documento"
+msgstr "Totale in valuta fattura"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement__total_entry_encoding
@@ -11350,7 +11355,7 @@ msgstr "Partner sconosciuto"
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Unpaid Invoices"
-msgstr "Fatture non pagate"
+msgstr "fatture non pagate"
 
 #. module: account
 #: selection:account.move,state:0
@@ -11381,7 +11386,7 @@ msgstr "Messaggi non letti"
 #: model:ir.model.fields,field_description:account.field_account_invoice__message_unread_counter
 #: model:ir.model.fields,field_description:account.field_account_payment__message_unread_counter
 msgid "Unread Messages Counter"
-msgstr "Contatore di messaggi non letti"
+msgstr "Contatore messaggi non letti"
 
 #. module: account
 #. openerp-web
@@ -11419,7 +11424,7 @@ msgstr "Importo imponibile"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__amount_untaxed_signed
 msgid "Untaxed Amount in Company Currency"
-msgstr "Importo imponibile in moneta di conto"
+msgstr "Importo imponibile in valuta aziendale"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report__price_total
@@ -11496,7 +11501,7 @@ msgstr "Usare livelli di verifica e pianificazione di azioni"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__group_products_in_bills
 msgid "Use products in vendor bills"
-msgstr "Usa i prodotti nelle fatture di acquisto"
+msgstr "Usare i prodotti nelle fatture fornitore"
 
 #. module: account
 #: model:res.groups,name:account.group_products_in_bills
@@ -11789,8 +11794,8 @@ msgid ""
 "We cannot find any journal for this company. You should create one.\n"
 "Please go to Configuration > Journals."
 msgstr ""
-"Nessun sezionale trovato per questa azienda. Devi crearne uno. Clicca su "
-"Configurazione > Sezionali."
+"Impossibile trovare registri per questa azienda. È necessario crearne uno.\n"
+"Andare in Configurazione → Registri."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__website_message_ids
@@ -11838,7 +11843,7 @@ msgstr "Determina se questo registro deve essere visualizzato nella bacheca"
 #: model:ir.model.fields,help:account.field_account_setup_bank_manual_config__new_journal_name
 msgid "Will be used to name the Journal related to this bank account"
 msgstr ""
-"Sarà usato per denominare il sezionale collegato a questo conto bancario"
+"Verrà usato come nome per il registro collegato a questo conto bancario"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_common_journal_report__amount_currency
@@ -11856,7 +11861,7 @@ msgstr "Con imposta"
 #: code:addons/account/models/account_move.py:999
 #, python-format
 msgid "Write-Off"
-msgstr "Svalutazione"
+msgstr "Storno"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__amount
@@ -11872,7 +11877,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Importo AVERE o DARE errato nella scrittura contabile!"
+msgstr "Valore avere o dare errato nella registrazione contabile."
 
 #. module: account
 #: code:addons/account/models/account_move.py:907
@@ -11911,8 +11916,8 @@ msgid ""
 "You can not have an overlap between two fiscal years, please correct the "
 "start and/or end dates of your fiscal years."
 msgstr ""
-"Non puoi avere una sovrapposizione tra due anni fiscali, correggi le date di"
-" inizio e/o di fine dei tuoi anni fiscali. "
+"Impossibile avere una sovrapposizione tra due anni fiscali, correggere le "
+"relative date di inizio e/o di fine. "
 
 #. module: account
 #: code:addons/account/models/account_invoice.py:1784
@@ -11926,7 +11931,7 @@ msgstr ""
 #: code:addons/account/models/account_payment.py:86
 #, python-format
 msgid "You can only register payments for open invoices"
-msgstr "Puoi registrare pagamenti solo su fatture aperte."
+msgstr "È possibile registrare pagamenti solo per fatture aperte"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_res_company__invoice_reference_type
@@ -11966,8 +11971,8 @@ msgid ""
 "You cannot change the currency of the company since some journal items "
 "already exist"
 msgstr ""
-"Non è possibile cambiare la divisa dell'azienda perchè esistono già delle "
-"registrazioni contabili."
+"Impossibile cambiare la valuta dell'azienda, sono già presenti dei movimenti"
+" contabili"
 
 #. module: account
 #: code:addons/account/models/account.py:310
@@ -11976,7 +11981,7 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
-"Non puoi cambiare l'azienda proprietaria di un conto che contiene già "
+"Impossibile cambiare l'azienda titolare di un conto che contiene già dei "
 "movimenti contabili."
 
 #. module: account
@@ -12055,7 +12060,7 @@ msgid ""
 "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
-"Non puoi fare questa modifica in una registrazione riconciliata. Puoi solo cambiare alcuni campi non obbligatori o devi prima de-riconciliarla.\n"
+"Impossibile effettuare questa modifica su una registrazione riconciliata, sono modificabili solo alcuni dati non legali. Annullare prima la riconciliazione.\n"
 "%s."
 
 #. module: account
@@ -12206,7 +12211,7 @@ msgstr "Hai"
 #: code:addons/account/models/account_payment.py:622
 #, python-format
 msgid "You have to define a sequence for %s in your company."
-msgstr "È necessario definire una sequenza per %s nell'azienda."
+msgstr "Nell'azienda è necessario definire una sequenza per %s."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:50
@@ -12345,7 +12350,7 @@ msgstr "giorni dopo la data della fattura"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.setup_bank_account_wizard
 msgid "e.g BE15001559627230"
-msgstr "ad esempio: BE15001559627230"
+msgstr "es. IT15001559627"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.setup_bank_account_wizard
@@ -12360,7 +12365,7 @@ msgstr "es. Conto corrente"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_reconcile_model_form
 msgid "e.g. Bank Fees"
-msgstr "ad es. commissioni bancarie"
+msgstr "es. commissioni bancarie"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
@@ -12469,7 +12474,9 @@ msgstr "operazioni in"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__amount_by_group
 msgid "type: [(name, amount, base, formated amount, formated base)]"
-msgstr "type: [(name, amount, base, formated amount, formated base)]"
+msgstr ""
+"tipo: [(nome, importo, imponibile, importo formattato, imponibile "
+"formattato)]"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 12f49456ff1..ebff80dd479 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -5,7 +5,6 @@
 # Translators:
 # Viktor Pogrebniak <vp@aifil.ru>, 2018
 # Gennady Marchenko <gennadym@gmail.com>, 2018
-# sergeiruzkiicode <sergei.ruzki@icode.by>, 2018
 # Max Belyanin <maxbelyanin@gmail.com>, 2018
 # Collex100, 2018
 # Martin Trigaux, 2018
@@ -13,6 +12,7 @@
 # Sergey Vilizhanin, 2018
 # Denis Baranov <baranov@itlibertas.com>, 2018
 # Yaroslav Panychev <walkmanyd@yandex.ru>, 2018
+# Vitalius Sharkhun <al070572sva@gmail.com>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:14+0000\n"
-"Last-Translator: Yaroslav Panychev <walkmanyd@yandex.ru>, 2018\n"
+"Last-Translator: Vitalius Sharkhun <al070572sva@gmail.com>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,11 +37,11 @@ msgid ""
 " * The 'Paid' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled.\n"
 " * The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
-" * Статус «Проект» используется, когда пользователь составляет новый и неподтвержденный Cчёт-фактура.\n"
-" * Статус «Открыт» используется, когда пользователь создает Cчёт-фактуру, генерируется номер Cчёт-фактуры. Он остается в открытом состоянии до тех пор, пока пользователь не оплатит счет.\n"
-" * Статус «В оплате» используется, когда платежи были зарегистрированы для всего счета-фактуры в журнале, настроенном на запись записей только при сверке банковских счетов, и некоторые из них еще не были согласованы с линией выписки по счету.\n"
-" * Статус «Оплачено» устанавливается автоматически при оплате счета. Его связанные записи в журнале могут быть или не быть согласованы.\n"
-" * Статус «Отменен» используется, когда пользователь отменяет счет-фактуру."
+" * Статус «Проект» используется, когда пользователь составляет новый и неподтвержденный Cчёт-фактуру.\n"
+" * Статус «Открыт» используется, когда пользователь создает Cчёт-фактуру, генерируется номер Cчёт-фактуры. Он остается в открытом состоянии до тех пор, пока пользователь не оплатит счёт.\n"
+" * Статус «В оплате» используется, когда платежи были зарегистрированы для всего Счёта-фактуры в журнале, настроенном на внесение записей только при сверке банковских счетов, и некоторые из них еще не были согласованы с банковской выпиской.\n"
+" * Статус «Оплачено» устанавливается автоматически при оплате счёта. Связанные с ним записи в журнале могут или не могут быть согласованы.\n"
+" * Статус «Отменён» используется, когда пользователь отменяет Счёт-фактуру."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits
@@ -56,7 +56,8 @@ msgstr ""
 #. module: account
 #: model:mail.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr "${object.company_id.name|safe} Счёт (№ ${object.number or 'n/a' })"
+msgstr ""
+"${object.company_id.name|safe} Счёт-фактура (№ ${object.number or 'n/a' })"
 
 #. module: account
 #: model:mail.template,subject:account.mail_template_data_payment_receipt
@@ -125,7 +126,7 @@ msgstr "15 дней"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_2months
 msgid "2 Months"
-msgstr "2 Месяца"
+msgstr "2 месяца"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
@@ -140,7 +141,7 @@ msgstr "30 % до конца следующего месяца"
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_45days
 msgid "45 Days"
-msgstr "45 Дней"
+msgstr "45 дней"
 
 #. module: account
 #: code:addons/account/models/account.py:686
@@ -173,10 +174,10 @@ msgstr ""
 "    <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
 "        Уважаемый ${object.partner_id.name}<br/><br/>\n"
 "       Спасибо за оплату.\n"
-"        Вот ваш платеж <strong>${(object.name or '').replace('/','-')}</strong> на сумму\n"
+"        Вот ваш платёж <strong>${(object.name or '').replace('/','-')}</strong> на сумму\n"
 "        <strong>${format_amount(object.amount, object.currency_id)}</strong> от ${object.company_id.name}.\n"
 "        <br/><br/>\n"
-"        Не стесняйтесь обращаться к нам, если у вас есть какие-либо вопросы..\n"
+"        Не стесняйтесь обращаться к нам, если у вас возникли какие-либо вопросы.\n"
 "        <br/><br/>\n"
 "        С наилучшими пожеланиями,<br/>\n"
 "        % if user and user.signature:\n"
@@ -580,22 +581,22 @@ msgstr "<strong>Журнал:</strong>"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document
 msgid "<strong>Memo: </strong>"
-msgstr "<strong>Заметка.</strong>"
+msgstr "<strong>Заметка:</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document
 msgid "<strong>Payment Amount: </strong>"
-msgstr "<strong>Сумма платежа</strong>"
+msgstr "<strong>Сумма платежа:</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document
 msgid "<strong>Payment Date: </strong>"
-msgstr "<strong>Дата платежа</strong>"
+msgstr "<strong>Дата платежа:</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document
 msgid "<strong>Payment Method: </strong>"
-msgstr "<strong>Метода платежа</strong>"
+msgstr "<strong>Метод платежа:</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
@@ -610,7 +611,7 @@ msgstr "<strong>Источник:</strong>"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<strong>Subtotal</strong>"
-msgstr "<strong>Подытог</strong>"
+msgstr "<strong>Промежуточный итог</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_journal
@@ -716,23 +717,21 @@ msgid ""
 "the sum of line subtotals equals the total with taxes."
 msgstr ""
 "Округление по строкам рекомендуется использовать, если ваши цены включают "
-"налоги. В этом случае, сумма подитогов по строке будет эквивалентна итогу, "
-"включающему налоги."
+"налоги. В этом случае, сумма промежуточных итогов по строке будет "
+"эквивалентна итогу, включающему налоги."
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:527
 #: code:addons/account/models/account_bank_statement.py:530
 #, python-format
 msgid "A selected move line was already reconciled."
-msgstr "Выбранная строка была уже сверена"
+msgstr "Выбранная строка была уже сверена."
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:538
 #, python-format
 msgid "A selected statement line was already reconciled with an account move."
-msgstr ""
-"Выбранная строка оператора уже была согласована с перемещением учетной "
-"записи."
+msgstr "Выбранная строка уже была согласована с перемещением учётной записи."
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -827,13 +826,13 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_group_tree
 msgid "Account Groups"
-msgstr "Группы Счетов"
+msgstr "Группы счетов"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__company_partner_id
 #: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__partner_id
 msgid "Account Holder"
-msgstr "Владелец счета"
+msgstr "Владелец счёта"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__acc_holder_name
@@ -924,7 +923,7 @@ msgstr "Тег счёта"
 #. module: account
 #: model:ir.actions.act_window,name:account.account_tag_action
 msgid "Account Tags"
-msgstr "Тэги Счетов"
+msgstr "Теги счетов"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_tax_view_tree
@@ -937,7 +936,7 @@ msgstr "Счёт налога"
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_template_form
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_template_tree
 msgid "Account Tax Template"
-msgstr "Шаблон налогового счета"
+msgstr "Шаблон налогового счёта"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_taxcloud
@@ -950,7 +949,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:account.view_account_template_search
 #: model_terms:ir.ui.view,arch_db:account.view_account_template_tree
 msgid "Account Template"
-msgstr "Шаблон счета"
+msgstr "Шаблон счёта"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__property_stock_valuation_account_id
@@ -984,7 +983,7 @@ msgid ""
 " entries."
 msgstr ""
 "Тип счёта используется в информационных целях, при создании официальных "
-"отчетов для конкретной страны, определении правил закрытия финансового года "
+"отчётов для конкретной страны, определении правил закрытия финансового года "
 "и проводок открытия."
 
 #. module: account
@@ -1049,7 +1048,7 @@ msgid ""
 "Account that will be set on invoice tax lines for invoices. Leave empty to "
 "use the expense account."
 msgstr ""
-"Банковский счёт который будет указан в строках, соответствующих налогам в "
+"Банковский счёт, который будет указан в строках, соответствующих налогам в "
 "счёте на оплату. Если оставить это поле пустым, будет использоваться "
 "расходный счёт."
 
@@ -1059,7 +1058,7 @@ msgid ""
 "Account that will be set on invoice tax lines for refunds. Leave empty to "
 "use the expense account."
 msgstr ""
-"Банковский счёт который будет указан  как счёт для возврата в строках, "
+"Банковский счёт, который будет указан  как счёт для возврата в строках, "
 "соответствующих налогам в счёте на оплату. Если оставить это поле пустым, "
 "будет использоваться расходный счёт."
 
@@ -1305,7 +1304,7 @@ msgstr "Дополнительная информация"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Additional notes..."
-msgstr "Дополнительные заметки ..."
+msgstr "Дополнительные заметки..."
 
 #. module: account
 #: selection:account.tax,type_tax_use:0
@@ -1450,7 +1449,7 @@ msgstr "Разрешить печать чеков и депозиты"
 #. module: account
 #: model:res.groups,name:account.group_cash_rounding
 msgid "Allow the cash rounding management"
-msgstr "Разрешает управление округлением наличности"
+msgstr "Разрешить управление округлением наличности"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1805,13 +1804,13 @@ msgstr ""
 #: model:ir.model.fields,help:account.field_account_fiscal_position__country_id
 #: model:ir.model.fields,help:account.field_account_fiscal_position_template__country_id
 msgid "Apply only if delivery or invoicing country match."
-msgstr "Применить только если страна доставки или счёта совпадают."
+msgstr "Применить, только если страна доставки или счёта совпадают."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_fiscal_position__vat_required
 #: model:ir.model.fields,help:account.field_account_fiscal_position_template__vat_required
 msgid "Apply only if partner has a VAT number."
-msgstr "Применить если партнеру указано значение НДС."
+msgstr "Применить, если партнёру указано значение НДС."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -1853,7 +1852,7 @@ msgstr "Управление активами"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__account_ids
 msgid "Associated Account Templates"
-msgstr "Связанные шаблоны счета"
+msgstr "Связанные шаблоны счёта"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__at_least_one_inbound
@@ -1908,7 +1907,7 @@ msgid ""
 " did not match any partner."
 msgstr ""
 "Автор сообщения. Если не установлен, email_from может содержать адрес почты,"
-" который не соответствует ни одному партнеру."
+" который не соответствует ни одному партнёру."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__author_avatar
@@ -2018,7 +2017,7 @@ msgstr "Балансовая ведомость"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement__balance_end
 msgid "Balance as calculated based on Opening Balance and transaction lines"
-msgstr "Баланс вычисляется основываясь на начальном балансе и операциях"
+msgstr "Баланс вычисляется, основываясь на начальном балансе и операциях"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -2055,7 +2054,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__account_number
 msgid "Bank Account Number"
-msgstr "Номер банковского счета"
+msgstr "Номер банковского счёта"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__partner_bank_id
@@ -2271,7 +2270,7 @@ msgstr "Дата выставления счёта"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Bill lines"
-msgstr "Строки счета"
+msgstr "Строки счёта"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -2319,7 +2318,7 @@ msgstr "Блокирующее сообщение"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_account_type__include_initial_balance
 msgid "Bring Accounts Balance Forward"
-msgstr "Перенос баланса счетов вперёд."
+msgstr "Перенос баланса счетов вперёд"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.open_account_journal_dashboard_kanban
@@ -2367,7 +2366,8 @@ msgstr "По продавцу"
 msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
-msgstr "Вы можете скрыть позицию системы налогов без её удаления сняв флажок."
+msgstr ""
+"Вы можете скрыть позицию системы налогов без её удаления, сняв флажок."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_incoterms__active
@@ -2476,7 +2476,7 @@ msgstr ""
 #: code:addons/account/models/account_move.py:358
 #, python-format
 msgid "Cannot create moves for different companies."
-msgstr "Нельзя создать операцию для различных компаний"
+msgstr "Нельзя создать операцию для различных компаний."
 
 #. module: account
 #: code:addons/account/models/account_move.py:390
@@ -2491,7 +2491,7 @@ msgid ""
 "Cannot find a chart of accounts for this company, You should configure it. \n"
 "Please go to Account Configuration."
 msgstr ""
-"Не могу найти план счетов для этой компании, Вы следует настроить его. \n"
+"Не могу найти план счетов для этой компании, Вам следует настроить его. \n"
 "Пожалуйста, перейдите в настройки счёта."
 
 #. module: account
@@ -2581,7 +2581,7 @@ msgstr "Округления наличности"
 #: code:addons/account/models/account_bank_statement.py:187
 #, python-format
 msgid "Cash difference observed during the counting (%s)"
-msgstr "Денежная разница наблюдается при подсчете (%s)"
+msgstr "Денежная разница наблюдается при подсчёте (%s)"
 
 #. module: account
 #: code:addons/account/models/account_journal_dashboard.py:34
@@ -2706,7 +2706,7 @@ msgstr "Проверьте итоговый баланс"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement__is_difference_zero
 msgid "Check if difference is zero."
-msgstr "Проверять если разница нулевая."
+msgstr "Проверять, если разница нулевая."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account__reconcile
@@ -2714,8 +2714,8 @@ msgid ""
 "Check this box if this account allows invoices & payments matching of "
 "journal items."
 msgstr ""
-"Поставьте тут флажок, если данный счёт допускает сверку позиций журнала со "
-"счетами-фактурами и оплатами."
+"Установите этот флажок, если данный счёт допускает сверку позиций журнала со"
+" счетами-фактурами и оплатами."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__refund_sequence
@@ -2723,8 +2723,8 @@ msgid ""
 "Check this box if you don't want to share the same sequence for invoices and"
 " credit notes made from this journal"
 msgstr ""
-"Установите это, если не хотите сквозную нумерацию счетов и кредитных авизо, "
-"относящихся к этому журналу "
+"Установите этот флажок, если не хотите сквозную нумерацию счетов и кредитных"
+" авизо, относящихся к этому журналу "
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__update_posted
@@ -2732,8 +2732,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
-"Отметьте, если вы хотите включить возможность отмены проводок, связанных с "
-"этим журналом, или позиций из счетов, связанных с этим журналом"
+"Установите этот флажок, если вы хотите включить возможность отмены проводок,"
+" связанных с этим журналом, или позиций из счетов, связанных с этим журналом"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_tax__price_include
@@ -2741,14 +2741,16 @@ msgstr ""
 msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
-msgstr "Отметьте, если цена продукта и счёта включают этот налог."
+msgstr ""
+"Установите этот флажок, если цена продукта и счёта включают этот налог."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_account_template__reconcile
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
-"Отметьте, если вы хотите, чтобы пользователь сверял проводки по этому счету."
+"Установите этот флажок, если вы хотите, чтобы пользователь сверял проводки "
+"по этому счёту."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -2804,14 +2806,14 @@ msgstr ""
 #: code:addons/account/static/src/js/tour.js:19
 #, python-format
 msgid "Click to <b>send the invoice by email.</b>"
-msgstr "Кликните, чтобы <b>отослать счет по эл.почте.</b>"
+msgstr "Нажмите, чтобы <b>отослать счёт по эл. почте.</b>"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/js/tour.js:23
 #, python-format
 msgid "Click to <b>send the invoice.</b>"
-msgstr "Кликните, чтобы <b>послать счет.</b>"
+msgstr "Нажмите, чтобы <b>отослать счёт.</b>"
 
 #. module: account
 #. openerp-web
@@ -2821,7 +2823,7 @@ msgid ""
 "Click to <b>validate your invoice.</b> A reference will be assigned to this "
 "invoice and you will not be able to modify it anymore."
 msgstr ""
-"Нажмите, чтобы <b>подтвердить свой счет.</b> Счет получит номер и вы не "
+"Нажмите, чтобы <b>подтвердить свой счёт.</b> Счёт получит номер и вы не "
 "сможете больше его менять."
 
 #. module: account
@@ -2917,7 +2919,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr "Общий отчет"
+msgstr "Общий отчёт"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__invoice_reference_type
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index ef6a4522a7b..cfc5c971788 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -476,7 +476,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
 msgid "<span>Quantity</span>"
-msgstr ""
+msgstr "<span>Кількість</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 39ae8e9db22..c2a7c9ec935 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -71,7 +71,7 @@ msgstr "# 数字"
 #. module: account
 #: model:mail.template,report_name:account.mail_template_data_payment_receipt
 msgid "${(object.name or '').replace('/','-')}"
-msgstr "${(object.name or '').取代('/','-')}"
+msgstr "${(object.name or '').replace('/','-')}"
 
 #. module: account
 #: model:mail.template,subject:account.email_template_edi_invoice
@@ -4274,7 +4274,7 @@ msgstr "发现重复的供应商。你可能重复记录了同一供应商的账
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_reports
 msgid "Dynamic Reports"
-msgstr "动态报表"
+msgstr "动态报告"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_l10n_eu_service
diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py
index 4a2b0824d24..d57fb164ee4 100644
--- a/addons/account/models/account_bank_statement.py
+++ b/addons/account/models/account_bank_statement.py
@@ -324,6 +324,16 @@ class AccountBankStatementLine(models.Model):
         if self.amount_currency != 0 and self.amount == 0:
             raise ValidationError(_('If "Amount Currency" is specified, then "Amount" must be as well.'))
 
+    @api.constrains('currency_id', 'journal_id')
+    def _check_currency_id(self):
+        for line in self:
+            if not line.currency_id:
+                continue
+
+            statement_currency = line.journal_id.currency_id or line.company_id.currency_id
+            if line.currency_id == statement_currency:
+                raise ValidationError(_('The currency of the bank statement line must be different than the statement currency.'))
+
     @api.model
     def create(self, vals):
         line = super(AccountBankStatementLine, self).create(vals)
@@ -657,7 +667,13 @@ class AccountBankStatementLine(models.Model):
 
         #create the res.partner.bank if needed
         if self.account_number and self.partner_id and not self.bank_account_id:
-            self.bank_account_id = self.env['res.partner.bank'].create({'acc_number': self.account_number, 'partner_id': self.partner_id.id}).id
+            bank_account = self.env['res.partner.bank'].search(
+                [('acc_number', '=', self.account_number), ('partner_id', '=', self.partner_id.id)])
+            if not bank_account:
+                bank_account = self.env['res.partner.bank'].create({
+                    'acc_number': self.account_number, 'partner_id': self.partner_id.id
+                })
+            self.bank_account_id = bank_account
 
         counterpart_moves.assert_balanced()
         return counterpart_moves
diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py
index 391a151e2c7..465fab791e0 100644
--- a/addons/account/models/account_invoice.py
+++ b/addons/account/models/account_invoice.py
@@ -1578,6 +1578,7 @@ class AccountInvoiceLine(models.Model):
         help="Gives the sequence of this line when displaying the invoice.")
     invoice_id = fields.Many2one('account.invoice', string='Invoice Reference',
         ondelete='cascade', index=True)
+    invoice_type = fields.Selection(related='invoice_id.type', readonly=True)
     uom_id = fields.Many2one('uom.uom', string='Unit of Measure',
         ondelete='set null', index=True, oldname='uos_id')
     product_id = fields.Many2one('product.product', string='Product',
diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py
index bd89394733d..0941a34fb2f 100644
--- a/addons/account/models/account_reconcile_model.py
+++ b/addons/account/models/account_reconcile_model.py
@@ -392,14 +392,17 @@ class AccountReconcileModel(models.Model):
                 aml.date_maturity                   AS aml_date_maturity,
                 aml.amount_residual                 AS aml_amount_residual,
                 aml.amount_residual_currency        AS aml_amount_residual_currency,
-                CASE WHEN
-                    REGEXP_REPLACE(st_line.name, '[^0-9]', '', 'g') ~ REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')
-                    OR (
-                        move.ref IS NOT NULL
-                        AND
-                        REGEXP_REPLACE(st_line.name, '[^0-9]', '', 'g') ~ REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')
-                    )
-                THEN TRUE ELSE FALSE END            AS communication_flag
+                CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE
+                    ELSE
+                        TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g'))
+                            = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+'))
+                        OR (
+                            move.ref IS NOT NULL
+                            AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != ''
+                            AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g'))
+                                = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+'))
+                        )
+                END                                 AS communication_flag
             FROM account_bank_statement_line st_line
             LEFT JOIN account_journal journal       ON journal.id = st_line.journal_id
             LEFT JOIN jnl_precision                 ON jnl_precision.journal_id = journal.id
@@ -427,13 +430,18 @@ class AccountReconcileModel(models.Model):
                 AND CASE WHEN line_partner.partner_id != 0 THEN
                         aml.partner_id = line_partner.partner_id
                     ELSE
-                        (
-                            REGEXP_REPLACE(st_line.name, '[^0-9]', '', 'g') ~ REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')
-                            OR (
-                                move.ref IS NOT NULL
-                                AND
-                                REGEXP_REPLACE(st_line.name, '[^0-9]', '', 'g') ~ REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')
-                            )
+                        ( 
+                            CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE
+                            ELSE
+                                TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g'))
+                                    = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+'))
+                                OR (
+                                    move.ref IS NOT NULL
+                                    AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != ''
+                                    AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g'))
+                                        = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+'))
+                                )
+                            END
                         )
                     END
 
@@ -676,6 +684,8 @@ class AccountReconcileModel(models.Model):
                             new_aml_dicts = reconciliation_results['new_aml_dicts']
                             if reconciliation_results['open_balance_dict']:
                                 new_aml_dicts.append(reconciliation_results['open_balance_dict'])
+                            if not line.partner_id and partner:
+                                line.partner_id = partner
                             counterpart_moves = line.process_reconciliation(
                                 counterpart_aml_dicts=reconciliation_results['counterpart_aml_dicts'],
                                 payment_aml_rec=reconciliation_results['payment_aml_rec'],
@@ -707,6 +717,8 @@ class AccountReconcileModel(models.Model):
                         new_aml_dicts = reconciliation_results['new_aml_dicts']
                         if reconciliation_results['open_balance_dict']:
                             new_aml_dicts.append(reconciliation_results['open_balance_dict'])
+                        if not line.partner_id and partner:
+                            line.partner_id = partner
                         counterpart_moves = line.process_reconciliation(
                             counterpart_aml_dicts=reconciliation_results['counterpart_aml_dicts'],
                             payment_aml_rec=reconciliation_results['payment_aml_rec'],
diff --git a/addons/account/models/reconciliation_widget.py b/addons/account/models/reconciliation_widget.py
index 65f3992c3ba..950cfd60110 100644
--- a/addons/account/models/reconciliation_widget.py
+++ b/addons/account/models/reconciliation_widget.py
@@ -142,12 +142,19 @@ class AccountReconciliation(models.AbstractModel):
                 bank_statements_left += line.statement_id
 
                 amls = aml_ids and self.env['account.move.line'].browse(aml_ids)
-                results['lines'].append({
+                line_vals = {
                     'st_line': self._get_statement_line(line),
                     'reconciliation_proposition': aml_ids and self._prepare_move_lines(amls) or [],
                     'model_id': matching_amls[line.id].get('model') and matching_amls[line.id]['model'].id,
                     'write_off': matching_amls[line.id].get('status') == 'write_off',
-                })
+                }
+                if not line.partner_id and partner_map.get(line.id):
+                    partner = self.env['res.partner'].browse(partner_map[line.id])
+                    line_vals.update({
+                        'partner_id': partner.id,
+                        'partner_name': partner.name,
+                    })
+                results['lines'].append(line_vals)
 
         return results
 
@@ -331,7 +338,11 @@ class AccountReconciliation(models.AbstractModel):
             rec_prop = aml_ids and self.env['account.move.line'].browse(aml_ids) or self._get_move_line_reconciliation_proposition(account.id, partner_id)
             row['reconciliation_proposition'] = self._prepare_move_lines(rec_prop, target_currency=currency)
             row['company_id'] = account.company_id.id
-        return rows
+
+        # Return the partners with a reconciliation proposition first, since they are most likely to
+        # be reconciled.
+        return [r for r in rows if r['reconciliation_proposition']] + [r for r in rows if not r['reconciliation_proposition']]
+
 
     @api.model
     def process_move_lines(self, data):
diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js
index b3e6d56c2f4..c76768103a9 100644
--- a/addons/account/static/src/js/reconciliation/reconciliation_model.js
+++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js
@@ -365,6 +365,7 @@ var StatementModel = BasicModel.extend({
                     var handle = _.uniqueId('rline');
                     self.lines[handle] = {
                         id: res.st_line.id,
+                        partner_id: res.st_line.partner_id,
                         handle: handle,
                         reconciled: false,
                         mode: 'inactive',
@@ -1008,6 +1009,11 @@ var StatementModel = BasicModel.extend({
                                 'display_name': line.reconciliation_proposition[0].partner_name,
                             }, true);
                         }
+                    }else if(!line.st_line.partner_id && line.partner_id && line.partner_name){
+                        return self.changePartner(line.handle, {
+                            'id': line.partner_id,
+                            'display_name': line.partner_name,
+                        }, true);
                     }
                     return true;
                 })
@@ -1386,7 +1392,6 @@ var ManualModel = StatementModel.extend({
             }
             line.reconciliation_proposition = [];
         });
-
         if (process_reconciliations.length) {
             def = self._rpc({
                     model: 'account.reconciliation.widget',
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 1e09d4b6935..2617974de75 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -77,8 +77,11 @@
                     <field name="sequence" invisible="1"/>
                     <group attrs="{'invisible': [('display_type', '!=', False)]}">
                         <group>
+                            <field name="partner_id" invisible="1"/>
+                            <field name="invoice_type" invisible="1"/>
+                            <field name="company_id" invisible="1"/>
                             <field name="product_id"
-                                 context="parent and {'partner_id': parent.partner_id}"/>
+                                 context="{'partner_id': partner_id}"/>
                             <label for="quantity"/>
                             <div>
                                 <field name="quantity" class="oe_inline"/>
@@ -90,9 +93,9 @@
                         </group>
                         <group>
                             <field name="analytic_tag_ids" groups="analytic.group_analytic_accounting" widget="many2many_tags" options="{'color_field': 'color'}"/>
-                            <field domain="[('company_id', '=', parent.company_id)]" name="account_id" groups="account.group_account_user"/>
-                            <field name="invoice_line_tax_ids" context="{'type':parent.type}" domain="[('type_tax_use','!=','none'),('company_id', '=', parent.company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
-                            <field domain="[('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                            <field domain="[('company_id', '=', company_id)]" name="account_id" groups="account.group_account_user"/>
+                            <field name="invoice_line_tax_ids" context="{'type': invoice_type}" domain="[('type_tax_use','!=','none'),('company_id', '=', company_id)]" widget="many2many_tags" options="{'no_create': True}"/>
+                            <field domain="[('company_id', '=', company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <field name="analytic_tag_ids" widget="many2many_tags" groups="analytic.group_analytic_tags"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                         </group>
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 3d15d0976c3..bb8481bb2dd 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -29,59 +29,6 @@
                              </div>
                              <field name="deprecated"/>
                            </group>
-                           <group>
-                               <div class="row">
-                                   <div class="col-lg-11 offset-lg-1 col-md-12 no-margin-top" style="background-color: #eee">
-                                       <p class="text-center" style="font-weight: bold;">How do account types affect your reports?</p>
-                                       <div class="col-lg-6 col-md-6">
-                                           <div class="oe_account_help">
-                                                <p class="oe_account_font_help text-center">Profit &amp; Loss</p>
-                                                <p class="oe_account_font_help oe_account_font_title">Income</p>
-                                                <p class="oe_account_font_help oe_account_font_title">Minus Cost of Revenue</p>
-                                                <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">GROSS PROFIT</p>
-                                                <p class="oe_account_font_help oe_account_font_title">Plus Other Income</p>
-                                                <p class="oe_account_font_help oe_account_font_title">Minus Expenses</p>
-                                                <p class="oe_account_font_help oe_account_font_content">Expenses</p>
-                                                <p class="oe_account_font_help oe_account_font_content">Depreciation</p>
-                                                <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">NET PROFIT</p>
-                                                <div style="position: relative; width: 250px; height: 277px;" id="layer">
-                                                   <div style="position: relative; left: 0px; top: 0px; visibility: visible; width: 250px; height: 277px;">
-                                                     <svg pointer-events="none" overflow="auto" width="712.5" height="265" viewBox="-4 -4 712.5 265" style="position: relative; top: -4px; left: -4px; overflow: auto; visibility: visible; width: 400.5px; height: 265px;">
-                                                       <defs>
-                                                         <marker id="arrow" markerWidth="70" markerHeight="70" refx="10" refy="6" orient="auto">
-                                                             <path d="M2,1 L2,12 L10,6 L2,1" stroke="rgb(173,216,230)" fill="rgb(173,216,230)"/>
-                                                         </marker>
-                                                       </defs>
-                                                       <path pointer-events="visiblePainted" shape-rendering="auto" d="M 150 -110 q 270 100 150 150 t 160 120" fill="none" stroke-dasharray="8,3" stroke="rgb(173,216,230)" stroke-linecap="butt" stroke-width="4" stroke-opacity="1" stroke-linejoin="round" transform="matrix(1,0,0,1,0,0)" fill-opacity="1" style="marker-end: url(#arrow);">
-                                                       </path>
-                                                     </svg>
-                                                   </div>
-                                               </div>
-                                           </div>
-                                       </div>
-                                       <div class="col-lg-6 col-md-6">
-                                           <div class="oe_account_help">
-                                               <p class="oe_account_font_help text-center">Balance Sheet</p>
-                                               <p class="oe_account_font_help oe_account_font_title" style="color: grey;">Current Assets</p>
-                                               <p class="oe_account_font_help oe_account_font_content">Receivable Accounts</p>
-                                               <p class="oe_account_font_help oe_account_font_content">Prepayments</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Plus Bank</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Plus Fixed Assets</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Plus Non-Current Assets</p>
-                                               <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">TOTAL ASSETS</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Minus Current Liabilities</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Minus Credit Card Accounts</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Minus Payable Accounts</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Minus Non-Current Liabilities</p>
-                                               <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">NET ASSETS</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Equity</p>
-                                               <p class="oe_account_font_help oe_account_font_title">Plus Net Profit</p>
-                                               <p class="oe_account_font_help" style="color: grey;border-top: 2px solid;border-bottom: 2px solid;">TOTAL EQUITY</p>
-                                           </div>
-                                       </div>
-                                   </div>
-                               </div>
-                           </group>
                        </group>
                     </sheet>
                 </form>
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index d371f17882e..c9696f6743d 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.po
@@ -7,16 +7,17 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,6 +52,8 @@ msgid ""
 "An analytic default requires at least an analytic account or an analytic "
 "tag."
 msgstr ""
+"En analytisk standard kræver mindst en analytisk konto eller en analytisk "
+"tag."
 
 #. module: account_analytic_default
 #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default__analytic_id
@@ -106,7 +109,7 @@ msgstr "Oprettet den"
 #. module: account_analytic_default
 #: model_terms:ir.ui.view,arch_db:account_analytic_default.res_config_settings_view_form
 msgid "Default Analytic Values"
-msgstr "Analytiske Standardværdier"
+msgstr "Analytiske standardværdier"
 
 #. module: account_analytic_default
 #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default__date_stop
@@ -223,7 +226,7 @@ msgstr "Vælg en bruger som vil bruge analysekonto som standard."
 #. module: account_analytic_default
 #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: account_analytic_default
 #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default__date_start
diff --git a/addons/account_bank_statement_import/i18n/da.po b/addons/account_bank_statement_import/i18n/da.po
index cfdb091f5fc..c7798a0b424 100644
--- a/addons/account_bank_statement_import/i18n/da.po
+++ b/addons/account_bank_statement_import/i18n/da.po
@@ -12,12 +12,13 @@
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -104,12 +105,12 @@ msgstr "Allerede importerede posteringer"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__at_least_one_inbound
 msgid "At Least One Inbound"
-msgstr "Mindst En Indgående"
+msgstr "Mindst én indgående"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__at_least_one_outbound
 msgid "At Least One Outbound"
-msgstr "Mindst En Udgående"
+msgstr "Mindst én udgående"
 
 #. module: account_bank_statement_import
 #: code:addons/account_bank_statement_import/account_bank_statement_import.py:82
@@ -236,7 +237,7 @@ msgstr ""
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__refund_sequence_number_next
 msgid "Credit Notes: Next Number"
-msgstr "Kreditnotaer: Næste Nummer"
+msgstr "Kreditnotaer: Næste nummer"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__currency_id
@@ -409,7 +410,7 @@ msgstr ""
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__kanban_dashboard
 msgid "Kanban Dashboard"
-msgstr "Kanban rollecenter"
+msgstr "Kanban dashboard"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__kanban_dashboard_graph
@@ -507,7 +508,7 @@ msgstr "Rækkefølge"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation__active
 msgid "Set active to false to hide the Journal without removing it."
-msgstr "Sæt aktiv til falsk for at skjule Journalen uden at fjerne den."
+msgstr "Sæt aktiv til falsk for at skjule journalen uden at fjerne den."
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__code
@@ -656,8 +657,8 @@ msgid ""
 "You have to set a Default Debit Account and a Default Credit Account for the"
 " journal: %s"
 msgstr ""
-"Du skal angive en default debet konto og en default kredit konto for denne "
-"journal: %s"
+"Du skal angive en standard debet konto og en standard kredit konto for denne"
+" journal: %s"
 
 #. module: account_bank_statement_import
 #: model_terms:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 4fb2c7ea675..1ab03a5edda 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -6,12 +6,13 @@
 # Martin Trigaux, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +41,7 @@ msgstr "Fortryd indtastning"
 #. module: account_cancel
 #: model_terms:ir.ui.view,arch_db:account_cancel.bank_statement_draft_form_inherit
 msgid "Reset to New"
-msgstr "Nulstil til Ny"
+msgstr "Nulstil til ny"
 
 #. module: account_cancel
 #: model_terms:ir.ui.view,arch_db:account_cancel.bank_statement_cancel_form_inherit
diff --git a/addons/account_check_printing/i18n/da.po b/addons/account_check_printing/i18n/da.po
index 97fea06ac8b..fbd44e1617b 100644
--- a/addons/account_check_printing/i18n/da.po
+++ b/addons/account_check_printing/i18n/da.po
@@ -9,13 +9,15 @@
 # Jesper Carstensen <info@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +160,7 @@ msgstr ""
 #. module: account_check_printing
 #: model:ir.model,name:account_check_printing.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks__create_uid
@@ -227,7 +229,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account_check_printing.field_account_journal__check_next_number
 #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks__next_check_number
 msgid "Next Check Number"
-msgstr "Næste check nummer"
+msgstr "Næste checknummer"
 
 #. module: account_check_printing
 #: selection:res.company,account_check_printing_layout:0
diff --git a/addons/account_payment/i18n/da.po b/addons/account_payment/i18n/da.po
index 447b891f49b..6dcb6ec4681 100644
--- a/addons/account_payment/i18n/da.po
+++ b/addons/account_payment/i18n/da.po
@@ -118,7 +118,7 @@ msgstr ""
 #: code:addons/account_payment/controllers/payment.py:44
 #, python-format
 msgid "Pay & Confirm"
-msgstr "Betal & Bekræft"
+msgstr "Betal & bekræft"
 
 #. module: account_payment
 #: code:addons/account_payment/models/payment.py:22
diff --git a/addons/account_tax_python/i18n/da.po b/addons/account_tax_python/i18n/da.po
index 43ed9644698..021eb0feda6 100644
--- a/addons/account_tax_python/i18n/da.po
+++ b/addons/account_tax_python/i18n/da.po
@@ -6,12 +6,13 @@
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +97,7 @@ msgstr "Procent af pris"
 #: selection:account.tax,amount_type:0
 #: selection:account.tax.template,amount_type:0
 msgid "Percentage of Price Tax Included"
-msgstr "Procentdel af pris inklusiv skat"
+msgstr "Procentdel af pris inklusiv moms"
 
 #. module: account_tax_python
 #: selection:account.tax,amount_type:0
@@ -120,4 +121,4 @@ msgstr "Momsberegning"
 #. module: account_tax_python
 #: model:ir.model,name:account_tax_python.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr "Moms skabeloner"
+msgstr "Momsskabeloner"
diff --git a/addons/account_test/i18n/da.po b/addons/account_test/i18n/da.po
index b18f868c3da..2ca0675b647 100644
--- a/addons/account_test/i18n/da.po
+++ b/addons/account_test/i18n/da.po
@@ -4,19 +4,19 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
-# jonas jensen <j.jensen@tcomp.dk>, 2018
 # Visti Kristensen <visti@vkdata.dk>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
 "Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -54,12 +54,12 @@ msgstr ""
 #: model:ir.actions.report,name:account_test.account_assert_test_report
 #: model:ir.ui.menu,name:account_test.menu_action_license
 msgid "Accounting Tests"
-msgstr "Bogførings tests"
+msgstr "Regnskabstests"
 
 #. module: account_test
 #: model_terms:ir.ui.view,arch_db:account_test.report_accounttest
 msgid "Accouting tests on"
-msgstr "Regnskabs test aktiveret"
+msgstr "Regnskabstest aktiveret"
 
 #. module: account_test
 #: model:ir.model.fields,field_description:account_test.field_accounting_assert_test__active
@@ -69,7 +69,7 @@ msgstr "Aktiv"
 #. module: account_test
 #: model:accounting.assert.test,desc:account_test.account_test_03
 msgid "Check if movement lines are balanced and have the same date and period"
-msgstr "Tjek om flytte linier er i balance og har samme dato og periode"
+msgstr "Tjek om flyttede linjer er i balance og har samme dato og periode"
 
 #. module: account_test
 #: model:accounting.assert.test,desc:account_test.account_test_07
@@ -110,7 +110,7 @@ msgstr "Tjek balancen: Debet sum = Kredit sum"
 #. module: account_test
 #: model_terms:ir.ui.view,arch_db:account_test.account_assert_form
 msgid "Code Help"
-msgstr "Kode Hjælp"
+msgstr "Kode hjælp"
 
 #. module: account_test
 #: model_terms:ir.ui.view,arch_db:account_test.account_assert_form
@@ -203,7 +203,7 @@ msgstr "Python code"
 #. module: account_test
 #: model:ir.model.fields,field_description:account_test.field_accounting_assert_test__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: account_test
 #: model:accounting.assert.test,name:account_test.account_test_01
@@ -224,7 +224,7 @@ msgstr "Test 5.1 : Kreditor og Debitor posteringer fra udlignede fakturaer"
 #. module: account_test
 #: model:accounting.assert.test,name:account_test.account_test_05_2
 msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts"
-msgstr "Test 5.2 : Udlignede fakturaer og Kreditor/Debitor konti"
+msgstr "Test 5.2 : Udlignede fakturaer og kreditor/debitor konti"
 
 #. module: account_test
 #: model:accounting.assert.test,name:account_test.account_test_06
diff --git a/addons/account_voucher/i18n/da.po b/addons/account_voucher/i18n/da.po
index a2a616ffe8f..f3b219db7cf 100644
--- a/addons/account_voucher/i18n/da.po
+++ b/addons/account_voucher/i18n/da.po
@@ -57,7 +57,7 @@ msgstr "Bogføringsdato"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr "Regnskabs bilag"
+msgstr "Bogføringsbilag"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_line
@@ -67,7 +67,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_needaction
 msgid "Action Needed"
-msgstr "Aktion påkrævet"
+msgstr "Handling påkrævet"
 
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line__price_subtotal
@@ -252,7 +252,7 @@ msgstr "ID"
 #. module: account_voucher
 #: model:ir.model.fields,help:account_voucher.field_account_voucher__message_unread
 msgid "If checked new messages require your attention."
-msgstr "Hvis afmærket, kræver nye beskeder din attention"
+msgstr "Hvis afmærket, kræver nye beskeder din opmærksomhed"
 
 #. module: account_voucher
 #: model:ir.model.fields,help:account_voucher.field_account_voucher__message_needaction
@@ -281,7 +281,7 @@ msgstr "Interne noter"
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__journal_id
@@ -360,7 +360,7 @@ msgstr "Nummer"
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_needaction_counter
 msgid "Number of Actions"
-msgstr "Antal aktioner"
+msgstr "Antal handlinger"
 
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_has_error_counter
@@ -518,7 +518,7 @@ msgstr "Søg bilag"
 #. module: account_voucher
 #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: account_voucher
 #: model_terms:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form
@@ -652,7 +652,7 @@ msgstr "Bilagsposteringer"
 #: model_terms:ir.ui.view,arch_db:account_voucher.view_voucher_line_form
 #: model_terms:ir.ui.view,arch_db:account_voucher.view_voucher_line_tree
 msgid "Voucher Lines"
-msgstr "Bilagslinier"
+msgstr "Bilagslinjer"
 
 #. module: account_voucher
 #: model_terms:ir.ui.view,arch_db:account_voucher.account_cash_statement_graph
diff --git a/addons/analytic/i18n/da.po b/addons/analytic/i18n/da.po
index 75c88e723dc..bd654b7ac60 100644
--- a/addons/analytic/i18n/da.po
+++ b/addons/analytic/i18n/da.po
@@ -29,7 +29,7 @@ msgstr ""
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_needaction
 msgid "Action Needed"
-msgstr "Aktion påkrævet"
+msgstr "Handling påkrævet"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__active
@@ -125,7 +125,7 @@ msgstr "Analytiske emner"
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Analytisk linie"
+msgstr "Analytisk linje"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__line_ids
@@ -324,7 +324,7 @@ msgstr "ID"
 #. module: analytic
 #: model:ir.model.fields,help:analytic.field_account_analytic_account__message_unread
 msgid "If checked new messages require your attention."
-msgstr "Hvis afmærket, kræver nye beskeder din attention"
+msgstr "Hvis afmærket, kræver nye beskeder din opmærksomhed"
 
 #. module: analytic
 #: model:ir.model.fields,help:analytic.field_account_analytic_account__message_needaction
@@ -360,7 +360,7 @@ msgstr ""
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account____last_update
@@ -424,7 +424,7 @@ msgstr ""
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_needaction_counter
 msgid "Number of Actions"
-msgstr "Antal aktioner"
+msgstr "Antal handlinger"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_has_error_counter
@@ -554,7 +554,7 @@ msgstr "Ulæste beskeder"
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_unread_counter
 msgid "Unread Messages Counter"
-msgstr "Ulæste besked tæller"
+msgstr "Ulæste beskedtæller"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_line__user_id
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 9d3fe0d9755..108a11c5d40 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -31,7 +31,7 @@ msgstr ""
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_needaction
 msgid "Action Needed"
-msgstr "需要激活"
+msgstr "需要采取行动"
 
 #. module: analytic
 #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__active
diff --git a/addons/auth_ldap/i18n/da.po b/addons/auth_ldap/i18n/da.po
index 5d9bed60e58..c01fde11814 100644
--- a/addons/auth_ldap/i18n/da.po
+++ b/addons/auth_ldap/i18n/da.po
@@ -7,13 +7,15 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,17 +43,17 @@ msgstr "Virksomhed"
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_company_ldap
 msgid "Company LDAP configuration"
-msgstr ""
+msgstr "Virksomhed LDAP konfiguration"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__create_user
 msgid "Create User"
-msgstr "Opret Bruger"
+msgstr "Opret bruger"
 
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__create_uid
@@ -145,6 +147,8 @@ msgstr "Login-information"
 #, python-format
 msgid "No local user found for LDAP login and not configured to create one"
 msgstr ""
+"Ingen lokal bruger er fundet for LDAP login og den er ikke konfigureret til "
+"at oprette en"
 
 #. module: auth_ldap
 #: model_terms:ir.ui.view,arch_db:auth_ldap.view_ldap_installer_form
@@ -164,7 +168,7 @@ msgstr ""
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: auth_ldap
 #: model_terms:ir.ui.view,arch_db:auth_ldap.view_ldap_installer_form
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index 3190f99f431..77ce7c34407 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
 # inspur qiuguodong <qiuguodong@inspur.com>, 2018
 # kun zhang <re.z@qq.com>, 2018
 # 
@@ -108,7 +109,7 @@ msgstr "LDAP 基节点"
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__ldap_binddn
 msgid "LDAP binddn"
-msgstr "LDAP协议"
+msgstr "LDAP 绑定dn"
 
 #. module: auth_ldap
 #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__ldap_filter
diff --git a/addons/auth_oauth/i18n/da.po b/addons/auth_oauth/i18n/da.po
index 6e17181278a..efcab7e2457 100644
--- a/addons/auth_oauth/i18n/da.po
+++ b/addons/auth_oauth/i18n/da.po
@@ -8,13 +8,15 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +27,7 @@ msgstr ""
 #. module: auth_oauth
 #: model_terms:ir.ui.view,arch_db:auth_oauth.providers
 msgid "- or -"
-msgstr ""
+msgstr "- eller -"
 
 #. module: auth_oauth
 #: model_terms:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
@@ -77,12 +79,12 @@ msgstr "Kunde ID"
 #. module: auth_oauth
 #: model_terms:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Client ID:"
-msgstr ""
+msgstr "Kunde ID:"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider__create_uid
@@ -107,7 +109,7 @@ msgstr "Vis navn"
 #. module: auth_oauth
 #: model_terms:ir.ui.view,arch_db:auth_oauth.res_config_settings_view_form
 msgid "Google Authentication"
-msgstr ""
+msgstr "Google godkendelse"
 
 #. module: auth_oauth
 #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider__id
@@ -204,7 +206,7 @@ msgstr "Sign up er ikke tilladt på denne database."
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_ir_config_parameter
 msgid "System Parameter"
-msgstr ""
+msgstr "Systemparameter"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
diff --git a/addons/auth_oauth/i18n/it.po b/addons/auth_oauth/i18n/it.po
index 55a9ddcff55..f78bba8d625 100644
--- a/addons/auth_oauth/i18n/it.po
+++ b/addons/auth_oauth/i18n/it.po
@@ -3,18 +3,19 @@
 # * auth_oauth
 # 
 # Translators:
-# Sergio Zanchetta <primes2h@gmail.com>, 2018
 # Martin Trigaux, 2018
 # Paolo Valier, 2018
 # Pietro Della Notte <pdellanotte@gmail.com>, 2018
 # Léonie Bouchat <lbo@odoo.com>, 2018
+# Sergio Zanchetta <primes2h@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Léonie Bouchat <lbo@odoo.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:15+0000\n"
+"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -204,7 +205,7 @@ msgstr "L'accesso non è permesso su questo database"
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_ir_config_parameter
 msgid "System Parameter"
-msgstr ""
+msgstr "Parametro di sistema"
 
 #. module: auth_oauth
 #: model:ir.model,name:auth_oauth.model_res_users
diff --git a/addons/auth_password_policy/i18n/da.po b/addons/auth_password_policy/i18n/da.po
index 4286fee94ac..e2890e40ceb 100644
--- a/addons/auth_password_policy/i18n/da.po
+++ b/addons/auth_password_policy/i18n/da.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
-"PO-Revision-Date: 2018-10-08 06:48+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-10-08 07:10+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@ msgstr ""
 #. module: auth_password_policy
 #: model:ir.model,name:auth_password_policy.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: auth_password_policy
 #: model:ir.model.fields,field_description:auth_password_policy.field_res_config_settings__minlength
diff --git a/addons/auth_signup/i18n/da.po b/addons/auth_signup/i18n/da.po
index 2f46680c55f..813ff214c0b 100644
--- a/addons/auth_signup/i18n/da.po
+++ b/addons/auth_signup/i18n/da.po
@@ -4,17 +4,18 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
-# Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,12 +29,14 @@ msgid ""
 "${object.create_uid.name} from ${object.company_id.name} invites you to "
 "connect to Odoo"
 msgstr ""
+"${object.create_uid.name} from ${object.company_id.name} inviterer dig til "
+"at oprette forbindelse til Odoo"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:126
 #, python-format
 msgid "%s connected"
-msgstr ""
+msgstr "%s Forbundet"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_users_view_form
@@ -141,6 +144,90 @@ msgid ""
 "</td></tr>\n"
 "</table>"
 msgstr ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+"    <!-- HEADER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\">\n"
+"                    <span style=\"font-size: 10px;\">Velkommen til Odoo</span><br/>\n"
+"                    <span style=\"font-size: 20px; font-weight: bold;\">\n"
+"                        ${object.name}\n"
+"                    </span>\n"
+"                </td><td valign=\"middle\" align=\"right\">\n"
+"                    <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+"                </td></tr>\n"
+"                <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- CONTENT -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                    <div>\n"
+"                        Kære ${object.name},<br/><br/>\n"
+"                        Du er inviteret af ${object.create_uid.name} fra ${object.company_id.name} til at oprette forbindelse til Odoo.\n"
+"                        <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                            <a href=\"${object.signup_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                Acceptér invitation\n"
+"                            </a>\n"
+"                        </div>\n"
+"                        % set website_url = object.env['ir.config_parameter'].sudo().get_param('web.base.url')\n"
+"                        Dit Odoo-domæne er: <b><a href=\"${website_url}\">${website_url}</a></b><br/>\n"
+"                        Din registrerings e-mail er: <b><a href=\"/web/login?login=${object.email}\" target=\"_blank\">${object.email}</a></b><br/><br/>\n"
+"                        Har du aldrig hørt om Odoo? Det er et alt-i-et-ERP system, der er har +3 millioner brugere. Det vil forbedre din oplevelse på arbejdspladsen betydeligt og øge produktiviteten.\n"
+"                        <br/><br/>\n"
+"                        Prøv at se her <a href=\"https://www.odoo.com/page/tour?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo Tour</a> for at opleve systemet\n"
+"                        <br/><br/>\n"
+"                        God fornøjelse med Odoo!<br/>\n"
+"                        --<br/>Hilsen ${object.company_id.name} \n"
+"                    </div>\n"
+"                </td></tr>\n"
+"                <tr><td style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- FOOTER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\" align=\"left\">\n"
+"                    ${object.company_id.name}\n"
+"                </td></tr>\n"
+"                <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+"                    ${object.company_id.phone}\n"
+"                    % if object.company_id.email\n"
+"                        | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+"                    % endif\n"
+"                    % if object.company_id.website\n"
+"                        | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+"                        ${object.company_id.website}\n"
+"                    </a>\n"
+"                    % endif\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+"    <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"      <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+"        Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+"      </td></tr>\n"
+"    </table>\n"
+"</td></tr>\n"
+"</table>"
 
 #. module: auth_signup
 #: model:mail.template,body_html:auth_signup.reset_password_email
@@ -226,6 +313,86 @@ msgid ""
 "</table>\n"
 "            "
 msgstr ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+"    <!-- HEADER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\">\n"
+"                    <span style=\"font-size: 10px;\">Din konto</span><br/>\n"
+"                    <span style=\"font-size: 20px; font-weight: bold;\">\n"
+"                        ${object.name}\n"
+"                    </span>\n"
+"                </td><td valign=\"middle\" align=\"right\">\n"
+"                    <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+"                </td></tr>\n"
+"                <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- CONTENT -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                    <div>\n"
+"                        Kære ${object.name},<br/><br/>\n"
+"                        Der blev anmodet om en nulstilling af adgangskoden til den Odoo konto, der var knyttet til denne e-mail.\n"
+"                        Du kan ændre dit kodeord ved at følge dette link, som forbliver gyldigt i de næste 24 timer:<br/>\n"
+"                        <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                            <a href=\"${object.signup_url}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                Skift adgangskode\n"
+"                            </a>\n"
+"                        </div>\n"
+"                        Hvis du ikke forventer dette, kan du ignorere denne e-mail.<br/><br/>\n"
+"                        Tak,<br/>\n"
+"                        ${user.signature | safe}<br/>\n"
+"                    </div>\n"
+"                </td></tr>\n"
+"                <tr><td style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- FOOTER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\" align=\"left\">\n"
+"                    ${object.company_id.name}\n"
+"                </td></tr>\n"
+"                <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+"                    ${object.company_id.phone}\n"
+"                    % if object.company_id.email\n"
+"                        | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+"                    % endif\n"
+"                    % if object.company_id.website\n"
+"                        | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+"                        ${object.company_id.website}\n"
+"                    </a>\n"
+"                    % endif\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+"    <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"      <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+"        Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+"      </td></tr>\n"
+"    </table>\n"
+"</td></tr>\n"
+"</table>\n"
+"            "
 
 #. module: auth_signup
 #: model:mail.template,body_html:auth_signup.mail_template_user_signup_account_created
@@ -310,11 +477,90 @@ msgid ""
 "</td></tr>\n"
 "</table>"
 msgstr ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #F1F1F1; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\"><tr><td align=\"center\">\n"
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: white; color: #454748; border-collapse:separate;\">\n"
+"<tbody>\n"
+"    <!-- HEADER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\">\n"
+"                    <span style=\"font-size: 10px;\">Din konto</span><br/>\n"
+"                    <span style=\"font-size: 20px; font-weight: bold;\">\n"
+"                        ${object.name}\n"
+"                    </span>\n"
+"                </td><td valign=\"middle\" align=\"right\">\n"
+"                    <img src=\"/logo.png?company=${object.company_id.id}\" style=\"padding: 0px; margin: 0px; height: auto; width: 80px;\" alt=\"${object.company_id.name}\"/>\n"
+"                </td></tr>\n"
+"                <tr><td colspan=\"2\" style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- CONTENT -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                    <div>\n"
+"                        Kære ${object.name},<br/><br/>\n"
+"                        Din konto er blevet oprettet!<br/>\n"
+"                        Dit login er <strong>${object.email}</strong><br/>\n"
+"                        For at få adgang til din konto, kan du bruge følgende link:\n"
+"                        <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                            <a href=\"/web/login?${ctx['auth_login']}\" style=\"background-color: #875A7B; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                Gå til min konto\n"
+"                            </a>\n"
+"                        </div>\n"
+"                        Tak,<br/><br/>\n"
+"                        ${user.signature | safe}<br/>\n"
+"                    </div>\n"
+"                </td></tr>\n"
+"                <tr><td style=\"text-align:center;\">\n"
+"                  <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"    <!-- FOOTER -->\n"
+"    <tr>\n"
+"        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; font-size: 11px; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                <tr><td valign=\"middle\" align=\"left\">\n"
+"                    ${object.company_id.name}\n"
+"                </td></tr>\n"
+"                <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
+"                    ${object.company_id.phone}\n"
+"                    % if object.company_id.email\n"
+"                        | <a href=\"'mailto:%s' % ${object.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${object.company_id.email}</a>\n"
+"                    % endif\n"
+"                    % if object.company_id.website\n"
+"                        | <a href=\"'%s' % ${object.company_id.website}\" style=\"text-decoration:none; color: #454748;\">\n"
+"                        ${object.company_id.website}\n"
+"                    </a>\n"
+"                    % endif\n"
+"                </td></tr>\n"
+"            </table>\n"
+"        </td>\n"
+"    </tr>\n"
+"</tbody>\n"
+"</table>\n"
+"</td></tr>\n"
+"<!-- POWERED BY -->\n"
+"<tr><td align=\"center\" style=\"min-width: 590px;\">\n"
+"    <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"      <tr><td style=\"text-align: center; font-size: 13px;\">\n"
+"        Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+"      </td></tr>\n"
+"    </table>\n"
+"</td></tr>\n"
+"</table>"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.signup
 msgid "Already have an account?"
-msgstr ""
+msgstr "Har du allerede en konto?"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:80
@@ -340,7 +586,7 @@ msgstr "Godkendelse mislykkedes."
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.reset_password
 msgid "Back to Login"
-msgstr "Tilbage til log ind"
+msgstr "Tilbage til login"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:199
@@ -356,7 +602,7 @@ msgstr "Luk"
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.reset_password
@@ -393,12 +639,12 @@ msgstr "Kunne ikke nulstille din adgangskode"
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings__auth_signup_uninvited
 msgid "Customer Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Default Access Rights"
-msgstr "Standard Adgangsrettigheder"
+msgstr "Standard adgangsrettigheder"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.login
@@ -409,18 +655,18 @@ msgstr "Har ikke en konto?"
 #: model:ir.model.fields,field_description:auth_signup.field_res_config_settings__auth_signup_reset_password
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Enable password reset from Login page"
-msgstr "Tillad nulstilling af adgangskode fra log ind siden."
+msgstr "Tillad nulstilling af adgangskode fra login siden."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: auth_signup
 #: code:addons/auth_signup/controllers/main.py:115
 #, python-format
 msgid "Invalid signup token"
-msgstr "Ugyldigt tilmeldings token"
+msgstr "Ugyldigt tilmeldingstoken"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
@@ -436,7 +682,7 @@ msgstr "Aldrig forbundet"
 #: code:addons/auth_signup/controllers/main.py:75
 #, python-format
 msgid "No login provided."
-msgstr ""
+msgstr "Ingen login angivet."
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.fields
@@ -446,7 +692,7 @@ msgstr "Adgangskode"
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
 msgid "Password Reset"
-msgstr ""
+msgstr "Nulstil adgangskode"
 
 #. module: auth_signup
 #: model:mail.template,subject:auth_signup.reset_password_email
@@ -457,7 +703,7 @@ msgstr "Nulstilling af adgangskode"
 #: code:addons/auth_signup/controllers/main.py:125
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr "Passwordsene matcher ikke; prøv venligst igen."
+msgstr "Adgangskoderne matcher ikke; prøv venligst igen."
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.login
@@ -468,7 +714,7 @@ msgstr "Nulstil adgangskode"
 #: code:addons/auth_signup/models/res_users.py:163
 #, python-format
 msgid "Reset password: invalid username or email"
-msgstr "Nulstil adgangskode: ugyldigt brugernavn eller email"
+msgstr "Nulstil adgangskode: ugyldigt brugernavn eller e-mail"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_users_view_form
@@ -478,7 +724,7 @@ msgstr "Send instruktioner til at nulstille adgangskode "
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_users_view_form
 msgid "Send an Invitation Email"
-msgstr "Send en invitations email"
+msgstr "Send en invitations e-mail"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.signup
@@ -489,67 +735,67 @@ msgstr "Tilmeld dig"
 #: model:ir.model.fields,field_description:auth_signup.field_res_partner__signup_expiration
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__signup_expiration
 msgid "Signup Expiration"
-msgstr ""
+msgstr "Tilmelding er udløb"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_partner__signup_token
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__signup_token
 msgid "Signup Token"
-msgstr ""
+msgstr "Tilmeldingstoken"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_partner__signup_type
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__signup_type
 msgid "Signup Token Type"
-msgstr ""
+msgstr "Type på tilmeldingstoken"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_partner__signup_valid
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__signup_valid
 msgid "Signup Token is Valid"
-msgstr ""
+msgstr "Tilmeldingstoken er gyldig"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_partner__signup_url
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__signup_url
 msgid "Signup URL"
-msgstr ""
+msgstr "Tilmeldings URL"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:117
 #, python-format
 msgid "Signup is not allowed for uninvited users"
-msgstr ""
+msgstr "Tilmelding er ikke tilladt for ikke inviterede brugere"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:149
 #, python-format
 msgid "Signup token '%s' is no longer valid"
-msgstr ""
+msgstr "Tilmeldingstoken '%s' er ikke længere gyldig"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_partner.py:145
 #, python-format
 msgid "Signup token '%s' is not valid"
-msgstr ""
+msgstr "Tilmeldingstoken '%s' er ikke gyldig"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:138
 #, python-format
 msgid "Signup: invalid template user"
-msgstr ""
+msgstr "Tilmelding: ugyldig skabelonbruger"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:141
 #, python-format
 msgid "Signup: no login given for new user"
-msgstr ""
+msgstr "Tilmelding: Ingen login er givet til ny bruger"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:143
 #, python-format
 msgid "Signup: no name or partner given for new user"
-msgstr ""
+msgstr "Tilmelding: Intet navn eller partner er givet til ny bruger"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__state
@@ -565,13 +811,13 @@ msgstr "\"Skabelonbruger\" for nye brugere, som oprettes gennem tilmelding"
 #: code:addons/auth_signup/controllers/main.py:123
 #, python-format
 msgid "The form was not properly filled in."
-msgstr ""
+msgstr "Formularen blev ikke korrekt udfyldt."
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:127
 #, python-format
 msgid "This is his first connection. Wish him welcome"
-msgstr ""
+msgstr "Dette er hans første forbindelse. Ønsk ham velkommen"
 
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.res_config_settings_view_form
@@ -580,6 +826,9 @@ msgid ""
 "list view and click on 'Portal Access Management' option in the dropdown "
 "menu *Action*."
 msgstr ""
+"Hvis du vil sende invitationer i B2B-tilstand, skal du åbne en kontakt eller"
+" vælge flere i listevisning og klikke på 'Portal Access Management' i "
+"rullemenuen *Handling*."
 
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
@@ -605,4 +854,4 @@ msgstr "Dit navn"
 #. module: auth_signup
 #: model_terms:ir.ui.view,arch_db:auth_signup.fields
 msgid "e.g. John Doe"
-msgstr ""
+msgstr "e.g. John Doe"
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
index 70528de42d9..b17f8d686a4 100644
--- a/addons/auth_signup/i18n/zh_CN.po
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -5,8 +5,9 @@
 # Translators:
 # Martin Trigaux, 2018
 # ChinaMaker <liuct@chinamaker.net>, 2018
-# liAnGjiA <liangjia@qq.com>, 2018
 # inspur qiuguodong <qiuguodong@inspur.com>, 2018
+# liAnGjiA <liangjia@qq.com>, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
 # 广州救火 <7017511@qq.com>, 2018
 # 
 msgid ""
@@ -780,13 +781,13 @@ msgstr "登入: 无效用户模板"
 #: code:addons/auth_signup/models/res_users.py:141
 #, python-format
 msgid "Signup: no login given for new user"
-msgstr "登入：没有为新用户提供登录"
+msgstr "注册：没有为新用户提供登录"
 
 #. module: auth_signup
 #: code:addons/auth_signup/models/res_users.py:143
 #, python-format
 msgid "Signup: no name or partner given for new user"
-msgstr "登入：没有为新用户指定名称或合作伙伴"
+msgstr "注册：没有为新用户指定名称或合作伙伴"
 
 #. module: auth_signup
 #: model:ir.model.fields,field_description:auth_signup.field_res_users__state
diff --git a/addons/barcodes/i18n/da.po b/addons/barcodes/i18n/da.po
index c425f9aa8c8..a01db15c304 100644
--- a/addons/barcodes/i18n/da.po
+++ b/addons/barcodes/i18n/da.po
@@ -7,16 +7,17 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,19 +35,19 @@ msgstr ""
 #: code:addons/barcodes/models/barcodes.py:202
 #, python-format
 msgid ": a rule can only contain one pair of braces."
-msgstr ""
+msgstr ": en regel kan kun indeholde et par parenteser."
 
 #. module: barcodes
 #: code:addons/barcodes/models/barcodes.py:198
 #, python-format
 msgid ": braces can only contain N's followed by D's."
-msgstr ""
+msgstr ": parenteser kan kun indeholde N'er efterfulgt af D'er."
 
 #. module: barcodes
 #: code:addons/barcodes/models/barcodes.py:200
 #, python-format
 msgid ": empty braces."
-msgstr ""
+msgstr ": tomme parenteser."
 
 #. module: barcodes
 #: model_terms:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form
@@ -56,6 +57,10 @@ msgid ""
 "                                pattern. The pattern syntax is that of regular expression, and a barcode is matched\n"
 "                                if the regular expression matches a prefix of the barcode."
 msgstr ""
+"<i>Stregkode nomenklatures</i> definere hvordan stregkoder genkendes og kategoriseres.\n"
+"                               Når en stregkode scannes, er den forbundet med den <i>første</i> regel med en matchende\n"
+"                               mønster. Mønstersyntaxen er det almindelige udtryk, og en stregkode matches\n"
+"                               hvis det regulære udtryk matcher et præfiks for stregkoden."
 
 #. module: barcodes
 #: model_terms:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
@@ -63,11 +68,13 @@ msgid ""
 "A barcode nomenclature defines how the point of sale identify and interprets"
 " barcodes"
 msgstr ""
+"En stregkodes nomenklatur definerer, hvordan butikken identificerer og "
+"fortolker stregkoder"
 
 #. module: barcodes
 #: model_terms:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form
 msgid "Add a new barcode nomenclature"
-msgstr ""
+msgstr "Tilføj en ny stregkode nomenklatur"
 
 #. module: barcodes
 #: selection:barcode.rule,type:0
@@ -83,7 +90,7 @@ msgstr "Altid"
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule__name
 msgid "An internal identification for this barcode nomenclature rule"
-msgstr "En intern identifikation af sdenne tregkodes nomenklaturregel"
+msgstr "En intern identifikation af denne stregkodes nomenklature regel"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature__name
@@ -98,7 +105,7 @@ msgstr "Enhver"
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin
 msgid "Barcode Event Mixin"
-msgstr ""
+msgstr "Stregkode Event Mixin"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_barcode_nomenclature
@@ -138,7 +145,7 @@ msgstr "Ekspedient"
 #. module: barcodes
 #: selection:barcode.rule,type:0
 msgid "Client"
-msgstr "Klient"
+msgstr "Kunde"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_res_company
@@ -206,21 +213,21 @@ msgstr "Kodning"
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:326
 #, python-format
 msgid "Error: Barcode command is undefined"
-msgstr ""
+msgstr "Fejl: Stregkodekommandoen er udefineret"
 
 #. module: barcodes
 #. openerp-web
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:63
 #, python-format
 msgid "Error: Document not editable"
-msgstr ""
+msgstr "Fejl: Dokument kan ikke redigeres"
 
 #. module: barcodes
 #. openerp-web
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:362
 #, python-format
 msgid "Error: No last scanned barcode"
-msgstr ""
+msgstr "Fejl: Ingen sidste scannet stregkode"
 
 #. module: barcodes
 #. openerp-web
@@ -230,12 +237,12 @@ msgstr ""
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:139
 #, python-format
 msgid "Error: Pager not available"
-msgstr ""
+msgstr "Fejl: Pager er ikke tilgængelig"
 
 #. module: barcodes
 #: model:ir.model,name:barcodes.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature__id
@@ -281,7 +288,7 @@ msgstr "Aldrig"
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_res_company__nomenclature_id
 msgid "Nomenclature"
-msgstr ""
+msgstr "Nomenklature"
 
 #. module: barcodes
 #: selection:barcode.rule,type:0
@@ -307,7 +314,7 @@ msgstr "Prissat produkt"
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_rule__name
 msgid "Rule Name"
-msgstr "Regel Navn"
+msgstr "Regelnavn"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature__rule_ids
@@ -341,17 +348,17 @@ msgstr "Borde"
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule__pattern
 msgid "The barcode matching pattern"
-msgstr ""
+msgstr "Stregkode matchende mønster"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature__rule_ids
 msgid "The list of barcode rules"
-msgstr ""
+msgstr "Listen over stregkoderegler"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule__alias
 msgid "The matched pattern will alias to this barcode"
-msgstr ""
+msgstr "Det matchede mønster vil passe til denne stregkode"
 
 #. module: barcodes
 #: code:addons/barcodes/models/barcodes.py:198
@@ -359,7 +366,7 @@ msgstr ""
 #: code:addons/barcodes/models/barcodes.py:202
 #, python-format
 msgid "There is a syntax error in the barcode pattern "
-msgstr ""
+msgstr "Der er en syntaksfejl i stregkodemønsteret"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule__encoding
@@ -367,13 +374,14 @@ msgid ""
 "This rule will apply only if the barcode is encoded with the specified "
 "encoding"
 msgstr ""
+"Denne regel gælder kun hvis stregkoden er kodet med den angivne kodning"
 
 #. module: barcodes
 #. openerp-web
 #: code:addons/barcodes/static/src/js/barcode_form_view.js:64
 #, python-format
 msgid "To modify this document, please first start edition."
-msgstr ""
+msgstr "For at ændre dette dokument, bedes du først aktivere redigering."
 
 #. module: barcodes
 #. openerp-web
@@ -403,7 +411,7 @@ msgstr "UPC-A"
 #. module: barcodes
 #: selection:barcode.nomenclature,upc_ean_conv:0
 msgid "UPC-A to EAN-13"
-msgstr ""
+msgstr "UPC-A til EAN-13"
 
 #. module: barcodes
 #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature__upc_ean_conv
@@ -413,13 +421,15 @@ msgstr "UPC/EAN Konvertering"
 #. module: barcodes
 #: selection:barcode.rule,type:0
 msgid "Unit Product"
-msgstr ""
+msgstr "Stk. produkt"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcode_rule__sequence
 msgid ""
 "Used to order rules such that rules with a smaller sequence match first"
 msgstr ""
+"Bruges til at bestille regler, sådan at regler med en mindre sekvens matcher"
+" først"
 
 #. module: barcodes
 #: model:ir.model.fields,help:barcodes.field_barcodes_barcode_events_mixin___barcode_scanned
diff --git a/addons/base_address_city/i18n/da.po b/addons/base_address_city/i18n/da.po
index 7cd06a15441..94a2e9a4f76 100644
--- a/addons/base_address_city/i18n/da.po
+++ b/addons/base_address_city/i18n/da.po
@@ -7,13 +7,15 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:48+0000\n"
-"PO-Revision-Date: 2018-09-18 09:48+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +53,7 @@ msgstr "By"
 #: model:ir.model.fields,field_description:base_address_city.field_res_partner__city_id
 #: model:ir.model.fields,field_description:base_address_city.field_res_users__city_id
 msgid "City of Address"
-msgstr ""
+msgstr "By"
 
 #. module: base_address_city
 #: model:ir.model,name:base_address_city.model_res_partner
@@ -86,13 +88,16 @@ msgid ""
 "                your partner records. Note that an option can be set on each country separately\n"
 "                to enforce any address of it to have a city in this list."
 msgstr ""
+"Vis og administrer listen over alle byer, der kan tildeles\n"
+"               din partners lister. Bemærk, at en valgmulighed kan indstilles for hvert land separat\n"
+"                for at gennemtvinge at enhver adresse i en by er i denne liste."
 
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_country__enforce_cities
 #: model:ir.model.fields,field_description:base_address_city.field_res_partner__country_enforce_cities
 #: model:ir.model.fields,field_description:base_address_city.field_res_users__country_enforce_cities
 msgid "Enforce Cities"
-msgstr ""
+msgstr "Gennemtving byer"
 
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_city__id
@@ -122,7 +127,7 @@ msgstr "Navn"
 #. module: base_address_city
 #: model_terms:ir.ui.view,arch_db:base_address_city.view_city_filter
 msgid "Search City"
-msgstr "Søg By"
+msgstr "Søg by"
 
 #. module: base_address_city
 #: model:ir.model.fields,field_description:base_address_city.field_res_city__state_id
diff --git a/addons/base_address_extended/i18n/da.po b/addons/base_address_extended/i18n/da.po
index cfdfb4e9937..33ddb8f0bb0 100644
--- a/addons/base_address_extended/i18n/da.po
+++ b/addons/base_address_extended/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:48+0000\n"
-"PO-Revision-Date: 2018-09-18 09:48+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +47,7 @@ msgstr "Land"
 #: model:ir.model.fields,field_description:base_address_extended.field_res_partner__street_number2
 #: model:ir.model.fields,field_description:base_address_extended.field_res_users__street_number2
 msgid "Door"
-msgstr ""
+msgstr "Dør"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_company__street_number2
@@ -69,19 +71,19 @@ msgstr ""
 #: model:ir.model.fields,field_description:base_address_extended.field_res_partner__street_number
 #: model:ir.model.fields,field_description:base_address_extended.field_res_users__street_number
 msgid "House"
-msgstr ""
+msgstr "Hus"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_company__street_number
 #: model:ir.model.fields,help:base_address_extended.field_res_partner__street_number
 #: model:ir.model.fields,help:base_address_extended.field_res_users__street_number
 msgid "House Number"
-msgstr ""
+msgstr "Husnummer"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_country__street_format
 msgid "Street Format"
-msgstr ""
+msgstr "Gade"
 
 #. module: base_address_extended
 #: model:ir.model.fields,field_description:base_address_extended.field_res_company__street_name
@@ -95,16 +97,16 @@ msgstr "Gadenavn"
 #: model_terms:ir.ui.view,arch_db:base_address_extended.view_partner_structured_form
 #: model_terms:ir.ui.view,arch_db:base_address_extended.view_res_company_extended_form
 msgid "Street Name..."
-msgstr ""
+msgstr "Gadenavn"
 
 #. module: base_address_extended
 #: model_terms:ir.ui.view,arch_db:base_address_extended.view_res_country_extended_form
 msgid "Street format..."
-msgstr ""
+msgstr "Gade"
 
 #. module: base_address_extended
 #: code:addons/base_address_extended/models/base_address_extended.py:65
 #: code:addons/base_address_extended/models/base_address_extended.py:113
 #, python-format
 msgid "Unrecognized field %s in street format."
-msgstr ""
+msgstr "Ukendt felt %s i gade formatet"
diff --git a/addons/base_automation/i18n/da.po b/addons/base_automation/i18n/da.po
index 497d40664ac..2837cfd4304 100644
--- a/addons/base_automation/i18n/da.po
+++ b/addons/base_automation/i18n/da.po
@@ -10,12 +10,13 @@
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +28,7 @@ msgstr ""
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation__help
 msgid "Action Description"
-msgstr "Handling beskrivelse"
+msgstr "Handlingsbeskrivelse"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation__name
@@ -37,7 +38,7 @@ msgstr "Navn på handling"
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation__state
 msgid "Action To Do"
-msgstr "To Do"
+msgstr "Handling på To Do"
 
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation__type
@@ -84,7 +85,7 @@ msgstr "Tildelt til admin bruger"
 #: selection:ir.actions.server,usage:0
 #: model:ir.model,name:base_automation.model_base_automation
 msgid "Automated Action"
-msgstr "Automatiseret Handling"
+msgstr "Automatiseret handling"
 
 #. module: base_automation
 #: model:ir.actions.act_window,name:base_automation.base_automation_act
@@ -436,7 +437,7 @@ msgstr "Om oprettelse & opdatering"
 #. module: base_automation
 #: selection:base.automation,trigger:0
 msgid "On Deletion"
-msgstr "Ved Sletning"
+msgstr "Ved sletning"
 
 #. module: base_automation
 #: selection:base.automation,trigger:0
@@ -480,7 +481,7 @@ msgstr "Python kode"
 #. module: base_automation
 #: model_terms:ir.ui.view,arch_db:base_automation.view_base_automation_form
 msgid "Remove Action"
-msgstr "Fjern Handling"
+msgstr "Fjern handling"
 
 #. module: base_automation
 #: model_terms:ir.ui.view,arch_db:base_automation.view_base_automation_form
@@ -593,7 +594,7 @@ msgstr ""
 #. module: base_automation
 #: model:ir.model.fields,field_description:base_automation.field_base_automation__trg_date_calendar_id
 msgid "Use Calendar"
-msgstr "Anvend Kalender"
+msgstr "Anvend kalender"
 
 #. module: base_automation
 #: model_terms:ir.actions.act_window,help:base_automation.base_automation_act
diff --git a/addons/base_gengo/i18n/da.po b/addons/base_gengo/i18n/da.po
index de5b44b6ceb..2e6fe7a9133 100644
--- a/addons/base_gengo/i18n/da.po
+++ b/addons/base_gengo/i18n/da.po
@@ -8,13 +8,15 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +43,7 @@ msgstr ""
 #. module: base_gengo
 #: model_terms:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
 msgid "Add Gengo login Private Key..."
-msgstr "Indtast Gengo login Privat nøgle..."
+msgstr "Indtast Gengo login privat nøgle..."
 
 #. module: base_gengo
 #: model_terms:ir.ui.view,arch_db:base_gengo.res_config_settings_view_form
@@ -111,7 +113,7 @@ msgstr "Virksomheder"
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: base_gengo
 #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations__create_uid
@@ -257,7 +259,7 @@ msgstr "Offentlig nøgle"
 #. module: base_gengo
 #: selection:base.gengo.translations,sync_type:0
 msgid "Receive Translation"
-msgstr "Modtag Oversættelse"
+msgstr "Modtag oversættelse"
 
 #. module: base_gengo
 #: model:ir.model.fields,field_description:base_gengo.field_res_company__gengo_sandbox
@@ -274,7 +276,7 @@ msgstr "Send"
 #. module: base_gengo
 #: selection:base.gengo.translations,sync_type:0
 msgid "Send New Terms"
-msgstr ""
+msgstr "Send nye termer"
 
 #. module: base_gengo
 #: selection:ir.translation,gengo_translation:0
diff --git a/addons/base_gengo/i18n/zh_CN.po b/addons/base_gengo/i18n/zh_CN.po
index d0391a14e40..1279d3daecf 100644
--- a/addons/base_gengo/i18n/zh_CN.po
+++ b/addons/base_gengo/i18n/zh_CN.po
@@ -345,4 +345,4 @@ msgstr "你可以在这里选择你所需要的Gengo自动翻译级别."
 #. module: base_gengo
 #: model:ir.model,name:base_gengo.model_base_gengo_translations
 msgid "base.gengo.translations"
-msgstr "基础gengo翻译"
+msgstr "base.gengo.translations"
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
index 9b8e04b280c..00708b491c7 100644
--- a/addons/base_iban/i18n/da.po
+++ b/addons/base_iban/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,7 +36,7 @@ msgstr "Kan ikke udregne BBAN fordi kontonummeret ikke er et IBAN."
 #: code:addons/base_iban/models/res_partner_bank.py:54
 #, python-format
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/models/res_partner_bank.py:39
@@ -56,7 +58,7 @@ msgstr "IBAN er ikke gyldigt. Det skal starte med landekoden."
 #: code:addons/base_iban/models/res_partner_bank.py:31
 #, python-format
 msgid "There is no IBAN code."
-msgstr ""
+msgstr "Der er ikke nogen IBAN kode."
 
 #. module: base_iban
 #: code:addons/base_iban/models/res_partner_bank.py:45
diff --git a/addons/base_import/i18n/da.po b/addons/base_import/i18n/da.po
index bfd250ac72d..80320bb5180 100644
--- a/addons/base_import/i18n/da.po
+++ b/addons/base_import/i18n/da.po
@@ -11,12 +11,13 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +208,7 @@ msgstr "Dato format"
 #: code:addons/base_import/static/src/js/import_action.js:88
 #, python-format
 msgid "Decimal Separator:"
-msgstr "Decimal Separator:"
+msgstr "Decimal separator:"
 
 #. module: base_import
 #. openerp-web
diff --git a/addons/base_import/i18n/es.po b/addons/base_import/i18n/es.po
index ee5cbc97eda..d512b6846e1 100644
--- a/addons/base_import/i18n/es.po
+++ b/addons/base_import/i18n/es.po
@@ -3,15 +3,17 @@
 # * base_import
 # 
 # Translators:
-# Martin Trigaux, 2018
 # Miguel Orueta <mo@landoo.es>, 2018
+# Martin Trigaux, 2018
+# Emilio Silva <efsilvay@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Miguel Orueta <mo@landoo.es>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Emilio Silva <efsilvay@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,7 +65,7 @@ msgstr "Base"
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_import
 msgid "Base Import"
-msgstr ""
+msgstr "Importar Base"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_mapping
diff --git a/addons/base_import/models/base_import.py b/addons/base_import/models/base_import.py
index d6c05217bc9..5e75af21f91 100644
--- a/addons/base_import/models/base_import.py
+++ b/addons/base_import/models/base_import.py
@@ -885,6 +885,8 @@ class Import(models.TransientModel):
         try:
             if dryrun:
                 self._cr.execute('ROLLBACK TO SAVEPOINT import')
+                # cancel all changes done to the registry/ormcache
+                self.pool.reset_changes()
             else:
                 self._cr.execute('RELEASE SAVEPOINT import')
         except psycopg2.InternalError:
diff --git a/addons/base_import_module/i18n/da.po b/addons/base_import_module/i18n/da.po
index 476683c255b..8b7a2ab4263 100644
--- a/addons/base_import_module/i18n/da.po
+++ b/addons/base_import_module/i18n/da.po
@@ -10,12 +10,13 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
 "Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -148,7 +149,7 @@ msgstr "Kun administratorer kan uploade et modul "
 #: code:addons/base_import_module/models/ir_module.py:115
 #, python-format
 msgid "Only zip files are supported."
-msgstr ""
+msgstr "Kun ZIP filer er understøttet."
 
 #. module: base_import_module
 #: model_terms:ir.ui.view,arch_db:base_import_module.view_base_module_import
@@ -169,13 +170,13 @@ msgstr "Status"
 #: code:addons/base_import_module/models/ir_module.py:50
 #, python-format
 msgid "Studio customizations require Studio"
-msgstr ""
+msgstr "Studiotilpasninger kræver Studio"
 
 #. module: base_import_module
 #: code:addons/base_import_module/models/ir_module.py:57
 #, python-format
 msgid "Studio customizations require the Odoo Studio app."
-msgstr ""
+msgstr "Studiotilpasninger kræver Odoo Studio-appen."
 
 #. module: base_import_module
 #: code:addons/base_import_module/models/ir_module.py:52
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 63371e2eb18..37e4a221dd1 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -7,16 +7,17 @@
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +33,10 @@ msgid ""
 "                                                the creation of documents between your companies\n"
 "                                            </span>"
 msgstr ""
+"<i class=\"fa fa-lg fa-building-o\"/>\n"
+"                                            <span class=\"text-muted\">\n"
+"                                                Oprettelse af dokumenter mellem dine virksomheder\n"
+"                                            </span>"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -39,6 +44,8 @@ msgid ""
 "<span class=\"o_form_label\">Document Template</span>\n"
 "                                        <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 msgstr ""
+"<span class=\"o_form_label\">Dokumentskabelon</span>\n"
+"                                        <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -46,6 +53,8 @@ msgid ""
 "<span class=\"o_form_label\">Format</span>\n"
 "                                        <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 msgstr ""
+"<span class=\"o_form_label\">Format</span>\n"
+"                                        <span class=\"fa fa-lg fa-building-o\" title=\"Values set here are company-specific.\" aria-label=\"Values set here are company-specific.\" groups=\"base.group_multi_company\" role=\"img\"/>"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -58,12 +67,12 @@ msgstr ""
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Access Rights"
-msgstr "Adgangs rettigheder"
+msgstr "Adgangsrettigheder"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Add fun feedback and motivate your employees"
-msgstr ""
+msgstr "Tilføj sjov feedback og motiver dine medarbejdere"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_google_calendar
@@ -84,7 +93,7 @@ msgstr "Tillad at arbejde med multi valuta"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_voip
 msgid "Asterisk (VoIP)"
-msgstr ""
+msgstr "Stjerne (VoIP)"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_google_drive
@@ -94,17 +103,17 @@ msgstr "Vedhæft Google dokumenter til en vilkårlig postering"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_partner_autocomplete
 msgid "Auto-populate company data"
-msgstr ""
+msgstr "Auto-udfyld virksomhedsdata"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Autocomplete company data (name, logo, address, etc.)"
-msgstr ""
+msgstr "Auto-udfyld virksomhedsdata (navn, logo, adresse, osv.)"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Business Documents"
-msgstr ""
+msgstr "Forretningsdokumenter"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -117,7 +126,7 @@ msgstr ""
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Change Document Template"
-msgstr "Skift Dokument Skabelon"
+msgstr "Skift dokumentskabelon"
 
 #. module: base_setup
 #: code:addons/base_setup/models/res_config_settings.py:100
@@ -133,12 +142,12 @@ msgstr "Vælg layout for dit dokuments sidehoved og -fod"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_pad
 msgid "Collaborative Pads"
-msgstr ""
+msgstr "Samarbejdende Pads"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Common Contact Book"
-msgstr ""
+msgstr "Generel kontaktbog"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -153,7 +162,7 @@ msgstr "Virksomhed"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -161,16 +170,18 @@ msgid ""
 "Configure company rules to automatically create SO/PO when one of your "
 "company sells/buys to another of your company."
 msgstr ""
+"Konfigurer virksomhedens regler til automatisk at oprette SO / PO, når en af"
+" dine virksomheder sælger / køber til en anden af dine virksomheder."
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Create and attach Google Drive documents to any record"
-msgstr ""
+msgstr "Opret og vedhæft Google Drive-dokumenter til enhver post"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__report_footer
 msgid "Custom Report Footer"
-msgstr "Brugerdefineret Rapport Sidefod"
+msgstr "Brugerdefineret rapport sidefod"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__user_default_rights
@@ -181,7 +192,7 @@ msgstr "Standard Adgangsrettigheder"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__external_report_layout_id
 msgid "Document Template"
-msgstr "Dokument Skabelon"
+msgstr "Dokumentskabelon"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -191,17 +202,17 @@ msgstr "Redigér layout"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__external_email_server_default
 msgid "External Email Servers"
-msgstr "Eksterne Email Servere"
+msgstr "Eksterne e-mailservere"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Extract and analyze Odoo data from Google Spreadsheet"
-msgstr ""
+msgstr "Udtag og analyser Odoo data fra Google Regneark"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Find free high-resolution images from Unsplash"
-msgstr ""
+msgstr "Find gratis billeder i høj opløsning fra Unsplash"
 
 #. module: base_setup
 #: model:ir.model.fields,help:base_setup.field_res_config_settings__report_footer
@@ -242,7 +253,7 @@ msgstr "Google Spreadsheet"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -257,13 +268,13 @@ msgstr "Integrationer"
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Inter Company Flows"
-msgstr ""
+msgstr "Inter Company Flows"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_auth_ldap
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "LDAP Authentication"
-msgstr ""
+msgstr "LDAP godkendelse"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_inter_company_rules
@@ -288,12 +299,12 @@ msgstr "Multi-valuta"
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Multi-companies"
-msgstr ""
+msgstr "Multi-companies"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "OAuth Authentication"
-msgstr ""
+msgstr "OAuth godkendelse"
 
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__paperformat_id
@@ -339,7 +350,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__show_effect
 msgid "Show Effect"
-msgstr ""
+msgstr "Vis effekt"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -364,12 +375,12 @@ msgstr "Oversæt din hjemmeside med Gengo"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_web_unsplash
 msgid "Unsplash Image Library"
-msgstr ""
+msgstr "Unsplash billedebibliotek"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use LDAP credentials to log in"
-msgstr ""
+msgstr "Brug LDAP oplysninger til at logge ind"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -379,12 +390,12 @@ msgstr "Anvend eksterne konti til at logge ind (Google, Facebook etc.)"
 #. module: base_setup
 #: model:ir.model.fields,field_description:base_setup.field_res_config_settings__module_auth_oauth
 msgid "Use external authentication providers (OAuth)"
-msgstr "Brug ekstern authentication providers (OAuth)"
+msgstr "Brug eksterne godkendelses-udbydere (OAuth)"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use external pads in Odoo Notes"
-msgstr ""
+msgstr "Brug eksterne pads i Odoo Notes"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
@@ -398,3 +409,6 @@ msgid ""
 "companies. When selecting one item, the company data and logo are auto-"
 "filled."
 msgstr ""
+"Når du udfylder din adressebog, giver Odoo en liste over matchende "
+"virksomheder. Når du vælger et emne, er virksomhedens data og logo "
+"automatisk fyldt."
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 011593b409f..e73b5d60153 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -374,7 +374,7 @@ msgstr "Unsplash图像库"
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
 msgid "Use LDAP credentials to log in"
-msgstr "使用LDAP凭证登录"
+msgstr "使用LDAP凭据登录"
 
 #. module: base_setup
 #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index f9fff2af534..585ab04225c 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +29,7 @@ msgstr "Virksomheder"
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index e27f5ccf7ce..6a26fa1b2e0 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -9,13 +9,15 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:16+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +33,8 @@ msgid ""
 "\"Add to\n"
 "                Dashboard\""
 msgstr ""
+"\"Tilføj til\n"
+"                dashboard\""
 
 #. module: board
 #. openerp-web
@@ -130,7 +134,7 @@ msgstr "Sidst ændret den"
 #: code:addons/board/static/src/xml/board.xml:41
 #, python-format
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. module: board
 #. openerp-web
@@ -147,7 +151,7 @@ msgstr "Mit dashboard"
 #: code:addons/board/static/src/js/favorite_menu.js:104
 #, python-format
 msgid "Please refresh your browser for the changes to take effect."
-msgstr ""
+msgstr "Opdater venligst din browser for at ændringerne træder i kraft."
 
 #. module: board
 #. openerp-web
@@ -157,6 +161,8 @@ msgid ""
 "To add your first report into this dashboard, go to any\n"
 "                menu, switch to list or graph view, and click"
 msgstr ""
+"For at tilføje din første rapport til dette dashboard, skal du gå til en\n"
+"                menu, skifte til liste eller grafevisning, og klikke"
 
 #. module: board
 #. openerp-web
@@ -166,17 +172,19 @@ msgid ""
 "You can filter and group data before inserting into the\n"
 "                dashboard using the search options."
 msgstr ""
+"Du kan filtrere og gruppere data, før du indsætter i\n"
+"                dashboardet ved hjælp af søgemulighederne."
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:49
 #, python-format
 msgid "Your personal dashboard is empty"
-msgstr ""
+msgstr "Dit personlige dashboard er tomt"
 
 #. module: board
 #. openerp-web
 #: code:addons/board/static/src/xml/board.xml:53
 #, python-format
 msgid "in the extended search options."
-msgstr ""
+msgstr "i de udvidede søgeindstillinger."
diff --git a/addons/board/static/src/js/favorite_menu.js b/addons/board/static/src/js/favorite_menu.js
index cdb531914c9..a3040af44f0 100644
--- a/addons/board/static/src/js/favorite_menu.js
+++ b/addons/board/static/src/js/favorite_menu.js
@@ -56,7 +56,7 @@ FavoriteMenu.include({
         var self = this;
         var search_data = this.searchview.build_search_data();
         var context = new Context(this.searchview.dataset.get_context() || []);
-        var domain = this.searchview.dataset.get_domain() || [];
+        var domain = [];
 
         _.each(search_data.contexts, context.add, context);
         _.each(search_data.domains, function (d) {
diff --git a/addons/board/static/src/scss/dashboard.scss b/addons/board/static/src/scss/dashboard.scss
index 683bdf52eaf..08cd66a09c1 100644
--- a/addons/board/static/src/scss/dashboard.scss
+++ b/addons/board/static/src/scss/dashboard.scss
@@ -112,6 +112,9 @@
                 &.oe_folded {
                     display: none;
                 }
+                .o_view_nocontent {
+                    display: none; // we don't have a create button on the dashboard, so no need to display that
+                }
             }
 
             // Override border of many2manytags defined for form_views
diff --git a/addons/board/static/tests/dashboard_tests.js b/addons/board/static/tests/dashboard_tests.js
index 1803875d33c..2426b1a377b 100644
--- a/addons/board/static/tests/dashboard_tests.js
+++ b/addons/board/static/tests/dashboard_tests.js
@@ -700,6 +700,64 @@ QUnit.test('save actions to dashboard', function (assert) {
     actionManager.destroy();
 });
 
+QUnit.test('save two searches to dashboard', function (assert) {
+    // the second search saved should not be influenced by the first
+    assert.expect(2);
+
+    var actionManager = createActionManager({
+        data: this.data,
+        archs: {
+            'partner,false,list': '<list><field name="foo"/></list>',
+            'partner,false,search': '<search></search>',
+        },
+        mockRPC: function (route, args) {
+            if (route === '/board/add_to_dashboard') {
+                if (filter_count === 0) {
+                    assert.deepEqual(args.domain, [["display_name", "ilike", "a"]],
+                        "the correct domain should be sent");
+                }
+                if (filter_count === 1) {
+                    assert.deepEqual(args.domain, [["display_name", "ilike", "b"]],
+                        "the correct domain should be sent");
+                }
+
+                filter_count += 1;
+                return $.when(true);
+            }
+            return this._super.apply(this, arguments);
+        },
+    });
+
+    actionManager.doAction({
+        id: 1,
+        res_model: 'partner',
+        type: 'ir.actions.act_window',
+        views: [[false, 'list']],
+    });
+
+    var filter_count = 0;
+    // Add a first filter
+    $('span.fa-filter').click();
+    $('.o_add_custom_filter:visible').click();
+    $('.o_searchview_extended_prop_value .o_input').val('a')
+    $('.o_apply_filter').click();
+    // Add it to dashboard
+    $('.o_add_to_dashboard_button').click();
+    // Remove it
+    $('.o_facet_remove').click();
+
+    // Add the second filter
+    $('span.fa-filter').click();
+    $('span.fa-filter').click();
+    $('.o_add_custom_filter:visible').click();
+    $('.o_searchview_extended_prop_value .o_input').val('b')
+    $('.o_apply_filter').click();
+    // Add it to dashboard
+    $('.o_add_to_dashboard_button').click();
+
+    actionManager.destroy();
+});
+
 QUnit.test('save to dashboard actions with flag keepSearchView', function (assert) {
     assert.expect(4);
 
diff --git a/addons/bus/i18n/da.po b/addons/bus/i18n/da.po
index 4d3a243cffe..e010e66d5d4 100644
--- a/addons/bus/i18n/da.po
+++ b/addons/bus/i18n/da.po
@@ -8,13 +8,15 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +42,7 @@ msgstr "Kanal"
 #. module: bus
 #: model:ir.model,name:bus.model_bus_bus
 msgid "Communication Bus"
-msgstr ""
+msgstr "Kommunikations Bus"
 
 #. module: bus
 #: model:ir.model,name:bus.model_res_partner
@@ -90,7 +92,7 @@ msgstr "Seneste meningsmåling"
 #. module: bus
 #: model:ir.model.fields,field_description:bus.field_bus_presence__last_presence
 msgid "Last Presence"
-msgstr "Sidste Tilstedeværelse"
+msgstr "Sidste tilstedeværelse"
 
 #. module: bus
 #: model:ir.model.fields,field_description:bus.field_bus_bus__write_uid
@@ -132,4 +134,4 @@ msgstr "Brugere"
 #: code:addons/bus/controllers/main.py:41
 #, python-format
 msgid "bus.Bus not available in test mode"
-msgstr ""
+msgstr "bus. Bus er ikke tilgængelig i testtilstand"
diff --git a/addons/bus/static/src/js/crosstab_bus.js b/addons/bus/static/src/js/crosstab_bus.js
index df050b91e4c..46643cad0de 100644
--- a/addons/bus/static/src/js/crosstab_bus.js
+++ b/addons/bus/static/src/js/crosstab_bus.js
@@ -105,7 +105,7 @@ var CrossTabBus = Longpolling.extend({
 
             $(window).on('unload.' + this._id, this._onUnload.bind(this));
 
-            if (!this._callLocalStorage('getItem', 'peers')) {
+            if (!this._callLocalStorage('getItem', 'master')) {
                 this._startElection();
             }
 
@@ -252,6 +252,7 @@ var CrossTabBus = Longpolling.extend({
             //we're next in queue. Electing as master
             this.lastHeartbeat = now;
             this._callLocalStorage('setItem', 'heartbeat', this.lastHeartbeat);
+            this._callLocalStorage('setItem', 'master', true);
             this._isMasterTab = true;
             this.startPolling();
             this.trigger('become_master');
@@ -297,7 +298,7 @@ var CrossTabBus = Longpolling.extend({
         var value = JSON.parse(e.newValue);
         var key = e.key;
 
-        if (this._isRegistered && key === this._generateKey('peers') && !value) {
+        if (this._isRegistered && key === this._generateKey('master') && !value) {
             //master was unloaded
             this._startElection();
         }
@@ -341,7 +342,7 @@ var CrossTabBus = Longpolling.extend({
 
         // unload master
         if (this._isMasterTab) {
-            this._callLocalStorage('removeItem', 'peers');
+            this._callLocalStorage('removeItem', 'master');
         }
     },
 });
diff --git a/addons/bus/static/tests/bus_tests.js b/addons/bus/static/tests/bus_tests.js
index 3c81398c09a..c8c7eab2bd9 100644
--- a/addons/bus/static/tests/bus_tests.js
+++ b/addons/bus/static/tests/bus_tests.js
@@ -214,4 +214,106 @@ QUnit.module('Bus', {
 
         }, 3);
     });
+
+    QUnit.test('cross tab bus elect new master on master unload', function (assert) {
+        var done = assert.async();
+        assert.expect(8);
+
+        // master
+        var pollDeferredMaster = $.Deferred();
+
+        var parentMaster = new Widget();
+        testUtils.addMockEnvironment(parentMaster, {
+            data: {},
+            services: {
+                bus_service: BusService,
+                local_storage: LocalStorageServiceMock,
+            },
+            mockRPC: function (route, args) {
+                if (route === '/longpolling/poll') {
+                    assert.step(['master', route, args.channels.join(',')]);
+
+                    pollDeferredMaster = $.Deferred();
+                    pollDeferredMaster.abort = (function () {
+                        this.reject({message: "XmlHttpRequestError abort"}, $.Event());
+                    }).bind(pollDeferredMaster);
+                    return pollDeferredMaster;
+                }
+                return this._super.apply(this, arguments);
+            }
+        });
+
+        var master = new Widget(parentMaster);
+        master.appendTo($('#qunit-fixture'));
+
+        master.call('bus_service', 'onNotification', master, function (notifications) {
+            assert.step(['master', 'notification', notifications]);
+        });
+        master.call('bus_service', 'addChannel', 'lambda');
+
+        // slave
+        setTimeout(function () {
+            var parentSlave = new Widget();
+            var pollDeferredSlave = $.Deferred();
+            testUtils.addMockEnvironment(parentSlave, {
+                data: {},
+                services: {
+                    bus_service: BusService,
+                    local_storage: LocalStorageServiceMock,
+                },
+                mockRPC: function (route, args) {
+                    if (route === '/longpolling/poll') {
+                        assert.step(['slave', route, args.channels.join(',')]);
+
+                        pollDeferredSlave = $.Deferred();
+                        pollDeferredSlave.abort = (function () {
+                            this.reject({message: "XmlHttpRequestError abort"}, $.Event());
+                        }).bind(pollDeferredSlave);
+                        return pollDeferredSlave;
+                    }
+                    return this._super.apply(this, arguments);
+                }
+            });
+
+            var slave = new Widget(parentSlave);
+            slave.appendTo($('#qunit-fixture'));
+
+            slave.call('bus_service', 'onNotification', slave, function (notifications) {
+                assert.step(['slave', 'notification', notifications]);
+            });
+            slave.call('bus_service', 'addChannel', 'lambda');
+
+            pollDeferredMaster.resolve([{
+                id: 1,
+                channel: 'lambda',
+                message: 'beta',
+            }]);
+
+            // simulate unloading master
+            master.call('bus_service', '_onUnload');
+
+            pollDeferredSlave.resolve([{
+                id: 2,
+                channel: 'lambda',
+                message: 'gamma',
+            }]);
+
+            assert.verifySteps([
+                ["master", "/longpolling/poll", "lambda"],
+                ["master", "notification", [["lambda", "beta"]]],
+                ["slave", "notification", [["lambda", "beta"]]],
+                ["master", "/longpolling/poll", "lambda"],
+                ["slave", "/longpolling/poll", "lambda"],
+                ["slave", "notification", [["lambda", "gamma"]]],
+                ["slave", "/longpolling/poll", "lambda"],
+            ]);
+
+            parentMaster.destroy();
+            parentSlave.destroy();
+
+            done();
+
+        }, 3);
+    });
+
 });});
diff --git a/addons/calendar/i18n/da.po b/addons/calendar/i18n/da.po
index 09321235ac1..177ff806fb1 100644
--- a/addons/calendar/i18n/da.po
+++ b/addons/calendar/i18n/da.po
@@ -10,8 +10,8 @@
 # Martin Trigaux, 2018
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
 "PO-Revision-Date: 2018-08-24 09:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "${object.event_id.name} - Påmindelse"
 #. module: calendar
 #: model:mail.template,subject:calendar.calendar_template_meeting_changedate
 msgid "${object.event_id.name}: Date updated"
-msgstr "${object.event_id.name}: Dato opdateret"
+msgstr "${object.event_id.name}: Opdateret den"
 
 #. module: calendar
 #: code:addons/calendar/models/calendar.py:741
@@ -73,7 +73,7 @@ msgstr "1 dag(e)"
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_3
 msgid "1 Hour(s)"
-msgstr "1 Time(r)"
+msgstr "1 time(r)"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_1
@@ -88,7 +88,7 @@ msgstr "2 time(r)"
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_mail_1
 msgid "3 Hour(s), by e-mail"
-msgstr "3 time(r), pr. email"
+msgstr "3 time(r), via e-mail"
 
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_notif_2
@@ -98,7 +98,7 @@ msgstr "30 minut(ter)"
 #. module: calendar
 #: model:calendar.alarm,name:calendar.alarm_mail_2
 msgid "6 Hour(s), by e-mail"
-msgstr "6 time(r), pr. email"
+msgstr "6 time(r), via e-mail"
 
 #. module: calendar
 #: model:mail.template,body_html:calendar.calendar_template_meeting_invitation
@@ -379,7 +379,7 @@ msgstr "Hele dagen, %s"
 #. module: calendar
 #: sql_constraint:calendar.contacts:0
 msgid "An user cannot have twice the same contact."
-msgstr ""
+msgstr "En bruger kan ikke have samme kontakt"
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_ir_attachment
@@ -439,39 +439,39 @@ msgstr "Kalender"
 #: model_terms:ir.ui.view,arch_db:calendar.calendar_alarm_view_form
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_alarm_tree
 msgid "Calendar Alarm"
-msgstr "Kalender alarm"
+msgstr "Kalendernotifikation"
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_attendee
 msgid "Calendar Attendee Information"
-msgstr ""
+msgstr "Oplysninger på kalenderdeltagere "
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_contacts
 msgid "Calendar Contacts"
-msgstr ""
+msgstr "Kalenderkontakter"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.invitation_page_anonymous
 msgid "Calendar Invitation"
-msgstr "Kalender Invitation"
+msgstr "Kalenderinvitation"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_mail_activity__calendar_event_id
 msgid "Calendar Meeting"
-msgstr ""
+msgstr "Kalendermøder"
 
 #. module: calendar
 #: model:ir.actions.server,name:calendar.ir_cron_scheduler_alarm_ir_actions_server
 #: model:ir.cron,cron_name:calendar.ir_cron_scheduler_alarm
 #: model:ir.cron,name:calendar.ir_cron_scheduler_alarm
 msgid "Calendar: Event Reminder"
-msgstr ""
+msgstr "Kalender: Arrangements påmindelse"
 
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
-msgstr ""
+msgstr "Kategorier kan udløse specifikke opgaver som at åbne kalendervisning"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_mail_activity_type__category
@@ -619,7 +619,7 @@ msgstr "E-mail"
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_calendar_attendee__email
 msgid "Email of Invited Person"
-msgstr "Email af indbudte"
+msgstr "E-mail til inviteret person"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_contacts__partner_id
@@ -650,22 +650,22 @@ msgstr "Slutter den"
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_event
 msgid "Event"
-msgstr "Begivenhed"
+msgstr "Arrangement"
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_alarm
 msgid "Event Alarm"
-msgstr ""
+msgstr "Arrangements notifikation"
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_alarm_manager
 msgid "Event Alarm Manager"
-msgstr ""
+msgstr "Arrangements notifikations ansvarlig"
 
 #. module: calendar
 #: model:ir.model,name:calendar.model_calendar_event_type
 msgid "Event Meeting Type"
-msgstr ""
+msgstr "Arrangements mødetype"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__display_time
@@ -761,7 +761,7 @@ msgstr ""
 #. module: calendar
 #: model:ir.model,name:calendar.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: calendar
 #: selection:calendar.alarm,interval:0
@@ -810,7 +810,7 @@ msgstr "Invitation"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_attendee__access_token
 msgid "Invitation Token"
-msgstr "Invitation signal"
+msgstr "Invitations token"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -825,7 +825,7 @@ msgstr "Invitation til"
 #. module: calendar
 #: model:mail.template,subject:calendar.calendar_template_meeting_invitation
 msgid "Invitation to ${object.event_id.name}"
-msgstr ""
+msgstr "Invitation til ${object.event_id.name}"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -835,17 +835,17 @@ msgstr "Invitationer"
 #. module: calendar
 #: model:ir.model,name:calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr "Inviter wizard"
+msgstr "Guide"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__is_highlighted
 msgid "Is the Event Highlighted"
-msgstr ""
+msgstr "Er arrangementet fremhævet?"
 
 #. module: calendar
 #: selection:calendar.event,byday:0
@@ -895,12 +895,12 @@ msgstr "Lad begivenheden automatisk at gentage sig på dette interval"
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__location
 #: model_terms:ir.ui.view,arch_db:calendar.invitation_page_anonymous
 msgid "Location"
-msgstr "Lokation"
+msgstr "Adresse"
 
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_calendar_event__location
 msgid "Location of Event"
-msgstr "Lokation på begivenheden"
+msgstr "Adresse på arrangementet"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.invitation_page_anonymous
@@ -910,7 +910,7 @@ msgstr "Logo"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_main_attachment_id
 msgid "Main Attachment"
-msgstr "Primær vedhæftning"
+msgstr "Vedhæftning"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_contacts__user_id
@@ -928,7 +928,7 @@ msgstr "Møde"
 #: code:addons/calendar/models/calendar.py:947
 #, python-format
 msgid "Meeting '%s' starts '%s' and ends '%s'"
-msgstr ""
+msgstr "Mødet '%s' starter '%s' og slutter '%s'"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -970,7 +970,7 @@ msgstr "Besked"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_has_error
 msgid "Message Delivery error"
-msgstr "Besked leveringsfejl"
+msgstr "Leveringsfejl af besked"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_ids
@@ -1017,7 +1017,7 @@ msgstr "Navn"
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,attendee_status:0
 msgid "Needs Action"
-msgstr "Behøver handling"
+msgstr "Kræver handling"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.invitation_page_anonymous
@@ -1032,7 +1032,7 @@ msgstr "Påmindelse"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_needaction_counter
 msgid "Number of Actions"
-msgstr "Antal aktioner"
+msgstr "Antal handlinger"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_has_error_counter
@@ -1079,7 +1079,7 @@ msgstr "Kun mig"
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.mail_activity_view_form_popup
 msgid "Open Calendar"
-msgstr ""
+msgstr "Åben kalender"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__month_by
@@ -1089,12 +1089,12 @@ msgstr "Valgmulighed"
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
 msgid "Options"
-msgstr "Muligheder"
+msgstr "Valgmuligheder"
 
 #. module: calendar
 #: selection:mail.activity.type,category:0
 msgid "Other"
-msgstr "Anden"
+msgstr "Andet"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__user_id
@@ -1110,7 +1110,7 @@ msgstr "Deltager"
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_calendar_event__partner_id
 msgid "Partner-related data of the user"
-msgstr ""
+msgstr "Partner-relaterede data fra brugeren"
 
 #. module: calendar
 #: code:addons/calendar/models/calendar.py:1247
@@ -1127,12 +1127,12 @@ msgstr "Adgang"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__rrule_type
 msgid "Recurrence"
-msgstr "Tilbagevenden"
+msgstr "Gentagne"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__end_type
 msgid "Recurrence Termination"
-msgstr "Gentagelse Opsigelse"
+msgstr "Gentagne afslutning"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__recurrency
@@ -1152,22 +1152,22 @@ msgstr "Gentagelses id dato"
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_calendar_event__recurrency
 msgid "Recurrent Meeting"
-msgstr "Møde Gentagelse"
+msgstr "Mødegentagelse"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__rrule
 msgid "Recurrent Rule"
-msgstr "Gentagelses regel"
+msgstr "Gentagelsesregel"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_alarm__duration
 msgid "Remind Before"
-msgstr "Påmind Før"
+msgstr "Påmind før"
 
 #. module: calendar
 #: selection:mail.activity.type,category:0
 msgid "Reminder"
-msgstr ""
+msgstr "Påmindelse"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__alarm_ids
@@ -1197,7 +1197,7 @@ msgstr "Gentag hver (dage / uge / måned / år)"
 #. module: calendar
 #: model:ir.model.fields,help:calendar.field_calendar_event__count
 msgid "Repeat x times"
-msgstr "Gental antal gange"
+msgstr "Gentag antal gange"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__partner_id
@@ -1208,7 +1208,7 @@ msgstr "Ansvarlig"
 #. module: calendar
 #: selection:calendar.alarm,type:0
 msgid "SMS Text Message"
-msgstr "SMS Besked"
+msgstr "SMS besked"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__sa
@@ -1223,7 +1223,7 @@ msgstr "Lørdag"
 #. module: calendar
 #: model_terms:ir.actions.act_window,help:calendar.action_calendar_event
 msgid "Schedule a new meeting"
-msgstr ""
+msgstr "Planlæg et nyt møde"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_search
@@ -1357,6 +1357,9 @@ msgid ""
 "            other applications such as the employee leaves or the business\n"
 "            opportunities."
 msgstr ""
+"Kalenderen er delt mellem medarbejdere og er fuldt integreret med\n"
+"            andre programmer som medarbejderferie eller virksomhedens\n"
+"            salgsmuligheder."
 
 #. module: calendar
 #: code:addons/calendar/models/calendar.py:941
@@ -1364,12 +1367,14 @@ msgstr ""
 msgid ""
 "The ending date and time cannot be earlier than the starting date and time."
 msgstr ""
+"Slutdatoen og klokkeslættet kan ikke være tidligere end startdato og "
+"klokkeslæt."
 
 #. module: calendar
 #: code:addons/calendar/models/calendar.py:946
 #, python-format
 msgid "The ending date cannot be earlier than the starting date."
-msgstr ""
+msgstr "Slutdatoen kan ikke være tidligere end startdatoen."
 
 #. module: calendar
 #: selection:calendar.event,byday:0
@@ -1395,7 +1400,7 @@ msgstr "Torsdag"
 #: code:addons/calendar/models/res_users.py:41
 #, python-format
 msgid "Today's Meetings"
-msgstr ""
+msgstr "Dagens møder"
 
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__tu
@@ -1437,7 +1442,7 @@ msgstr "Ulæste beskeder"
 #. module: calendar
 #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_unread_counter
 msgid "Unread Messages Counter"
-msgstr "Ulæste besked tæller"
+msgstr "Antal ulæste beskeder"
 
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
@@ -1493,7 +1498,7 @@ msgstr "Du kan ikke kopirere mødedeltagere."
 #. module: calendar
 #: model_terms:ir.ui.view,arch_db:calendar.view_calendar_event_form
 msgid "e.g. Business Lunch"
-msgstr "f.eks. forretnings middag"
+msgstr "f.eks. forretningsmiddag"
 
 #. module: calendar
 #: code:addons/calendar/models/calendar.py:1232
diff --git a/addons/calendar_sms/i18n/da.po b/addons/calendar_sms/i18n/da.po
index f58fecc5afe..159ddaeb2d1 100644
--- a/addons/calendar_sms/i18n/da.po
+++ b/addons/calendar_sms/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,17 +29,17 @@ msgstr "E-mail"
 #. module: calendar_sms
 #: model:ir.model,name:calendar_sms.model_calendar_event
 msgid "Event"
-msgstr "Begivenhed"
+msgstr "Arrangement"
 
 #. module: calendar_sms
 #: model:ir.model,name:calendar_sms.model_calendar_alarm
 msgid "Event Alarm"
-msgstr ""
+msgstr "Arrangements notifikation"
 
 #. module: calendar_sms
 #: model:ir.model,name:calendar_sms.model_calendar_alarm_manager
 msgid "Event Alarm Manager"
-msgstr ""
+msgstr "Arrangements notifikationsansvarlig"
 
 #. module: calendar_sms
 #: code:addons/calendar_sms/models/calendar.py:23
diff --git a/addons/contacts/i18n/da.po b/addons/contacts/i18n/da.po
index a07f23773e9..dd633a97a29 100644
--- a/addons/contacts/i18n/da.po
+++ b/addons/contacts/i18n/da.po
@@ -6,13 +6,15 @@
 # Martin Trigaux, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +46,7 @@ msgstr "Kontakt tags"
 #. module: contacts
 #: model:ir.ui.menu,name:contacts.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr "Kontakt titler"
+msgstr "Kontakt overskrifter"
 
 #. module: contacts
 #: model:ir.actions.act_window,name:contacts.action_contacts
@@ -68,7 +70,7 @@ msgstr "Landegruppe"
 #: model_terms:ir.actions.act_window,help:contacts.action_contacts
 #: model_terms:ir.actions.act_window,help:contacts.action_contacts_summary
 msgid "Create a contact in your address book"
-msgstr ""
+msgstr "Opret en kontakt i din adressebog"
 
 #. module: contacts
 #: model:ir.ui.menu,name:contacts.menu_country_state_partner
@@ -85,6 +87,7 @@ msgstr "Lokalisering"
 #: model_terms:ir.actions.act_window,help:contacts.action_contacts_summary
 msgid "Odoo helps you to easily track all activities related to a customer."
 msgstr ""
+"Odoo hjælper dig med at spore alle aktiviteter relateret til en kunde."
 
 #. module: contacts
 #: model:ir.ui.menu,name:contacts.res_partner_industry_menu
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index 1ea5b627613..c47a668fed8 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -9,9 +9,9 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr "# Møder"
 #. module: crm
 #: model_terms:digest.tip,tip_description:crm.digest_tip_crm_0
 msgid "% endif"
-msgstr ""
+msgstr "% endif"
 
 #. module: crm
 #: model_terms:digest.tip,tip_description:crm.digest_tip_crm_0
@@ -45,6 +45,9 @@ msgid ""
 "    % if email\n"
 "    <strong style=\"font-size: 16px;\">Try the mail gateway</strong>"
 msgstr ""
+"% set email = object.env['crm.team'].search([('alias_name','!=', False)],limit=1).alias_id.display_name\n"
+"    % if email\n"
+"    <strong style=\"font-size: 16px;\">Prøv mail gateway</strong>"
 
 #. module: crm
 #. openerp-web
@@ -54,6 +57,8 @@ msgid ""
 "<b>Choose a name</b> for your opportunity, example: <i>'Need a new "
 "website'</i>"
 msgstr ""
+"<b>Vælg et navn</b> på din salgsmulighed, f. eks.: <i>'Ønsker en ny "
+"hjemmeside'</i>"
 
 #. module: crm
 #. openerp-web
@@ -84,6 +89,10 @@ msgid ""
 "    as a member of one of the Sales Team.\n"
 "</p>"
 msgstr ""
+"<p class='o_view_nocontent_smiling_face'>Tilføj nye salgsmuligheder</p><p>\n"
+"    Det ser ud som om du ikke er tilknyttet en salgsgruppe. Du skal tilføje dig selv\n"
+"    som medlem af et af salgsgrupperne.\n"
+"</p>"
 
 #. module: crm
 #. openerp-web
@@ -94,9 +103,10 @@ msgid ""
 "attached to this opportunity.</p><p class=\"mb0\">Type <i>'@'</i> to mention"
 " people - it's like cc-ing on emails.</p>"
 msgstr ""
-"<p><b>Send beskeder</b> til dine muligheder og modtag svar der automatisk "
-"vedhæftes denne salgsmulighed.</p><p class=\"mb0\">Tast <i>'@'</i> for at "
-"stile direkte til folk - virker som cc/ på e-mails.</p>"
+"<p><b>Send beskeder</b> til dine salgsmuligheder og modtag svar der "
+"automatisk vedhæftes denne salgsmulighed.</p><p class=\"mb0\">Tast "
+"<i>'@'</i> for at sende besked direkte til en person - virker som cc/ på "
+"e-mails.</p>"
 
 #. module: crm
 #. openerp-web
@@ -108,6 +118,10 @@ msgid ""
 "after</li><li>second call 3 days after, ...</li></ol><p "
 "class='mb0'><i>Select a standard activity for now.</i></p>"
 msgstr ""
+"<p>Du vil kunne tilpasse dine opfølgningsaktiviteter. "
+"F.eks.:</p><ol><li>Introduktions e-mail</li><li>Ring 10 dage "
+"efter</li><li>Andet kald 3 dage efter, ...</li></ol><p class='mb0'><i>Vælg "
+"en standard aktivitet for nu.</i></p>"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -164,7 +178,7 @@ msgstr "Mål for udførte aktiviteter"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Activities Todo"
-msgstr ""
+msgstr "Aktiviteter der mangler"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__activity_state
@@ -185,7 +199,7 @@ msgstr "Aktivitetstyper"
 #: code:addons/crm/models/crm_lead.py:933
 #, python-format
 msgid "Add a new lead"
-msgstr ""
+msgstr "Tilføj nyt kundeemne"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -232,7 +246,7 @@ msgstr "Tildel denne salgsmulighed til"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__date_open
 msgid "Assignation Date"
-msgstr "Tilknytnings dato"
+msgstr "Tildelingsdato"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__message_attachment_count
@@ -247,7 +261,7 @@ msgstr "Gennemsnitlig sandsynlighed"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__is_blacklisted
 msgid "Blacklist"
-msgstr ""
+msgstr "Blacklist"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:400
@@ -258,7 +272,7 @@ msgstr "Boom! Team rekord for de sidste 30 dage."
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__message_bounce
 msgid "Bounce"
-msgstr "Spring"
+msgstr "Afvisning"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.crm_menu_root
@@ -275,7 +289,7 @@ msgstr "CRM aktivitetsanalyse"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_stage
 msgid "CRM Stages"
-msgstr ""
+msgstr "CRM faser"
 
 #. module: crm
 #: model:mail.activity.type,name:crm.mail_activity_demo_call_demo
@@ -300,7 +314,7 @@ msgstr "Annuller"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_team_act_tree
 msgid "Cases by Sales Team"
-msgstr "Sager efter salgs teams"
+msgstr "Sager efter salgsteams"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_stage__on_change
@@ -322,7 +336,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_team__use_opportunities
 msgid "Check this box to manage a presales process with opportunities."
-msgstr ""
+msgstr "Marker denne boks for at styre en salgsproces med salgsmuligheder."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__city
@@ -348,7 +362,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:32
 #, python-format
 msgid "Click here to <b>add your opportunity</b>."
-msgstr ""
+msgstr "Klik her for at <b>tilføje din salgsmulighed</b>."
 
 #. module: crm
 #. openerp-web
@@ -366,7 +380,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:60
 #, python-format
 msgid "Click on the opportunity to zoom in."
-msgstr ""
+msgstr "Klik på salgsmuligheden for at zoome ind."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__date_closed
@@ -406,7 +420,7 @@ msgstr "Virksomhedsnavn"
 #. module: crm
 #: model:ir.model,name:crm.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.crm_menu_config
@@ -473,12 +487,12 @@ msgstr "Konverteringsmuligheder"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Convert Lead to Opportunity (in mass)"
-msgstr ""
+msgstr "Konverter kundeemne til salgsmulighed (i en masse)"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Convert Lead to Opportunity (not in mass)"
-msgstr ""
+msgstr "Konverter kundeemne til salgsmulighed (ikke i en masse)"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner_mass
@@ -538,12 +552,12 @@ msgstr "Opret"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
 msgid "Create & Edit"
-msgstr "Opret & Redigér"
+msgstr "Opret & redigér"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_config_settings__module_crm_reveal
 msgid "Create Leads/Opportunities from your website's traffic"
-msgstr ""
+msgstr "Opret kundeemner / salgsmuligheder fra din hjemmeside"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_lead2opportunity_partner
@@ -560,12 +574,12 @@ msgstr "Opret ny kunde"
 #: model_terms:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_lead
 #: model_terms:ir.actions.act_window,help:crm.crm_case_form_view_salesteams_opportunity
 msgid "Create a new lead"
-msgstr ""
+msgstr "Opret nyt kundeemne"
 
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_lead_tag_action
 msgid "Create a new tag for your opportunities"
-msgstr ""
+msgstr "Opret et nyt tag for dine salgsmuligheder"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.create_opportunity_simplified
@@ -576,13 +590,13 @@ msgstr "Opret en salgsmulighed"
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.relate_partner_opportunities
 msgid "Create an new opportunity related to this customer"
-msgstr ""
+msgstr "Opret en ny salgsmulighed relateret til denne kunde"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:935
 #, python-format
 msgid "Create an opportunity in your pipeline"
-msgstr ""
+msgstr "Opret en salgsmulighed i din pipeline"
 
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_lead_tag_action
@@ -628,7 +642,7 @@ msgstr "Oprettet den"
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Creation Date"
-msgstr "Oprettelses dato"
+msgstr "Oprettelsesdato"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_your_pipeline
@@ -682,7 +696,7 @@ msgstr "Dato"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_opportunity_report_view_search
 msgid "Date Closed"
-msgstr ""
+msgstr "Lukket dato"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__day_open
@@ -702,7 +716,7 @@ msgstr "Standard alias navn for leads"
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_lost_reason_action
 msgid "Define a new lost reason"
-msgstr ""
+msgstr "Definer en ny årsag for en tabt salgsmulighed"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
@@ -722,7 +736,7 @@ msgstr "Design"
 #. module: crm
 #: model:ir.model,name:crm.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_create_opportunity_simplified
@@ -748,6 +762,7 @@ msgstr "Vis navn"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -759,7 +774,7 @@ msgstr "Link ikke til en kunde"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads
@@ -789,6 +804,8 @@ msgid ""
 "Email sent to <strong>${email}</strong> generate opportunities in your "
 "pipeline.<br>"
 msgstr ""
+"E-mails der sendes til <strong>${email}</strong> generere en salgsmulighed i"
+" din pipeline."
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -834,12 +851,12 @@ msgstr "Forventet slutdato"
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Day"
-msgstr "Dag for Forventet Lukning"
+msgstr "Dag for forventet lukning"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
 msgid "Expected Closing Month"
-msgstr "Måned for Forventet Lukning"
+msgstr "Måned for forventet lukning"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_group_pipeline:0
@@ -859,7 +876,7 @@ msgstr "Forventede omsætninger"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team__dashboard_graph_period_pipeline
 msgid "Expected to Close"
-msgstr "Forventet at Lukke"
+msgstr "Forventer at lukke ordren"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage__legend_priority
@@ -908,7 +925,7 @@ msgstr "Følgere (partnere)"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 msgid "Followup"
-msgstr ""
+msgstr "Opfølgning"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__force_assignation
@@ -937,6 +954,8 @@ msgid ""
 "Generate leads from incoming emails and assign them\n"
 "                                    to a Sales Team manually"
 msgstr ""
+"Generer slagsmuligheder fra indgående e-mails og tildele dem\n"
+"                                    manuelt til et salgsteam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_lost
@@ -947,6 +966,7 @@ msgstr "Få tabsårsag"
 #: model_terms:ir.ui.view,arch_db:crm.crm_stage_form
 msgid "Give your team the requirements to move an opportunity to this stage."
 msgstr ""
+"Giv dit team beføjelser til, at flytte en salgsmulighed til denne fase."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__email_cc
@@ -978,7 +998,7 @@ msgstr "Sortér efter"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team__dashboard_graph_group_pipeline
 msgid "Grouping Method"
-msgstr ""
+msgstr "Grupperingsmetode"
 
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_lead_action_activities
@@ -1042,6 +1062,8 @@ msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
 msgstr ""
+"Hvis e-mailadressen er blacklisted, vil kontakten ikke længere modtage "
+"masseudskrifter fra enhver liste"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead2opportunity_partner_mass__force_assignation
@@ -1072,7 +1094,7 @@ msgstr "Information"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 msgid "Initial Contact Information"
-msgstr ""
+msgstr "Kontaktoplysninger"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
@@ -1088,7 +1110,7 @@ msgstr "Fakturaer"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__function
@@ -1132,7 +1154,7 @@ msgstr "Sidst ændret den"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__date_last_stage_update
 msgid "Last Stage Update"
-msgstr "Sidste fase opdatering"
+msgstr "Sidste faseopdatering"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner__write_uid
@@ -1179,7 +1201,7 @@ msgstr "Emne"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_tag
 msgid "Lead Tag"
-msgstr ""
+msgstr "Tag på kundeemne"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_lead_tag_form
@@ -1260,14 +1282,14 @@ msgstr "Kundeemner med duplikater (til information)"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_merge_opportunity__opportunity_ids
 msgid "Leads/Opportunities"
-msgstr "Kundeemner / Salgsmuligheder"
+msgstr "Kundeemner / salgsmuligheder"
 
 #. module: crm
 #. openerp-web
 #: code:addons/crm/static/src/js/tour.js:47
 #, python-format
 msgid "Let's schedule an activity."
-msgstr ""
+msgstr "Lad os planlægge en aktivitet."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -1338,12 +1360,12 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.server,name:crm.action_mark_activities_done
 msgid "Mark All Activities as Done"
-msgstr ""
+msgstr "Mærk alle aktiviteter som udført"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_mark_late_activities_done
 msgid "Mark Late Activities as Done"
-msgstr ""
+msgstr "Mærk seneste aktiviteter som udført"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
@@ -1358,7 +1380,7 @@ msgstr "Mærk som vundet"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 msgid "Mark as Lost"
-msgstr ""
+msgstr "Mærk som tabt"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_mark_as_lost
@@ -1407,7 +1429,7 @@ msgstr "Flet kundemener/salgsmuligheder"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Sammenlæg salgsmuligheder"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
@@ -1472,7 +1494,7 @@ msgstr "Mobil"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_activity_report_view_search
 msgid "My Activities"
-msgstr "Mine Aktiviteter"
+msgstr "Mine aktiviteter"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_leads_filter
@@ -1504,7 +1526,7 @@ msgstr "Ny"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_lead_created
 msgid "New Leads/Opportunities"
-msgstr ""
+msgstr "Nyt kundeemne / Salgsmulighed"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_opportunity_form
@@ -1530,7 +1552,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: crm
 #: selection:crm.lead,kanban_state:0
@@ -1551,7 +1573,7 @@ msgstr "Intet emne"
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_lead_action_activities
 msgid "No next activity"
-msgstr ""
+msgstr "Ingen næste aktivitet"
 
 #. module: crm
 #: selection:crm.lead,kanban_state:0
@@ -1576,7 +1598,7 @@ msgstr "Noter"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__message_needaction_counter
 msgid "Number of Actions"
-msgstr "Antal aktioner"
+msgstr "Antal handlinger"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__message_has_error_counter
@@ -1615,17 +1637,17 @@ msgstr ""
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Open Opportunities"
-msgstr "Åbne Salgsmuligheder"
+msgstr "Åbne salgsmuligheder"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Open Opportunity"
-msgstr "Åben Salgsmulighed"
+msgstr "Åben salgsmulighed"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lost_reason
 msgid "Opp. Lost Reason"
-msgstr ""
+msgstr "Årsag for tabt salgsmulighed"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_form_view_salesteams_opportunity
@@ -1664,12 +1686,12 @@ msgstr ""
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team__opportunities_amount
 msgid "Opportunities Revenues"
-msgstr ""
+msgstr "Indtægter på salgsmuligheder"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_digest_digest__kpi_crm_opportunities_won
 msgid "Opportunities Won"
-msgstr ""
+msgstr "Vundne salgsmuligheder"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
@@ -1680,6 +1702,7 @@ msgstr "Mine salgsmuligheder"
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Opportunities with a date of Expected Closing which is in the past"
 msgstr ""
+"Salgsmuligheder med en dato for forventet afslutning der er overskrevet"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:446
@@ -1700,7 +1723,7 @@ msgstr "Salgsmuligheder"
 #: model:mail.message.subtype,name:crm.mt_lead_create
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead
 msgid "Opportunity Created"
-msgstr ""
+msgstr "Oprettet salgsmulighed"
 
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_lost
@@ -1727,7 +1750,7 @@ msgstr "Vundet salgsmulighed "
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Oprettet salgsmulighed"
 
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
@@ -1757,22 +1780,22 @@ msgstr "Forfaldne salgsmuligheder"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__partner_address_email
 msgid "Partner Contact Email"
-msgstr "Partner kontakt e-mail"
+msgstr "Kontakt e-mail"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__partner_address_name
 msgid "Partner Contact Name"
-msgstr "Partner kontakt navn"
+msgstr "Kontakt navn"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__partner_address_phone
 msgid "Partner Contact Phone"
-msgstr ""
+msgstr "Kontakt telefon"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__partner_is_blacklisted
 msgid "Partner is blacklisted"
-msgstr ""
+msgstr "Kunde er blacklisted"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner_binding
@@ -1894,7 +1917,7 @@ msgstr "Forslag/tilbud"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__expected_revenue
 msgid "Prorated Revenue"
-msgstr ""
+msgstr "Forholdsmæssig indtjening"
 
 #. module: crm
 #: model:crm.stage,name:crm.stage_lead2
@@ -1910,6 +1933,8 @@ msgid ""
 "Ready to boost your sales? Your <b>Pipeline</b> can be found here, under the"
 " <b>CRM</b> app."
 msgstr ""
+"Klar til at øge dit salg? Din <b>pipeline</b> kan findes herunder <b>CRM</b>"
+" app."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__referred
@@ -1979,7 +2004,7 @@ msgstr "Salgs team"
 #: code:addons/crm/models/crm_lead.py:1125
 #, python-format
 msgid "Sales Team Settings"
-msgstr ""
+msgstr "Opsætning af salgsteam"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.crm_team_config
@@ -2013,7 +2038,7 @@ msgstr "Søg kundeemner"
 #: model_terms:ir.ui.view,arch_db:crm.crm_lost_reason_view_search
 #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter
 msgid "Search Opportunities"
-msgstr "Søg kval. emner"
+msgstr "Søg efter salgsmuligheder"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.merge_opportunity_form
@@ -2023,7 +2048,7 @@ msgstr "Vælg kundemener/salgsmuligheder"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_lead_mass_mail
 msgid "Send an email"
-msgstr ""
+msgstr "Send en e-mail"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_stage__sequence
@@ -2038,7 +2063,7 @@ msgstr "Serviceydelser"
 #. module: crm
 #: model_terms:ir.actions.act_window,help:crm.crm_stage_action
 msgid "Set a new stage in your opportunity pipeline"
-msgstr ""
+msgstr "Opret en ny fase i din pipeline"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage__on_change
@@ -2169,6 +2194,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__street
@@ -2228,7 +2257,7 @@ msgstr "Tags"
 #. module: crm
 #: model:ir.ui.menu,name:crm.sales_team_menu_team_pipeline
 msgid "Team Pipelines"
-msgstr ""
+msgstr "Team pipeline"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_team__alias_id
@@ -2284,6 +2313,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Dette er et navn, der hjælper dig med at holde styr på dine forskellige "
+"kampagneindsatser"
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_lead__medium_id
@@ -2304,7 +2335,7 @@ msgstr ""
 #: code:addons/crm/static/src/js/tour.js:42
 #, python-format
 msgid "This opportunity has <b>no activity planned</b>."
-msgstr ""
+msgstr "Denne salgsmulighed <b>har ikke planlagt nogen aktiviteter</b>."
 
 #. module: crm
 #: model:ir.model.fields,help:crm.field_crm_stage__probability
@@ -2339,7 +2370,7 @@ msgstr "Dette mål eksisterer ikke."
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 msgid "Title"
-msgstr "Titel"
+msgstr "Overskrift"
 
 #. module: crm
 #: selection:crm.lead,activity_state:0
@@ -2369,7 +2400,7 @@ msgstr "Træning"
 #. module: crm
 #: model_terms:digest.tip,tip_description:crm.digest_tip_crm_0
 msgid "Try Now"
-msgstr ""
+msgstr "Prøv nu"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_activity_report__lead_type
@@ -2391,13 +2422,13 @@ msgstr "Ikke tildelt"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Unassigned Lead"
-msgstr "Ikke-tildelt Kundeemne"
+msgstr "Ikke-tildelt kundeemne"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_team__unassigned_leads_count
 #: model_terms:ir.ui.view,arch_db:crm.crm_team_salesteams_view_kanban
 msgid "Unassigned Leads"
-msgstr "Ikke-tildelte Kundeemner"
+msgstr "Ikke-tildelte kundeemner"
 
 #. module: crm
 #: code:addons/crm/models/crm_team.py:201
@@ -2421,7 +2452,7 @@ msgstr "Ulæste besked tæller"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Use an External Email Server"
-msgstr "Anvend en Ekstern Email Server"
+msgstr "Anvend en ekstern e-mailserver"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner.mass,action:0
@@ -2486,12 +2517,12 @@ msgstr "Bruges til at sortere faser. Lavere er bedre."
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__user_email
 msgid "User Email"
-msgstr "Bruger Email"
+msgstr "Bruger e-mail"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__user_login
 msgid "User Login"
-msgstr "Bruger Log ind"
+msgstr "Bruger login"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
@@ -2506,7 +2537,7 @@ msgstr "Meget høj"
 #. module: crm
 #: model:crm.lost.reason,name:crm.lost_reason_2
 msgid "We don't have people/skills"
-msgstr "Vi har ikke mennesker/faglighed"
+msgstr "Vi har ikke medarbejdere/faglighed"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__website
@@ -2516,7 +2547,7 @@ msgstr "Hjemmeside"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form
 msgid "Website Lead Generation"
-msgstr ""
+msgstr "Website leadgenerator"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__website_message_ids
@@ -2538,21 +2569,22 @@ msgstr "Kontaktens hjemmeside"
 msgid ""
 "When sending mails, the default email address is taken from the Sales Team."
 msgstr ""
+"Når du sender e-mails, er standard e-mailadressen hentet fra salgsteamet."
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Month"
-msgstr "Inden for en Måned"
+msgstr "Indenfor en måned"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Week"
-msgstr "Inden for en Uge"
+msgstr "Indenfor en uge"
 
 #. module: crm
 #: selection:crm.team,dashboard_graph_period_pipeline:0
 msgid "Within a Year"
-msgstr "Inden for et År"
+msgstr "Indenfor et år"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:1121
@@ -2570,7 +2602,7 @@ msgstr "Vundet"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_res_users__target_sales_won
 msgid "Won in Opportunities Target"
-msgstr "Vundet i salgmuligheder"
+msgstr "Vundne salgmuligheder"
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:402
@@ -2585,6 +2617,8 @@ msgid ""
 "You have to enable the Pipeline on your Sales Team to be able to set it as a"
 " content for the graph"
 msgstr ""
+"Du skal aktivere pipeline på dit salgsteam for at kunne sætte det som "
+"indhold i grafen."
 
 #. module: crm
 #: code:addons/crm/models/crm_lead.py:404
@@ -2623,7 +2657,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_oppor
 msgid "ZIP"
-msgstr "post nr."
+msgstr "Postnummer"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__zip
@@ -2650,7 +2684,7 @@ msgstr "f.eks. www.odoo.com"
 #: code:addons/crm/models/crm_lead.py:946
 #, python-format
 msgid "or send an email to %s"
-msgstr ""
+msgstr "eller send en e-mail til %s"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_stage__team_count
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 9fe08eff4d3..019b4aa797b 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -3,28 +3,29 @@
 # * crm
 # 
 # Translators:
-# Sergio Zanchetta <primes2h@gmail.com>, 2018
+# Pietro Della Notte <pdellanotte@gmail.com>, 2018
 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018
+# Simone Bernini <simone@aperturelabs.it>, 2018
+# Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018
+# Christian <chris@effeci.info>, 2018
+# Alberto Carollo <baba75@gmail.com>, 2018
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018
+# Cécile Collart <cco@odoo.com>, 2018
+# Romica Paun <roa@odoo.com>, 2018
 # Martin Trigaux, 2018
 # Luigi Di Naro <gigidn@gmail.com>, 2018
-# Simone Bernini <simone@aperturelabs.it>, 2018
 # Paolo Valier, 2018
-# Cécile Collart <cco@odoo.com>, 2018
-# Pietro Della Notte <pdellanotte@gmail.com>, 2018
-# Alberto Carollo <baba75@gmail.com>, 2018
 # David Minneci <david@numeko.it>, 2018
+# Sergio Zanchetta <primes2h@gmail.com>, 2018
 # Léonie Bouchat <lbo@odoo.com>, 2018
-# Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018
-# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018
-# Christian <chris@effeci.info>, 2018
-# Romica Paun <roa@odoo.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
-"PO-Revision-Date: 2018-10-08 06:48+0000\n"
-"Last-Translator: Romica Paun <roa@odoo.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Léonie Bouchat <lbo@odoo.com>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -424,7 +425,7 @@ msgstr "Azienda"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 msgid "Company Name"
-msgstr "Nome dell’azienda"
+msgstr "Nome azienda"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_config_settings
@@ -457,7 +458,7 @@ msgstr "Contatto"
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead__contact_name
 msgid "Contact Name"
-msgstr "Nome di contatto"
+msgstr "Nome contatto"
 
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.res_config_settings_view_form
@@ -613,8 +614,8 @@ msgid ""
 "Create tags that fit your business (product structure, sales type, etc.) to "
 "better manage and tack your opportunities."
 msgstr ""
-"Crea tag che si adattino alla tua attività (struttura del prodotto, tipo di "
-"vendita, ecc.) Per gestire e affinare meglio le tue opportunità."
+"Crea etichette che si adattano all'attività (struttura del prodotto, tipo di"
+" vendita ecc.) per gestire e affinare meglio le opportunità."
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_activity_report__author_id
@@ -737,7 +738,7 @@ msgstr "Elimina"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 msgid "Describe the lead..."
-msgstr "Descrivi il Lead…"
+msgstr "Descrivere il lead…"
 
 #. module: crm
 #: model:crm.lead.tag,name:crm.categ_oppor5
@@ -910,7 +911,7 @@ msgstr "Filtri Estesi"
 #. module: crm
 #: model_terms:ir.ui.view,arch_db:crm.crm_case_form_view_leads
 msgid "Extra Info"
-msgstr "Info aggiuntive"
+msgstr "Informazioni aggiuntive"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_stage__fold
@@ -1228,7 +1229,7 @@ msgstr "Tag lead"
 #: model_terms:ir.ui.view,arch_db:crm.crm_lead_tag_form
 #: model_terms:ir.ui.view,arch_db:crm.crm_lead_tag_tree
 msgid "Lead Tags"
-msgstr "Tag associati ai lead"
+msgstr "Etichette associate ai lead"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -2037,12 +2038,12 @@ msgstr "Team di vendita"
 #: code:addons/crm/models/crm_lead.py:1125
 #, python-format
 msgid "Sales Team Settings"
-msgstr "Configurazione del team di vendita"
+msgstr "Impostazioni team di vendita"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.crm_team_config
 msgid "Sales Teams"
-msgstr "Team di Vendita"
+msgstr "Team di vendita"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_lead2opportunity_partner_mass__user_ids
@@ -2288,7 +2289,7 @@ msgstr "Il nome del Tag esiste già !"
 #: model:ir.model.fields,field_description:crm.field_crm_lead__tag_ids
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Tags"
-msgstr "Tags"
+msgstr "Etichette"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.sales_team_menu_team_pipeline
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 3d1adc37e9b..8c8d873cc56 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -393,7 +393,7 @@ msgstr "关闭不能转化为商机的线索"
 #: model:ir.model.fields,field_description:crm.field_crm_lead__color
 #: model:ir.model.fields,field_description:crm.field_crm_lead_tag__color
 msgid "Color Index"
-msgstr "更多颜色"
+msgstr "颜色索引"
 
 #. module: crm
 #: model:ir.model.fields,field_description:crm.field_crm_activity_report__company_id
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index a288ebb9f85..0f6766b99f8 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -88,7 +88,7 @@ class Lead(models.Model):
     stage_id = fields.Many2one('crm.stage', string='Stage', ondelete='restrict', track_visibility='onchange', index=True,
         domain="['|', ('team_id', '=', False), ('team_id', '=', team_id)]",
         group_expand='_read_group_stage_ids', default=lambda self: self._default_stage_id())
-    user_id = fields.Many2one('res.users', string='Salesperson', index=True, track_visibility='onchange', default=lambda self: self.env.user)
+    user_id = fields.Many2one('res.users', string='Salesperson', track_visibility='onchange', default=lambda self: self.env.user)
     referred = fields.Char('Referred By')
 
     date_open = fields.Datetime('Assignation Date', readonly=True, default=fields.Datetime.now)
@@ -133,6 +133,13 @@ class Lead(models.Model):
         ('check_probability', 'check(probability >= 0 and probability <= 100)', 'The probability of closing the deal should be between 0% and 100%!')
     ]
 
+    @api.model_cr_context
+    def _auto_init(self):
+        res = super(Lead, self)._auto_init()
+        tools.create_index(self._cr, 'crm_lead_user_id_team_id_type_index',
+                           self._table, ['user_id', 'team_id', 'type'])
+        return res
+
     @api.model
     def _read_group_stage_ids(self, stages, domain, order):
         # retrieve team_id from the context and write the domain
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 5495f0f5d32..7905bff1ce5 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -412,6 +412,18 @@
                             domain="[('probability', '=', 100)]"/>
                     <filter string="Lost" name="lost"
                             domain="['&amp;', ('probability', '=', 0), ('active', '=', False)]"/>
+                    <separator/>
+                    <filter string="Activities Todo" name="activities_my"
+                            domain="[('activity_ids.user_id', '=', uid)]"/>
+                    <separator/>
+                    <filter string="Late Activities" name="activities_overdue"
+                            domain="[('activity_ids.date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                            help="Show all opportunities for which the next action date is before today"/>
+                    <filter string="Today Activities" name="activities_today"
+                            domain="[('activity_ids.date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                    <filter string="Future Activities" name="activities_upcoming_all"
+                        domain="[('activity_ids.date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))
+                        ]"/>
                     <group expand="0" string="Group By">
                         <filter string="Salesperson" name="salesperson" context="{'group_by':'user_id'}"/>
                         <filter string="Sales Channel" name="saleschannel" context="{'group_by':'team_id'}"/>
@@ -477,20 +489,20 @@
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
-                            <h2 class="o_row">
-                                <div>
+                            <h2 class="o_row row no-gutters d-flex">
+                                <div class="col">
                                     <label for="planned_revenue" class="oe_edit_only" />
                                     <div class="o_row">
                                         <field name="company_currency" invisible="1"/>
-                                        <field name="planned_revenue" widget='monetary' options="{'currency_field': 'company_currency'}"/>
+                                        <field name="planned_revenue" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency'}"/>
                                         <span class="oe_grey"> at </span>
                                     </div>
                                 </div>
-                                <div>
+                                <div class="col">
                                     <label for="probability" class="oe_edit_only"/>
-                                    <div class="o_row">
-                                        <field name="probability" widget="integer"/>
-                                        <span>%%</span>
+                                    <div class="o_row d-flex">
+                                        <field name="probability" widget="integer" class="oe_inline"/>
+                                        <span class="oe_grey"> %%</span>
                                     </div>
                                 </div>
                             </h2>
diff --git a/addons/crm_phone_validation/i18n/da.po b/addons/crm_phone_validation/i18n/da.po
index bcea7300ed0..9c761dcd4ab 100644
--- a/addons/crm_phone_validation/i18n/da.po
+++ b/addons/crm_phone_validation/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +35,7 @@ msgstr ""
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_res_partner
@@ -43,9 +45,9 @@ msgstr "Kontakt"
 #. module: crm_phone_validation
 #: model:ir.model,name:crm_phone_validation.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr "Emne/Forventning"
+msgstr "Kundeemne/salgsmulighed"
 
 #. module: crm_phone_validation
 #: model:ir.model.fields,field_description:crm_phone_validation.field_res_config_settings__crm_phone_valid_method
 msgid "Local Numbers"
-msgstr "Lokale Numre"
+msgstr "Lokale numre"
diff --git a/addons/crm_reveal/models/crm_reveal_rule.py b/addons/crm_reveal/models/crm_reveal_rule.py
index 26548381a64..52e66972700 100644
--- a/addons/crm_reveal/models/crm_reveal_rule.py
+++ b/addons/crm_reveal/models/crm_reveal_rule.py
@@ -230,12 +230,7 @@ class CRMRevealRule(models.Model):
     @api.model
     def _get_reveal_views_to_process(self):
         """ Return list of reveal rule ids grouped by IPs """
-        batch_limit = self.env['ir.config_parameter'].sudo().get_param('reveal.fetch_limit', DEFAULT_REVEAL_BATCH_LIMIT)
-        try:
-            batch_limit = int(batch_limit)
-        except ValueError:
-            batch_limit = DEFAULT_REVEAL_BATCH_LIMIT
-
+        batch_limit = DEFAULT_REVEAL_BATCH_LIMIT
         query = """
             SELECT v.reveal_ip, array_agg(v.reveal_rule_id ORDER BY r.sequence)
             FROM crm_reveal_view v
@@ -302,7 +297,7 @@ class CRMRevealRule(models.Model):
             'account_token': account_token.account_token,
             'data': server_payload
         }
-        result = jsonrpc(endpoint, params=params)
+        result = jsonrpc(endpoint, params=params, timeout=300)
         for res in result.get('reveal_data', []):
             if not res.get('not_found'):
                 lead = self._create_lead_from_response(res)
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index bb89dc8212f..ce9b46a9aec 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -7,16 +7,17 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -179,7 +180,7 @@ msgstr "Betingelse"
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
@@ -238,7 +239,7 @@ msgstr "Leveringsomkostninger"
 #. module: delivery
 #: model_terms:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
 msgid "Delivery Information"
-msgstr "Leverings information"
+msgstr "Leveringsinformation"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_message
@@ -282,7 +283,7 @@ msgstr "Leveringsindpakning"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_price_rule
 msgid "Delivery Price Rules"
-msgstr " Regler for leveringsspriser"
+msgstr "Regler for fragtpriser"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier__product_id
@@ -347,7 +348,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_sale_order__delivery_price
 msgid "Estimated Delivery Price"
-msgstr "Estimeret leveringspris"
+msgstr "Estimeret fragtpris"
 
 #. module: delivery
 #: model:ir.model.fields,help:delivery.field_sale_order__carrier_id
@@ -572,14 +573,14 @@ msgstr "Pakke"
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_product_packaging__shipper_package_code
 msgid "Package Code"
-msgstr "Pakke kode"
+msgstr "Pakkekode"
 
 #. module: delivery
 #: code:addons/delivery/models/stock_picking.py:35
 #: code:addons/delivery/models/stock_picking.py:122
 #, python-format
 msgid "Package Details"
-msgstr "Pakke detaljer"
+msgstr "Pakkedetaljer"
 
 #. module: delivery
 #: code:addons/delivery/wizard/choose_delivery_package.py:52
@@ -636,7 +637,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model,name:delivery.model_product_packaging
 msgid "Product Packaging"
-msgstr "Produkt Indpakning"
+msgstr "Produkt indpakning"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier__delivery_type
@@ -665,7 +666,7 @@ msgstr "Basispris ved salg"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sale Order"
-msgstr "Salgs ordre"
+msgstr "Salgsordre"
 
 #. module: delivery
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__list_price
@@ -685,7 +686,7 @@ msgstr "Gem"
 #. module: delivery
 #: model_terms:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
 msgid "Send Confirmation Email"
-msgstr "Send Bekræftelsesemail"
+msgstr "Send bekræftelses e-mail"
 
 #. module: delivery
 #: model_terms:ir.ui.view,arch_db:delivery.view_picking_withcarrier_out_form
@@ -696,7 +697,7 @@ msgstr "Sendt til afsender"
 #: model:ir.model.fields,field_description:delivery.field_delivery_carrier__sequence
 #: model:ir.model.fields,field_description:delivery.field_delivery_price_rule__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: delivery
 #: model:ir.model.fields,help:delivery.field_delivery_carrier__prod_environment
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index a57676e0530..4390b41614a 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -40,7 +40,7 @@ msgstr "${(object.name or '').replace('/','_')}"
 msgid ""
 "${object.company_id.name} Delivery Order (Ref ${object.name or 'n/a' })"
 msgstr ""
-"${object.company_id.name} Ordine di consegna (Rif ${object.name or 'n/a' })"
+"${object.company_id.name} Ordine di consegna (Rif. ${object.name or 'n/d' })"
 
 #. module: delivery
 #: model:mail.template,body_html:delivery.mail_template_data_delivery_confirmation
diff --git a/addons/digest/i18n/da.po b/addons/digest/i18n/da.po
index fb9d74e3ffe..89667dd156a 100644
--- a/addons/digest/i18n/da.po
+++ b/addons/digest/i18n/da.po
@@ -9,15 +9,16 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Jarnhold Nattestad <nattestads@gmail.com>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -232,7 +233,7 @@ msgstr "Virksomhed"
 #. module: digest
 #: model:ir.model,name:digest.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: digest
 #: model_terms:ir.ui.view,arch_db:digest.res_config_settings_view_form
@@ -281,7 +282,7 @@ msgstr ""
 #. module: digest
 #: model:ir.model,name:digest.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: digest
 #: model:ir.model.fields,field_description:digest.field_res_config_settings__digest_id
@@ -447,7 +448,7 @@ msgstr "Send nu"
 #. module: digest
 #: model:ir.model.fields,field_description:digest.field_digest_tip__sequence
 msgid "Sequence"
-msgstr "Rækkefølge"
+msgstr "Sekvens"
 
 #. module: digest
 #: model:ir.model.fields,field_description:digest.field_digest_digest__state
diff --git a/addons/digest/i18n/zh_CN.po b/addons/digest/i18n/zh_CN.po
index 7b2d4f963e2..93d05ee4c03 100644
--- a/addons/digest/i18n/zh_CN.po
+++ b/addons/digest/i18n/zh_CN.po
@@ -448,7 +448,7 @@ msgstr "摘要邮件"
 #: model:ir.model.fields,field_description:digest.field_res_config_settings__digest_emails
 #: model:ir.ui.menu,name:digest.digest_menu
 msgid "Digest Emails"
-msgstr "摘要邮件列表"
+msgstr "摘要邮件"
 
 #. module: digest
 #: model_terms:ir.ui.view,arch_db:digest.portal_digest_unsubscribed
diff --git a/addons/document/i18n/da.po b/addons/document/i18n/da.po
index cc3ffaa79d8..55a2edc5f74 100644
--- a/addons/document/i18n/da.po
+++ b/addons/document/i18n/da.po
@@ -6,13 +6,15 @@
 # Martin Trigaux, 2018
 # Martin Albrechtsen <nma@online24.dk>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Morten Schou <ms@msteknik.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +32,7 @@ msgstr "%s (%s)"
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "Attachment"
-msgstr "Bilag"
+msgstr "Vedhæftning"
 
 #. module: document
 #. openerp-web
@@ -44,7 +46,7 @@ msgstr "Vedhæftning(er)"
 #: code:addons/document/static/src/js/document.js:180
 #, python-format
 msgid "Do you really want to delete this attachment ?"
-msgstr "Er du sikker på at du vil slette vedhæftede"
+msgstr "Er du sikker på at du vil slette denne vedhæftning"
 
 #. module: document
 #. openerp-web
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index db7e52fb099..93adb4a9f54 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -5,14 +5,14 @@
 # Translators:
 # peso <peer.sommerlund@gmail.com>, 2018
 # JonathanStein <jstein@image.dk>, 2018
+# Jesper Carstensen <jc@danodoo.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,6 +50,8 @@ msgid ""
 "<b><i class=\"fa fa-clock-o\"/>\n"
 "                                        To</b>"
 msgstr ""
+"<b><i class=\"fa fa-clock-o\"/>\n"
+"                                        Til</b>"
 
 #. module: event
 #: model:mail.template,body_html:event.event_registration_mail_template_badge
@@ -127,6 +129,9 @@ msgid ""
 "                                        to\n"
 "                                    </span>"
 msgstr ""
+"<span attrs=\"{'invisible': [('seats_availability', '=', 'unlimited')]}\" class=\"oe_read_only\">\n"
+"                                        til\n"
+"                                    </span>"
 
 #. module: event
 #: model_terms:ir.ui.view,arch_db:event.view_event_confirm
@@ -685,17 +690,17 @@ msgstr "Deltagere"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event__auto_confirm
 msgid "Autoconfirm Registrations"
-msgstr "Autobekræft Tilmeldinger"
+msgstr "Autobekræft tilmeldinger"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type__auto_confirm
 msgid "Automatically Confirm Registrations"
-msgstr "Bekræft Tilmeldinger Automatisk"
+msgstr "Bekræft tilmeldinger automatisk"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type__use_mail_schedule
 msgid "Automatically Send Emails"
-msgstr "Send Emails Automatisk"
+msgstr "Send e-mails automatisk"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event__seats_available
@@ -819,7 +824,7 @@ msgstr ""
 #. module: event
 #: model:ir.model,name:event.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_configuration
@@ -988,7 +993,7 @@ msgstr "Udført"
 #. module: event
 #: model_terms:ir.ui.view,arch_db:event.view_event_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: event
 #: model_terms:event.event,description:event.event_2
@@ -1387,7 +1392,7 @@ msgstr "Introduktion, CRM, Salg"
 #: model:ir.model.fields,field_description:event.field_event_event__message_is_follower
 #: model:ir.model.fields,field_description:event.field_event_registration__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: event
 #: model:ir.model.fields,help:event.field_event_type__default_registration_max
@@ -1447,7 +1452,7 @@ msgstr "Begrænset"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type__has_seats_limitation
 msgid "Limited Seats"
-msgstr "Begrænset Antal Pladser"
+msgstr "Begrænset antal pladser"
 
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_event__address_id
@@ -1536,7 +1541,7 @@ msgstr "Maksimum antal deltagere"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type__default_registration_max
 msgid "Maximum Registrations"
-msgstr "Maksimum Tilmeldinger"
+msgstr "Maksimum tilmeldinger"
 
 #. module: event
 #: code:addons/event/models/event.py:258
@@ -1567,7 +1572,7 @@ msgstr "Minimum antal deltagere"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_event_type__default_registration_min
 msgid "Minimum Registrations"
-msgstr "Minimum Tilmeldinger"
+msgstr "Minimum tilmeldinger"
 
 #. module: event
 #: model_terms:event.event,description:event.event_0
@@ -1663,7 +1668,7 @@ msgstr "Online"
 #: model:ir.model.fields,field_description:event.field_event_type__is_online
 #: model_terms:ir.ui.view,arch_db:event.event_type_view_search
 msgid "Online Event"
-msgstr "Online Arrangement"
+msgstr "Online arrangement"
 
 #. module: event
 #: model_terms:ir.ui.view,arch_db:event.view_event_search
@@ -1673,7 +1678,7 @@ msgstr "Online arrangementer"
 #. module: event
 #: model:ir.model.fields,field_description:event.field_res_config_settings__module_website_event_sale
 msgid "Online Ticketing"
-msgstr "Online Billetter"
+msgstr "Online billetter"
 
 #. module: event
 #: model_terms:ir.ui.view,arch_db:event.view_event_type_form
@@ -1734,7 +1739,7 @@ msgstr "Telefon"
 #. module: event
 #: model:event.type,name:event.event_type_data_physical
 msgid "Physical Event"
-msgstr "Fysisk Arrangement"
+msgstr "Fysisk arrangement"
 
 #. module: event
 #: model_terms:event.event,description:event.event_2
diff --git a/addons/event_sale/i18n/da.po b/addons/event_sale/i18n/da.po
index a570aa2e475..12ad01bf9b5 100644
--- a/addons/event_sale/i18n/da.po
+++ b/addons/event_sale/i18n/da.po
@@ -10,12 +10,13 @@
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -350,7 +351,7 @@ msgstr "Reserverede pladser"
 #. module: event_sale
 #: model:ir.model,name:event_sale.model_sale_order
 msgid "Sale Order"
-msgstr "Salgs ordre"
+msgstr "Salgsordre"
 
 #. module: event_sale
 #: model:ir.model.fields,field_description:event_sale.field_event_event_ticket__deadline
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index 645707240c1..4590ffa14f6 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.po
@@ -10,12 +10,13 @@
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:17+0000\n"
 "Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +43,7 @@ msgstr "Avanceret"
 #. module: fetchmail
 #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form
 msgid "Advanced Options"
-msgstr "Avancerede optioner"
+msgstr "Avancerede muligheder"
 
 #. module: fetchmail
 #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__configuration
@@ -211,7 +212,7 @@ msgstr "Navn"
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
 msgid "Not Confirmed"
-msgstr "Ikke Bekræftet"
+msgstr "Ikke bekræftet"
 
 #. module: fetchmail
 #: model_terms:ir.ui.view,arch_db:fetchmail.res_config_settings_view_form
@@ -329,7 +330,7 @@ msgstr "Status"
 #. module: fetchmail
 #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form
 msgid "Test & Confirm"
-msgstr "Test & Bekræft"
+msgstr "Test & bekræft"
 
 #. module: fetchmail
 #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__user
diff --git a/addons/fleet/i18n/da.po b/addons/fleet/i18n/da.po
index 3ec2ae09969..5a64cc41cfa 100644
--- a/addons/fleet/i18n/da.po
+++ b/addons/fleet/i18n/da.po
@@ -10,9 +10,9 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,7 +67,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_needaction
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_needaction
 msgid "Action Needed"
-msgstr "Aktion påkrævet"
+msgstr "Handling påkrævet"
 
 #. module: fleet
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
@@ -107,7 +107,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_fuel_view_form
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
 msgid "Additional Details"
-msgstr "Yderligere Detaljer"
+msgstr "Yderligere detaljer"
 
 #. module: fleet
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_view_form
@@ -185,12 +185,12 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_9
 msgid "Battery Inspection"
-msgstr "Batteri Eftersyn"
+msgstr "Batteri eftersyn"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_10
 msgid "Battery Replacement"
-msgstr "Udskiftning af Batteri"
+msgstr "Udskiftning af batteri"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_11
@@ -200,7 +200,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_12
 msgid "Brake Inspection"
-msgstr "Eftersyn af Bremser"
+msgstr "Eftersyn af bremser"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_13
@@ -215,7 +215,7 @@ msgstr "Mærke"
 #. module: fleet
 #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
 msgid "Brand of the vehicle"
-msgstr "Køretøjets Mærke"
+msgstr "Køretøjets mærke"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
@@ -295,7 +295,7 @@ msgstr ""
 #. module: fleet
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 msgid "Close Contract"
-msgstr "Luk Kontrakt"
+msgstr "Luk kontrakt"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -355,7 +355,7 @@ msgstr ""
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__expiration_date
 msgid "Contract Expiration Date"
-msgstr "Kontrakt Udløbsdato"
+msgstr "Kontrakt udløbsdato"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__ins_ref
@@ -365,7 +365,7 @@ msgstr "Kontrakt reference"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__start_date
 msgid "Contract Start Date"
-msgstr "Kontrakt Startdato"
+msgstr "Kontrakt startdato"
 
 #. module: fleet
 #: model:ir.actions.act_window,name:fleet.fleet_vehicle_contract_types_action
@@ -634,7 +634,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_2
 msgid "Depreciation and Interests"
-msgstr "Afskrivning og Renter"
+msgstr "Afskrivning og renter"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -776,7 +776,7 @@ msgstr "Udløbet"
 #: selection:fleet.vehicle.log.contract,state:0
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 msgid "Expiring Soon"
-msgstr "Udløber Snart"
+msgstr "Udløber snart"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__first_contract_date
@@ -863,7 +863,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_23
 msgid "Fuel Pump Replacement"
-msgstr "Udskiftning af Brændstofpumpe"
+msgstr "Udskiftning af brændstofpumpe"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__fuel_type
@@ -919,7 +919,7 @@ msgstr "Sortér efter"
 #. module: fleet
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
 msgid "Has Alert(s)"
-msgstr "Har Alarm(er)"
+msgstr "Har alarm(er)"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__contract_renewal_overdue
@@ -929,7 +929,7 @@ msgstr "Forfaldne kontrakter"
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__contract_renewal_due_soon
 msgid "Has Contracts to renew"
-msgstr "Har Kontrakter til fornyelse"
+msgstr "Har kontrakter til fornyelse"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_24
@@ -1013,7 +1013,7 @@ msgstr "Hvis afkrydset har nogle beskeder en leveringsfejl"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_29
 msgid "Ignition Coil Replacement"
-msgstr "Udskiftning af Tændspole"
+msgstr "Udskiftning af tændspole"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__acquisition_date
@@ -1034,7 +1034,7 @@ msgstr "I gang"
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_services_view_form
 msgid "Included Services"
-msgstr "Inkluderede Servicer"
+msgstr "Inkluderede services"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,state:0
@@ -1078,13 +1078,13 @@ msgstr "Fakturadato"
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_fuel__inv_ref
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_services__inv_ref
 msgid "Invoice Reference"
-msgstr "Faktura reference"
+msgstr "Fakturareference"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_is_follower
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: fleet
 #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
@@ -1382,7 +1382,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_type_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
@@ -1824,7 +1824,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_search
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_view_search
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_model_brand__image_small
@@ -1887,6 +1887,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_5
@@ -1926,7 +1930,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_43
 msgid "Thermostat Replacement"
-msgstr "Udskiftning af Termostat"
+msgstr "Udskiftning af termostat"
 
 #. module: fleet
 #: model:ir.model.fields,help:fleet.field_fleet_vehicle__image
@@ -1945,7 +1949,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_45
 msgid "Tire Replacement"
-msgstr "Udskiftning af Dæk"
+msgstr "Udskiftning af dæk"
 
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_46
@@ -1980,7 +1984,7 @@ msgstr "Total pris"
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_service_14
 msgid "Total expenses (Excluding VAT)"
-msgstr "Total udgifter (Eksklusiv Moms)"
+msgstr "Total udgifter (eksklusiv moms)"
 
 #. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__contract_renewal_total
@@ -2236,7 +2240,7 @@ msgstr ""
 #. module: fleet
 #: model:fleet.service.type,name:fleet.type_service_50
 msgid "Water Pump Replacement"
-msgstr "Udskiftning af Vandpumpe"
+msgstr "Udskiftning af vandpumpe"
 
 #. module: fleet
 #: selection:fleet.vehicle.log.contract,cost_frequency:0
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 68895eafbef..b16ffbc9417 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.pot
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
+"PO-Revision-Date: 2018-11-23 16:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -646,6 +646,11 @@ msgid "Doors Number"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_downgraded
+msgid "Downgraded"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__driver_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_assignation_log__driver_id
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__purchaser_id
@@ -1337,6 +1342,11 @@ msgid "Name of contract to renew soon"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_new_request
+msgid "New Request"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__activity_date_deadline
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__activity_date_deadline
 msgid "Next Activity Deadline"
@@ -1523,6 +1533,11 @@ msgid "Options"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_ordered
+msgid "Ordered"
+msgstr ""
+
+#. module: fleet
 #: selection:fleet.vehicle.cost,cost_type:0
 msgid "Other"
 msgstr ""
@@ -1641,6 +1656,11 @@ msgid "Refueling Details"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_registered
+msgid "Registered"
+msgstr ""
+
+#. module: fleet
 #: code:addons/fleet/models/fleet_vehicle_cost.py:209
 #: model:ir.actions.act_window,name:fleet.act_renew_contract
 #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_log_contract_view_form
@@ -1674,6 +1694,11 @@ msgid "Reporting"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_reserve
+msgid "Reserve"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__residual_value
 msgid "Residual Value"
 msgstr ""
@@ -2185,6 +2210,11 @@ msgid "Vendors"
 msgstr ""
 
 #. module: fleet
+#: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_waiting_list
+msgid "Waiting List"
+msgstr ""
+
+#. module: fleet
 #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__days_left
 msgid "Warning Date"
 msgstr ""
diff --git a/addons/fleet/models/fleet_vehicle.py b/addons/fleet/models/fleet_vehicle.py
index 1d03bc030f0..9dfd593362f 100644
--- a/addons/fleet/models/fleet_vehicle.py
+++ b/addons/fleet/models/fleet_vehicle.py
@@ -315,7 +315,7 @@ class FleetVehicleState(models.Model):
     _order = 'sequence asc'
     _description = 'Vehicle Status'
 
-    name = fields.Char(required=True)
+    name = fields.Char(required=True, translate=True)
     sequence = fields.Integer(help="Used to order the note stages")
 
     _sql_constraints = [('fleet_state_name_unique', 'unique(name)', 'State name already exists')]
diff --git a/addons/gamification/i18n/da.po b/addons/gamification/i18n/da.po
index 51e39f6a5af..70b25da4d61 100644
--- a/addons/gamification/i18n/da.po
+++ b/addons/gamification/i18n/da.po
@@ -5,10 +5,10 @@
 # Translators:
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
+# Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Jesper Carstensen <jc@danodoo.dk>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
@@ -195,7 +195,7 @@ msgid ""
 "                                <span class=\"o_stat_text\">Goals</span>"
 msgstr ""
 "<span class=\"o_stat_text\">Relaterede</span>\n"
-"                                <span class=\"o_stat_text\">Mål</span>"
+"                                <span class=\"o_stat_text\">mål</span>"
 
 #. module: gamification
 #: model:mail.template,body_html:gamification.simple_report_template
@@ -445,7 +445,7 @@ msgstr "Handling"
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_needaction
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_needaction
 msgid "Action Needed"
-msgstr "Aktion påkrævet"
+msgstr "Handling påkrævet"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__active
@@ -455,7 +455,7 @@ msgstr "Aktiv"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Advanced Options"
-msgstr "Avancerede optioner"
+msgstr "Avancerede muligheder"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__rule_auth
@@ -522,24 +522,24 @@ msgstr "Badge"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.badge_form_view
 msgid "Badge Description"
-msgstr "Beskrivelse af Badge"
+msgstr "Beskrivelse af badge"
 
 #. module: gamification
 #: model:mail.message.subtype,description:gamification.mt_badge_granted
 #: model:mail.message.subtype,name:gamification.mt_badge_granted
 msgid "Badge Granted"
-msgstr "Badge Tildelt"
+msgstr "Badge tildelt"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.badge_list_view
 msgid "Badge List"
-msgstr "Badge Liste"
+msgstr "Badge liste"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user__badge_name
 #: model_terms:ir.ui.view,arch_db:gamification.badge_form_view
 msgid "Badge Name"
-msgstr "Navn på Badge"
+msgstr "Navn på badge"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.badge_list_action
@@ -612,7 +612,7 @@ msgstr "Udfordringslinjer"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__name
 msgid "Challenge Name"
-msgstr "Navn på Udfordring"
+msgstr "Navn på udfordring"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge_user__challenge_id
@@ -643,7 +643,7 @@ msgstr ""
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_definition_form_view
 msgid "Clickable Goals"
-msgstr "Klikbare Mål"
+msgstr "Klikbare mål"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal__closed
@@ -659,7 +659,7 @@ msgstr "Kommentar"
 #. module: gamification
 #: model:gamification.challenge,name:gamification.challenge_base_discover
 msgid "Complete your Profile"
-msgstr "Færdiggør din Profil"
+msgstr "Færdiggør din profil"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal__completeness
@@ -676,7 +676,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
 msgid "Create User"
-msgstr "Opret Bruger"
+msgstr "Opret bruger"
 
 #. module: gamification
 #: model_terms:ir.actions.act_window,help:gamification.badge_list_action
@@ -743,7 +743,7 @@ msgstr "Aktuel"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal__current
 msgid "Current Value"
-msgstr "Aktuel Værdi"
+msgstr "Aktuel værdi"
 
 #. module: gamification
 #: selection:gamification.challenge,period:0
@@ -976,7 +976,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.ui.menu,name:gamification.gamification_menu
 msgid "Gamification Tools"
-msgstr "Gamification Værktøjer"
+msgstr "Gamification værktøjer"
 
 #. module: gamification
 #: model:ir.model,name:gamification.model_gamification_badge_user
@@ -1047,7 +1047,7 @@ msgstr ""
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_form_view
 msgid "Goal Reached"
-msgstr "Mål Opnået"
+msgstr "Mål opnået"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
@@ -1067,7 +1067,7 @@ msgstr "Mål"
 #. module: gamification
 #: model:gamification.badge,name:gamification.badge_good_job
 msgid "Good Job"
-msgstr "Godt Arbejde"
+msgstr "Godt arbejde"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.badge_kanban_view
@@ -1078,18 +1078,18 @@ msgstr "Tildel"
 #: model:ir.actions.act_window,name:gamification.action_grant_wizard
 #: model_terms:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
 msgid "Grant Badge"
-msgstr "Tildel Badge"
+msgstr "Tildel badge"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.view_badge_wizard_grant
 #: model_terms:ir.ui.view,arch_db:gamification.view_goal_wizard_update_current
 msgid "Grant Badge To"
-msgstr "Tildel Badge Til"
+msgstr "Tildel badge til"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.badge_form_view
 msgid "Grant this Badge"
-msgstr "Tildel dette Badge"
+msgstr "Tildel dette badge"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.badge_user_kanban_view
@@ -1116,7 +1116,7 @@ msgstr ""
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_search_view
 msgid "HR Challenges"
-msgstr "HR Udfordringer"
+msgstr "HR udfordringer"
 
 #. module: gamification
 #: model:gamification.badge,name:gamification.badge_hidden
@@ -1159,7 +1159,7 @@ msgstr "Hvis et maksimum er angivet"
 #: model:ir.model.fields,help:gamification.field_gamification_badge__message_unread
 #: model:ir.model.fields,help:gamification.field_gamification_challenge__message_unread
 msgid "If checked new messages require your attention."
-msgstr "Hvis afmærket, kræver nye beskeder din attention"
+msgstr "Hvis afmærket, kræver nye beskeder din opmærksomhed"
 
 #. module: gamification
 #: model:ir.model.fields,help:gamification.field_gamification_badge__message_needaction
@@ -1218,19 +1218,19 @@ msgstr "I gang"
 #. module: gamification
 #: selection:gamification.challenge,visibility_mode:0
 msgid "Individual Goals"
-msgstr "Individuelle Mål"
+msgstr "Individuelle mål"
 
 #. module: gamification
 #: model:gamification.challenge.line,name:gamification.line_base_admin3
 #: model:gamification.goal.definition,name:gamification.definition_base_invite
 msgid "Invite new Users"
-msgstr "Invitér nye Brugere"
+msgstr "Invitér nye brugere"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_is_follower
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_is_follower
 msgid "Is Follower"
-msgstr "Følger"
+msgstr "Er følger"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge____last_update
@@ -1252,7 +1252,7 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_goal__last_update
 msgid "Last Update"
-msgstr "Sidste Opdatering"
+msgstr "Sidste opdatering"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__write_uid
@@ -1371,7 +1371,7 @@ msgstr "Månedlig total"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_search_view
 msgid "My Goals"
-msgstr "Mine Mål"
+msgstr "Mine mål"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__stat_my_monthly_sending
@@ -1381,12 +1381,12 @@ msgstr ""
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__stat_my_this_month
 msgid "My Monthly Total"
-msgstr "Min Månedlige Total"
+msgstr "Min månedlige total"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__stat_my
 msgid "My Total"
-msgstr "Min Total"
+msgstr "Min total"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge_line__name
@@ -1586,7 +1586,7 @@ msgstr "Reference"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Refresh Challenge"
-msgstr "Genopfrisk Udfordring"
+msgstr "Genopfrisk udfordring"
 
 #. module: gamification
 #: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
@@ -1626,7 +1626,7 @@ msgstr "Rapportskabelon"
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_badge__rule_auth_badge_ids
 msgid "Required Badges"
-msgstr "Fornødne Badges"
+msgstr "Nødvendige badges"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_form_view
@@ -1682,7 +1682,7 @@ msgstr "Kører"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_search_view
 msgid "Running Challenges"
-msgstr "Kørende Udfordringer"
+msgstr "Kørende udfordringer"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_form_view
@@ -1692,7 +1692,7 @@ msgstr "Plan"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_search_view
 msgid "Search Challenges"
-msgstr "Søg Udfordringer"
+msgstr "Søg udfordringer"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_definition_search_view
@@ -1716,7 +1716,7 @@ msgstr ""
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Send Report"
-msgstr "Send Rapport"
+msgstr "Send rapport"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__report_message_group_id
@@ -1759,7 +1759,7 @@ msgstr "Indstil virksomhedens logo"
 #: model:gamification.challenge.line,name:gamification.line_base_discover1
 #: model:gamification.goal.definition,name:gamification.definition_base_timezone
 msgid "Set your Timezone"
-msgstr "Indstil din Tidszone"
+msgstr "Indstil din tidszone"
 
 #. module: gamification
 #: selection:gamification.challenge,category:0
@@ -1774,7 +1774,7 @@ msgstr "Opsæt din virksomhed"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "Start Challenge"
-msgstr "Start Udfordring"
+msgstr "Start udfordring"
 
 #. module: gamification
 #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__start_date
@@ -2205,7 +2205,7 @@ msgstr "dage"
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.challenge_form_view
 msgid "e.g. Monthly Sales Objectives"
-msgstr "fx Månedlige Salgsmål"
+msgstr "fx månedlige salgsmål"
 
 #. module: gamification
 #: model_terms:ir.ui.view,arch_db:gamification.goal_definition_form_view
diff --git a/addons/gamification_sale_crm/i18n/da.po b/addons/gamification_sale_crm/i18n/da.po
index 48291b1e348..9193c78a4ad 100644
--- a/addons/gamification_sale_crm/i18n/da.po
+++ b/addons/gamification_sale_crm/i18n/da.po
@@ -7,12 +7,13 @@
 # jonas jensen <j.jensen@tcomp.dk>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:18+0000\n"
 "Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -45,13 +46,13 @@ msgstr "Månedlige salgsmål"
 #: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_marketing1
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_new_leads
 msgid "New Leads"
-msgstr "Nye Leads"
+msgstr "Nye kundeemner"
 
 #. module: gamification_sale_crm
 #: model:gamification.challenge.line,name:gamification_sale_crm.line_crm_marketing3
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_new_opportunities
 msgid "New Opportunities"
-msgstr "Nye kval. emner"
+msgstr "Nye salgsmuligheder"
 
 #. module: gamification_sale_crm
 #: model:gamification.goal.definition,name:gamification_sale_crm.definition_crm_nbr_sale_order_created
@@ -101,7 +102,7 @@ msgstr "fakturaer"
 #: model:gamification.challenge.line,definition_suffix:gamification_sale_crm.line_crm_marketing1
 #: model:gamification.goal.definition,suffix:gamification_sale_crm.definition_crm_nbr_new_leads
 msgid "leads"
-msgstr "emner"
+msgstr "kundeemner"
 
 #. module: gamification_sale_crm
 #: model:gamification.challenge.line,definition_suffix:gamification_sale_crm.line_crm_marketing3
diff --git a/addons/google_calendar/i18n/da.po b/addons/google_calendar/i18n/da.po
index ba8401bf1ee..17cc9c57ce1 100644
--- a/addons/google_calendar/i18n/da.po
+++ b/addons/google_calendar/i18n/da.po
@@ -9,13 +9,15 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:18+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +78,7 @@ msgstr "Kalender"
 #. module: google_calendar
 #: model:ir.model,name:google_calendar.model_calendar_attendee
 msgid "Calendar Attendee Information"
-msgstr ""
+msgstr "Kalender deltagere oplysninger"
 
 #. module: google_calendar
 #: model:ir.model.fields,field_description:google_calendar.field_res_users__google_calendar_cal_id
@@ -106,7 +108,7 @@ msgstr "Kunde_nøgle"
 #. module: google_calendar
 #: model:ir.model,name:google_calendar.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: google_calendar
 #. openerp-web
diff --git a/addons/google_drive/i18n/da.po b/addons/google_drive/i18n/da.po
index 0b17b6063f4..c56ba077acf 100644
--- a/addons/google_drive/i18n/da.po
+++ b/addons/google_drive/i18n/da.po
@@ -9,13 +9,15 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:18+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +82,7 @@ msgstr ""
 #. module: google_drive
 #: model:ir.model,name:google_drive.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: google_drive
 #: model:ir.model.fields,field_description:google_drive.field_google_drive_config__create_uid
diff --git a/addons/google_drive/i18n/id.po b/addons/google_drive/i18n/id.po
index 4bde2934482..bee179c5e08 100644
--- a/addons/google_drive/i18n/id.po
+++ b/addons/google_drive/i18n/id.po
@@ -251,8 +251,8 @@ msgid ""
 msgstr ""
 "Nama dokumen yang dilampirkan dapat menggunakan data tetap atau variabel. "
 "Untuk membedakan antara dokumen di Google Drive, menggunakan kata-kata tetap"
-" dan bidang. Misalnya, dalam contoh di atas, jika Anda menulis Agrolait _% "
-"(nama) s_Sales di bidang nama Google Drive, dokumen di Google Drive Anda dan"
+" dan bidang. Misalnya, dalam contoh di atas, jika Anda menulis Agrolait_"
+"%(name)s_Sales di bidang nama Google Drive, dokumen di Google Drive Anda dan"
 " dalam lampiran Odoo akan diberi nama 'Agrolait_SO0001_Sales'."
 
 #. module: google_drive
diff --git a/addons/google_spreadsheet/i18n/da.po b/addons/google_spreadsheet/i18n/da.po
index 6500af2ab77..7318d097e89 100644
--- a/addons/google_spreadsheet/i18n/da.po
+++ b/addons/google_spreadsheet/i18n/da.po
@@ -5,15 +5,16 @@
 # Translators:
 # Martin Trigaux, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:18+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "Tilføj til Google regnark"
 #. module: google_spreadsheet
 #: model:ir.model,name:google_spreadsheet.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: google_spreadsheet
 #: model:ir.model,name:google_spreadsheet.model_google_drive_config
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index c8f38dc4489..b4806dff0e6 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -10,9 +10,9 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -351,7 +351,7 @@ msgstr "Fuldt navn"
 #. module: hr
 #: model:ir.model,name:hr.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_human_resources_configuration
@@ -1026,7 +1026,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: hr
 #: model:ir.model.fields,field_description:hr.field_hr_employee__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: hr
 #: model_terms:hr.job,website_description:hr.job_ceo
@@ -1426,6 +1426,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: hr
 #: model_terms:ir.ui.view,arch_db:hr.view_hr_job_form
diff --git a/addons/hr_attendance/i18n/da.po b/addons/hr_attendance/i18n/da.po
index 280b54f6c19..8f1bad1d7a2 100644
--- a/addons/hr_attendance/i18n/da.po
+++ b/addons/hr_attendance/i18n/da.po
@@ -8,15 +8,16 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:18+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -238,7 +239,7 @@ msgstr "Firma logo"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_settings
diff --git a/addons/hr_attendance/models/hr_employee.py b/addons/hr_attendance/models/hr_employee.py
index 83e44105c00..388fe60a4c0 100644
--- a/addons/hr_attendance/models/hr_employee.py
+++ b/addons/hr_attendance/models/hr_employee.py
@@ -49,7 +49,9 @@ class HrEmployee(models.Model):
     @api.depends('attendance_ids')
     def _compute_last_attendance_id(self):
         for employee in self:
-            employee.last_attendance_id = employee.attendance_ids and employee.attendance_ids[0] or False
+            employee.last_attendance_id = self.env['hr.attendance'].search([
+                ('employee_id', '=', employee.id),
+            ], limit=1)
 
     @api.depends('last_attendance_id.check_in', 'last_attendance_id.check_out', 'last_attendance_id')
     def _compute_attendance_state(self):
diff --git a/addons/hr_contract/i18n/da.po b/addons/hr_contract/i18n/da.po
index 7d9fd74f540..263e2d44a4d 100644
--- a/addons/hr_contract/i18n/da.po
+++ b/addons/hr_contract/i18n/da.po
@@ -8,9 +8,9 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -213,7 +213,7 @@ msgstr "Vis navn"
 #. module: hr_contract
 #: model_terms:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: hr_contract
 #: model_terms:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban
@@ -439,7 +439,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: hr_contract
 #: model:ir.model.fields,field_description:hr_contract.field_hr_contract__notes
@@ -546,6 +546,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: hr_contract
 #: model:ir.model.fields,help:hr_contract.field_hr_contract__state
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index 68fae51e103..1a7583116a4 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -12,9 +12,9 @@
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -296,7 +296,7 @@ msgstr "Virksomhed knyttet til denne konto"
 #. module: hr_expense
 #: model:ir.model,name:hr_expense.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr_expense
 #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_configuration
@@ -897,7 +897,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense__activity_type_id
 #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: hr_expense
 #: code:addons/hr_expense/models/hr_expense.py:244
@@ -1266,7 +1266,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
 #: model_terms:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_product_template__can_be_expensed
@@ -1294,6 +1294,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: hr_expense
 #: model:ir.model.fields,help:hr_expense.field_hr_expense__state
diff --git a/addons/hr_expense/models/hr_expense.py b/addons/hr_expense/models/hr_expense.py
index 67c7c5ebb7a..9f7d6787823 100644
--- a/addons/hr_expense/models/hr_expense.py
+++ b/addons/hr_expense/models/hr_expense.py
@@ -461,6 +461,7 @@ class HrExpense(models.Model):
             'employee_id': employee.id,
             'product_id': product.id,
             'product_uom_id': product.uom_id.id,
+            'tax_ids': [(4, tax.id, False) for tax in product.supplier_taxes_id],
             'quantity': 1,
             'unit_amount': price,
             'company_id': employee.company_id.id,
diff --git a/addons/hr_expense/tests/test_expenses.py b/addons/hr_expense/tests/test_expenses.py
index 485b5dac6e0..c2c2439ec80 100644
--- a/addons/hr_expense/tests/test_expenses.py
+++ b/addons/hr_expense/tests/test_expenses.py
@@ -78,6 +78,26 @@ class TestAccountEntry(TestExpenseCommon):
         self.assertAlmostEquals(self.analytic_account.line_ids[0].amount, -636.36, "Amount on the only AAL is wrong")
         self.assertEquals(self.analytic_account.line_ids[0].product_id, self.product_expense, "Product of AAL should be the one from the expense")
 
+    def test_expense_from_email(self):
+        user_demo = self.env.ref('base.user_demo')
+        self.tax.price_include = False
+
+        message_parsed = {
+            'message_id': 'the-world-is-a-ghetto',
+            'subject': '[EXP_AF] 9876',
+            'email_from': 'mark.brown23@example.com',
+            'to': 'catchall@yourcompany.com',
+            'body': "Don't you know, that for me, and for you",
+            'attachments': [],
+        }
+
+        expense = self.env['hr.expense'].message_new(message_parsed)
+
+        air_ticket = self.env.ref("hr_expense.air_ticket")
+        self.assertEquals(expense.product_id, air_ticket)
+        self.assertEquals(expense.tax_ids.ids, [])
+        self.assertEquals(expense.total_amount, 9876.0)
+        self.assertTrue(expense.employee_id in user_demo.employee_ids)
 
 class TestExpenseRights(TestExpenseCommon):
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index 5e6b8d8a11a..adb3f50ca6f 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -10,8 +10,8 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:19+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -987,7 +987,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_allocation_view_kanban
 #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_view_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: hr_holidays
 #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_allocation_view_form
@@ -1740,7 +1740,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__activity_type_id
 #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: hr_holidays
 #: selection:hr.leave.type,allocation_type:0
@@ -2095,7 +2095,7 @@ msgstr "Rækkefølge"
 #: model_terms:ir.ui.view,arch_db:hr_holidays.view_hr_holidays_filter
 #: model_terms:ir.ui.view,arch_db:hr_holidays.view_hr_leave_allocation_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: hr_holidays
 #: model:hr.leave.type,name:hr_holidays.holiday_status_sl
@@ -2128,6 +2128,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: hr_holidays
 #: model_terms:ir.ui.view,arch_db:hr_holidays.report_holidayssummary
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index ffa98ea5194..64562ab1f05 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -107,7 +107,7 @@
         <field name="arch" type="xml">
             <tree string="Leave Type">
                 <field name="sequence" widget="handle"/>
-                <field name="name"/>
+                <field name="display_name"/>
                 <field name="code"/>
                 <field name="allocation_type"/>
                 <field name="validation_type"/>
diff --git a/addons/hr_maintenance/i18n/es.po b/addons/hr_maintenance/i18n/es.po
index 6242d5acce9..48a98f1c729 100644
--- a/addons/hr_maintenance/i18n/es.po
+++ b/addons/hr_maintenance/i18n/es.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Emilio Silva <efsilvay@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Emilio Silva <efsilvay@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +39,7 @@ msgstr "Creado por"
 #. module: hr_maintenance
 #: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request__owner_user_id
 msgid "Created by User"
-msgstr ""
+msgstr "Creado por Usuario"
 
 #. module: hr_maintenance
 #: model:ir.model.fields,field_description:hr_maintenance.field_maintenance_request__department_id
diff --git a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
index 88509a66afe..ae5c243c22a 100644
--- a/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
+++ b/addons/hr_org_chart/static/src/scss/hr_org_chart.scss
@@ -80,13 +80,16 @@
         margin-left: $tmp-gap-base;
 
         & + .o_org_chart_group_down {
-            margin-left: $tmp-gap-base*2;
+            padding-left: $tmp-gap-base*2;
+
+            &:before {
+                margin-left: $tmp-gap-base;
+            }
         }
     }
 
     .o_org_chart_group_down {
-        margin-left: $tmp-gap-base;
-        padding-right: $tmp-gap-base;
+        padding-left: $tmp-gap-base;
 
         &:before {
             @include o-hr-org-chart-line;
@@ -94,7 +97,7 @@
             height: 100%;
             @include o-position-absolute(
                 $top: $o-hr-org-chart-entry-v-gap*-1,
-                $left: $tmp-gap-base*-0.5 + $o-hr-org-chart-entry-pic-size*0.1 + $o-hr-org-chart-entry-line-w*0.5
+                $left: $tmp-gap-base*0.5 + $o-hr-org-chart-entry-pic-size*0.1 + $o-hr-org-chart-entry-line-w*0.5
             );
         }
 
diff --git a/addons/hr_payroll/i18n/da.po b/addons/hr_payroll/i18n/da.po
index 710ce2fc0a2..7d366f369c0 100644
--- a/addons/hr_payroll/i18n/da.po
+++ b/addons/hr_payroll/i18n/da.po
@@ -4,22 +4,23 @@
 # 
 # Translators:
 # peso <peer.sommerlund@gmail.com>, 2018
+# Jesper Carstensen <jc@danodoo.dk>, 2018
+# Jarnhold Nattestad <nattestads@gmail.com>, 2018
+# Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Jesper Carstensen <jc@danodoo.dk>, 2018
-# Jarnhold Nattestad <nattestads@gmail.com>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
-# Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
-"PO-Revision-Date: 2018-10-08 06:48+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -385,7 +386,7 @@ msgstr "Betingelser"
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_configuration
diff --git a/addons/hr_recruitment/data/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml
index 0784228fd6a..189ae4e5d75 100644
--- a/addons/hr_recruitment/data/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_demo.xml
@@ -177,7 +177,7 @@
         <field name="model">hr.applicant</field>
         <field name="res_id" ref="hr_case_salesman0"/>
         <field name="body"><![CDATA[<p>Hello,</p>
-        <p>I have checked this application but It's not match with our requirement. so no need to process further and we should refuse this application.</p>
+        <p>I have checked this application but it does not match with our requirements. We don't need to proceed further and we should refuse this application.</p>
         <p>Kind regards,</p>]]></field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
@@ -187,7 +187,7 @@
         <field name="model">hr.applicant</field>
         <field name="res_id" ref="hr_case_fresher0"/>
         <field name="body"><![CDATA[<p>Hello,</p>
-        <p>We should move further for this application as early as possible..</p>
+        <p>We should move further for this application as early as possible.</p>
         <p>Kind regards,</p>]]></field>
         <field name="message_type">comment</field>
         <field name="subtype_id" ref="mail.mt_comment"/>
diff --git a/addons/hr_recruitment/i18n/da.po b/addons/hr_recruitment/i18n/da.po
index f04d854cd1d..6b089fbf19f 100644
--- a/addons/hr_recruitment/i18n/da.po
+++ b/addons/hr_recruitment/i18n/da.po
@@ -11,8 +11,8 @@
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2018-08-24 09:19+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -585,7 +585,7 @@ msgstr "Virksomhed"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_configuration
@@ -758,7 +758,7 @@ msgstr "Beskrivelse"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: hr_recruitment
 #: model_terms:ir.ui.view,arch_db:hr_recruitment.hr_job_simple_form
@@ -779,6 +779,7 @@ msgstr "Vis navn"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -808,7 +809,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model_terms:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: hr_recruitment
 #: model_terms:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban
@@ -1366,7 +1367,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/models/hr_recruitment.py:389
@@ -1744,7 +1745,7 @@ msgstr "Opsætning"
 #. module: hr_recruitment
 #: model_terms:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__source_id
@@ -1835,6 +1836,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: hr_recruitment
 #: model_terms:ir.ui.view,arch_db:hr_recruitment.view_crm_case_jobs_filter
@@ -1931,6 +1936,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Dette er et navn, der hjælper dig med at holde styr på dine forskellige "
+"kampagneindsatser"
 
 #. module: hr_recruitment
 #: model:ir.model.fields,help:hr_recruitment.field_hr_applicant__medium_id
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 412a0d49b36..b264e948e42 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/i18n/ja.po
@@ -4,21 +4,22 @@
 # 
 # Translators:
 # SHIMIZU Taku <shimizu.taku@gmail.com>, 2018
+# NOKA Shigekazu <shigekazu.noka@gmail.com>, 2018
+# kent_ocean <ke.tanabe@gmail.com>, 2018
+# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018
 # Martin Trigaux, 2018
-# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018
 # Manami Hashi <manami@roomsfor.hk>, 2018
-# NOKA Shigekazu <shigekazu.noka@gmail.com>, 2018
 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018
-# kent_ocean <ke.tanabe@gmail.com>, 2018
 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018
-# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018
+# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -368,7 +369,7 @@ msgstr "エイリアス対象モデル"
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ_all_app
 msgid "All Applications"
-msgstr ""
+msgstr "全ての応募"
 
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_applicant
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index a411e0196bf..773014f4552 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -162,7 +162,7 @@ msgstr "Beregnet ud fra det samlede udførte arbejde"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: hr_timesheet
 #: model:ir.ui.menu,name:hr_timesheet.hr_timesheet_menu_configuration
@@ -241,7 +241,7 @@ msgstr "Sortér efter"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: hr_timesheet
 #: model:ir.model.fields,field_description:hr_timesheet.field_project_task__effective_hours
diff --git a/addons/hr_timesheet/models/analytic_account.py b/addons/hr_timesheet/models/analytic_account.py
index 8e794bf4255..574e73962d9 100644
--- a/addons/hr_timesheet/models/analytic_account.py
+++ b/addons/hr_timesheet/models/analytic_account.py
@@ -31,18 +31,16 @@ class AccountAnalyticAccount(models.Model):
 
     @api.multi
     def action_view_projects(self):
-        projects = self.mapped('project_ids')
+        kanban_view_id = self.env.ref('project.view_project_kanban').id
         result = {
             "type": "ir.actions.act_window",
             "res_model": "project.project",
-            "views": [[False, "tree"], [False, "form"]],
-            "domain": [["id", "in", projects.ids]],
+            "views": [[kanban_view_id, "kanban"], [False, "form"]],
+            "domain": [['analytic_account_id', '=', self.id]],
             "context": {"create": False},
             "name": "Projects",
         }
-        if len(projects) == 1:
+        if len(self.project_ids) == 1:
             result['views'] = [(False, "form")]
-            result['res_id'] = projects.id
-        else:
-            result = {'type': 'ir.actions.act_window_close'}
+            result['res_id'] = self.project_ids.id
         return result
diff --git a/addons/http_routing/i18n/da.po b/addons/http_routing/i18n/da.po
index 00782432a5c..f26ad5d7f7c 100644
--- a/addons/http_routing/i18n/da.po
+++ b/addons/http_routing/i18n/da.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:19+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@ msgstr ""
 #. module: http_routing
 #: model:ir.model,name:http_routing.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: http_routing
 #: model:ir.model,name:http_routing.model_ir_ui_view
diff --git a/addons/im_livechat/i18n/im_livechat.pot b/addons/im_livechat/i18n/im_livechat.pot
index 76cd5bd452b..a2a990d379d 100644
--- a/addons/im_livechat/i18n/im_livechat.pot
+++ b/addons/im_livechat/i18n/im_livechat.pot
@@ -332,7 +332,7 @@ msgstr ""
 
 #. module: im_livechat
 #: model_terms:ir.ui.view,arch_db:im_livechat.im_livechat_channel_view_form
-msgid "For website built with Odoo CMS, please install the website_livechat module. Then go to Website Admin &gt; Configuration &gt; Settings and select the Website Live Chat Channel you want to add on your website."
+msgid "For websites built with the Odoo CMS, please install the website_livechat module. Then go to Website &gt; Configuration &gt; Settings and select the Website Live Chat Channel you want to add on your website."
 msgstr ""
 
 #. module: im_livechat
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index 1ee14329089..f9554b99226 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -142,7 +142,7 @@
                                         or copy this url and send it by email to your customers or suppliers:
                                     </p>
                                     <field name="web_page" readonly="1" widget="CopyClipboardChar"/>
-                                    <p>For website built with Odoo CMS, please install the website_livechat module. Then go to Website Admin > Configuration > Settings and select the Website Live Chat Channel you want to add on your website.</p>
+                                    <p>For websites built with the Odoo CMS, please install the website_livechat module. Then go to Website > Configuration > Settings and select the Website Live Chat Channel you want to add on your website.</p>
                                 </div>
                             </group>
                         </page>
diff --git a/addons/im_support/i18n/da.po b/addons/im_support/i18n/da.po
index 61dad513ee0..a299ecd241e 100644
--- a/addons/im_support/i18n/da.po
+++ b/addons/im_support/i18n/da.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:20+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +30,7 @@ msgstr ""
 #. module: im_support
 #: model:ir.model,name:im_support.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: im_support
 #: model_terms:ir.ui.view,arch_db:im_support.support_qunit_suite
diff --git a/addons/l10n_de/models/chart_template.py b/addons/l10n_de/models/chart_template.py
index d5c5c0ba114..0ba279d14e8 100644
--- a/addons/l10n_de/models/chart_template.py
+++ b/addons/l10n_de/models/chart_template.py
@@ -8,9 +8,10 @@ class AccountChartTemplate(models.Model):
     @api.model
     def _prepare_transfer_account_for_direct_creation(self, name, company):
         res = super(AccountChartTemplate, self)._prepare_transfer_account_for_direct_creation(name, company)
-        xml_id = self.env.ref('l10n_de.tag_de_asset_bs_B_III_2').id
-        res.setdefault('tag_ids', [])
-        res['tag_ids'].append((4, xml_id))
+        if company.country_id.code == 'DE':
+            xml_id = self.env.ref('l10n_de.tag_de_asset_bs_B_III_2').id
+            res.setdefault('tag_ids', [])
+            res['tag_ids'].append((4, xml_id))
         return res
 
     # Write paperformat and report template used on company
diff --git a/addons/l10n_do/__manifest__.py b/addons/l10n_do/__manifest__.py
index 7e88baeb67f..596c03d9221 100644
--- a/addons/l10n_do/__manifest__.py
+++ b/addons/l10n_do/__manifest__.py
@@ -89,6 +89,7 @@ en Odoo):
                 ],
     'data': [
         # Basic accounting data
+        'data/account_group.xml',
         'data/l10n_do_chart_data.xml',
         'data/account_account_tag_data.xml',
         'data/account.account.template.csv',
diff --git a/addons/l10n_do/data/account.account.template.csv b/addons/l10n_do/data/account.account.template.csv
index edc22fcd988..594e5f02df8 100644
--- a/addons/l10n_do/data/account.account.template.csv
+++ b/addons/l10n_do/data/account.account.template.csv
@@ -1,281 +1,281 @@
-id,code,name,user_type_id/id,reconcile,chart_template_id/id,tag_ids/id
-do_niif_11010301,11010301,Depósitos a corto plazo en RD$,account.data_account_type_liquidity,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1101,account_tag_110103"
-do_niif_11010302,11010302,Depósitos a corto plazo en USD$,account.data_account_type_liquidity,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1101,account_tag_110103"
-do_niif_11020100,11020100,Bonos y Acciones Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102"
-do_niif_11020200,11020200,Operaciones en Bolsa,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102"
-do_niif_11020300,11020300,Otros Valores Negociables,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102"
-do_niif_11030101,11030101,Cheques Devueltos por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110301"
-do_niif_11030102,11030102,Intereses por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110301"
-do_niif_11030201,11030201,Cuentas por Cobrar a Clientes,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302"
-do_niif_11030202,11030202,Cuentas por Cobrar a Funcionarios y Empleados,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302"
-do_niif_11030203,11030203,Cuentas por Cobrar a Afiliadas,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302"
-do_niif_11030204,11030204,Cuentas por Cobrar a Accionistas,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302"
-do_niif_11030205,11030205,Otras Cuentas por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302"
-do_niif_11040100,11040100,Provisiones de Incobrables a Clientes,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104"
-do_niif_11040200,11040200,Provisiones de Incobrables a Funcionarios y Empleados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104"
-do_niif_11040300,11040300,Provisiones de Incobrables a Afiliadas,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104"
-do_niif_11040400,11040400,Provisiones de Incobrables a Accionistas,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104"
-do_niif_11040500,11040500,Provisiones de Otras Cuentas Incobrables,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104"
-do_niif_11050100,11050100,Inventario de Mercancías o Productos Terminados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11050200,11050200,Inventario de Materia Prima,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11050300,11050300,Inventario en Tránsito,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11050400,11050400,Inventario de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11050500,11050500,Inventario de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11050600,11050600,Bienes Enviados No Facturados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105"
-do_niif_11060100,11060100,Deterioro Acum. de Inventario en Almacen,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106"
-do_niif_11060200,11060200,Deterioro Acum. de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106"
-do_niif_11060300,11060300,Deterioro Acum. de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106"
-do_niif_11070100,11070100,Obsolescencia de Inventario en Almacen,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107"
-do_niif_11070200,11070200,Obsolescencia de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107"
-do_niif_11070300,11070300,Obsolescencia de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107"
-do_niif_11080101,11080101,ITBIS Pagado en Compras de Bienes Locales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080102,11080102,ITBIS Pagado en Compras de Servicios Deducibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080103,11080103,ITBIS Pagado en Importaciones,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080104,11080104,ITBIS en Compras de Bienes o Servicios Sujetos a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080105,11080105,ITBIS en Importaciones Sujeto a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080106,11080106,ITBIS Pagado en Importaciones Sujeto a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801"
-do_niif_11080301,11080301,ITBIS Retenido por Ventas (N08-04 y N02-05),account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803"
-do_niif_11080302,11080302,ITBIS Retenido por Entidades del Estado (5%),account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803"
-do_niif_11080303,11080303,Saldo a Favor Anterior,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803"
-do_niif_11090100,11090100,Acciones Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109"
-do_niif_11090200,11090200,Depósitos a Plazo Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109"
-do_niif_11090300,11090300,Bonos Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109"
-do_niif_11090400,11090400,Fianzas y Depósitos,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109"
-do_niif_11100100,11100100,Avance a Proveedores,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_11100200,11100200,Alquileres pagados por Anticipado,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_11100300,11100300,Anticipos para Seguros,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_11100400,11100400,Anticipos para ISR,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_11100500,11100500,Anticipos para Gastos,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_11100600,11100600,Anticipos para 1% Activos,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110"
-do_niif_12010101,12010101,Terrenos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101"
-do_niif_12010102,12010102,Edificaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101"
-do_niif_12010103,12010103,Mejoras en Edificaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101"
-do_niif_12010104,12010104,Mejoras en Edificaciones y Locales Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101"
-do_niif_12010201,12010201,Equipos de Transporte Liviano,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120102"
-do_niif_12010202,12010202,Mobiliarios y Equipos de Oficina,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120102"
-do_niif_12010301,12010301,Maquinarias,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103"
-do_niif_12010302,12010302,Herramientas,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103"
-do_niif_12010303,12010303,Instalaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103"
-do_niif_12010304,12010304,Sistemas de Cámara y Seguridad,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103"
-do_niif_12010305,12010305,Misceláneos u otros activos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103"
-do_niif_12020100,12020100,Depreciación Acum. de Edificios,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12020200,12020200,Depreciación Acum. de Equipos de Transporte,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12020300,12020300,Depreciación Acum. de Mobiliarios y Equipos,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12020400,12020400,Depreciación Acum. de Maquinarias,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12020500,12020500,Depreciación Acum. de Herramientas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12020600,12020600,Depreciación Acum. de Instalaciones,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202"
-do_niif_12040100,12040100,Marcas y Patentes,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1204"
-do_niif_12040200,12040200,Licencias y Programas Informáticos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1204"
-do_niif_12050100,12050100,Edificaciones y Locales Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205"
-do_niif_12050200,12050200,Maquinarias y Equipos Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205"
-do_niif_12050300,12050300,Instalaciones Arrendadas,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205"
-do_niif_12060100,12060100,Depreciación Acum. Edificaciones y Locales Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206"
-do_niif_12060200,12060200,Depreciación Acum. Maquinarias y Equipos Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206"
-do_niif_12060300,12060300,Depreciación Acum. Instalaciones Arrendadas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206"
-do_niif_12070100,12070100,Deterioro Valor Acum. Edificios y Locales Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207"
-do_niif_12070200,12070200,Deterioro Valor Acum. Maquinaria y Equipo Arrendado,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207"
-do_niif_12070300,12070300,Deterioro Valor Acum. Instalaciones Arrendadas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207"
-do_niif_12080100,12080100,Acciones en otras sociedades,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1208"
-do_niif_12090100,12090100,Diferencias temporales deducibles,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209"
-do_niif_12090200,12090200,Gastos Organizacionales Diferidos,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209"
-do_niif_12090300,12090300,ISR Deducible,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209"
-do_niif_13010100,13010101,Costos de Construcción en Proceso,account.data_account_type_non_current_assets,FALSE,do_chart_template,
-do_niif_21010100,21010100,Préstamos Bancarios por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010200,21010200,Cuentas por Pagar a Proveedores Locales,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010300,21010300,Cuentas por Pagar a Proveedores del Exterior,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010400,21010400,Cuentas por Pagar a Afiliadas,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010500,21010500,Cuentas por Pagar a Accionistas,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010600,21010600,Nóminas por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010700,21010700,Intereses por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21010800,21010800,Otras Cuentas por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101"
-do_niif_21020100,21020100,Dividendos por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020200,21020200,Comisiones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020300,21020300,Vacaciones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020400,21020400,Bonificaciones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020500,21020500,Regalía Pascual por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020600,21020600,Seguro Médico por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020700,21020700,Seguro Familiar de Salud (SFS) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020800,21020800,Aporte a Fondo de Pensiones (AFP) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21020900,21020900,Seguro de Riesgo Laboral (SRL) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21021000,21021000,INFOTEP por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21021100,21021100,Tesorería de la Seguridad Social (TSS) por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21021200,21021200,Bienes Recibidos no Facturados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102"
-do_niif_21030101,21030101,ITBIS por Venta Servicios,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301"
-do_niif_21030102,21030102,ITBIS por Venta Bienes,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301"
-do_niif_21030103,21030103,ITBIS por Venta Servicios en Nombre de Terceros,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301"
-do_niif_21030201,21030201,ITBIS Retenido a Persona Jurídica (N02-05),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302"
-do_niif_21030202,21030202,ITBIS Retenido a Persona Física (R293-11),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302"
-do_niif_21030203,21030203,ITBIS Retenido a Entidades No Lucrativas (N01-11),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302"
-do_niif_21030204,21030204,ITBIS Retenido por Servicios Profesionales (N02-05),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302"
-do_niif_21030205,21030205,ITBIS Retenido a Informales de Bienes (N08-10),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302"
-do_niif_21030301,21030301,ISR Retenido por Honorarios Profesionales de Personas Físicas,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030302,21030302,ISR Retenido por Alquileres Pagados a Personas Físicas,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030303,21030303,ISR Retenido por Dividendos Pagados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030304,21030304,ISR Retenido por Intereses Pagados al Exterior,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030305,21030305,ISR Retenido por Intereses Pagados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030306,21030306,ISR Retenido por Transferencias de Títulos y Propiedades,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030307,21030307,ISR Retenido por Remesas al Exterior (L253-12),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030308,21030308,Otras Retenciones (N07-07),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030309,21030309,Otras Retenciones,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303"
-do_niif_21030401,21030401,Retención de Impuesto al Salario (ISR del IR3),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304"
-do_niif_21030402,21030402,Retención de Seguro Familiar de Salud (SFS),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304"
-do_niif_21030403,21030403,Retención de Fondo de Pensiones (AFP),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304"
-do_niif_21030404,21030404,Retención de INFOTEP (0.5%),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304"
-do_niif_21030501,21030501,ISR por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305"
-do_niif_21030502,21030502,Anticipos ISR por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305"
-do_niif_21030503,21030503,Propina Legal por Pagar (L16-92),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305"
-do_niif_21030504,21030504,Otros Impuestos por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305"
-do_niif_21040100,21040100,Provisiones Pago Alquileres,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104"
-do_niif_21040200,21040200,Provisiones Arrendamiento Financiero,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104"
-do_niif_21040300,21040300,Provisiones Gastos Fijos,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104"
-do_niif_21050100,21050100,Tarjeta de Crédito Empresarial,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2105"
-do_niif_21050200,21050200,Prima de Tarjetas de Crédito,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2105"
-do_niif_22010100,22010100,Préstamos Bancarios Largo Plazo,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201"
-do_niif_22010200,22010200,Préstamos Hipotecarios LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201"
-do_niif_22012300,22012300,Préstamos Accionistas / Particulares,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201"
-do_niif_22020100,22020100,Provisiones Beneficios de Empleados LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202"
-do_niif_22020200,22020200,Provisiones Prestaciones Laborales,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202"
-do_niif_22020300,22020300,Provisiones Indemnizaciones,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202"
-do_niif_22030100,22030100,Anticipos o Garantías de Clientes,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2203"
-do_niif_22030200,22030200,Depósitos por Identificar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2203"
-do_niif_22040100,22040100,Provisiones Arrendamiento Financiero LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2204"
-do_niif_31010100,31010100,Capital Social Autorizado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101"
-do_niif_31010200,31010200,Capital Social en Acciones no Emitidas,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101"
-do_niif_31010300,31010300,Capital Social Pagado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101"
-do_niif_31010400,31010400,Capital Social No Pagado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101"
-do_niif_31010500,31010500,Acciones o Participaciones en Tesorería,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101"
-do_niif_31020100,31020100,Superávit por Revaluación de Terrenos,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102"
-do_niif_31020200,31020200,Superávit por Revaluación de Edificaciones,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102"
-do_niif_31020300,31020300,Superávit por Revaluación de Instalaciones,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102"
-do_niif_31020400,31020400,Superávit por Revaluación de Mobiliario y Equipo,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102"
-do_niif_32010100,32010100,Reserva Legal,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_32,account_tag_3201"
-do_niif_33010100,33010100,Utilidades de Ejercicios Anteriores,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3301"
-do_niif_33010200,33010200,Pérdidas de Ejercicios Anteriores,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3301"
-do_niif_33020100,33020100,Utilidad del Ejercicio,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3302"
-do_niif_33020200,33020200,Pérdidas del Ejercicio,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3302"
-do_niif_33040100,33040100,Superávit en Reserva,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3304"
-do_niif_33040200,33040200,Déficit en Reserva,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3304"
-do_niif_41010100,41010100,Ventas de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4101"
-do_niif_41010200,41010200,Ventas por Exportaciones de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4101"
-do_niif_41020100,41020100,Ventas de Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4102"
-do_niif_41020200,41020200,Ventas por Exportaciones de Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4102"
-do_niif_41030100,41030100,Devoluciones de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4103"
-do_niif_41030200,41030200,Devoluciones por Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4103"
-do_niif_41040100,41040100,Descuentos por Ventas (por NC),account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4104"
-do_niif_42010100,42010100,Intereses sobre Certificados,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201"
-do_niif_42010200,42010200,Intereses por Cuentas Bancarias,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201"
-do_niif_42010300,42010300,Intereses por Financiamientos,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201"
-do_niif_42020100,42020100,Ingresos por Ventas de Activos Depreciables (CAT II y III) ,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4202"
-do_niif_42030100,42030100,Ingresos por Dividendos Ganados,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4203"
-do_niif_42040100,42040100,Ingresos por Diferencia Cambiaria,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204"
-do_niif_42040200,42040200,Cobro de Cuentas Incobrables,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204"
-do_niif_42040300,42040300,Ingresos por Sobrante en Caja,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204"
-do_niif_51010100,51010100,Costos de Bienes,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101"
-do_niif_51010200,51010200,Costos de Servicios,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101"
-do_niif_51010300,51010300,Diferencia en Precio,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101"
-do_niif_51020400,51020400,Costos de Importación,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102"
-do_niif_51010500,51010500,ITBIS llevado al Costo,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101"
-do_niif_51020100,51020100,Costos de Materia Prima,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102"
-do_niif_51020200,51020200,Costos de Mano de Obra,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102"
-do_niif_51020300,51020300,Costos Indirectos,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102"
-do_niif_52010100,61010100,Sueldos y Salarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010200,61010200,Regalía Pascual,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010300,61010300,Retribuciones Complementarias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010400,61010400,Bono Vacacional,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010500,61010500,Bono por Desempeño,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010600,61010600,Comisiones a Empleados,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010700,61010700,Indemnizaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010800,61010800,Bonificaciones y Gratificaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010900,61010900,Comidas o Dietas al Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011000,61011000,Cursos y Entrenamientos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011100,61011100,Prestaciones Laborales (Preaviso y Cesantia),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011200,61011200,Incentivos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011300,61011300,Horas Extras,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011400,61011400,Uniformes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52011500,61011500,Otros Gastos de Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201"
-do_niif_52010102,61010102,Contribución a la Administradora de Fondos de Pensiones (AFP),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101"
-do_niif_52010103,61010103,Contribución al Seguro Riesgo Laboral (SRL),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101"
-do_niif_52010104,61010104,Contribución al Seguro Familiar de Salud (SFS),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101"
-do_niif_52010201,61010201,Contribución a la Administradora de Riesgos de Salud (ARS),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102"
-do_niif_52010202,61010202,Contribución a Seguros del Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102"
-do_niif_52010203,61010203,Contribución a Planes Complementarios de Salud,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102"
-do_niif_52010204,61010204,Contribución Seguros de Vida,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102"
-do_niif_52010205,61010205,Contribución al INFOTEP,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102"
-do_niif_52020100,61020100,Energía Eléctrica,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020200,61020200,Comunicaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020300,61020300,Suministros de Oficina (Papelería y útiles),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020400,61020400,Útiles de Aseo y Limpieza,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020500,61020500,Agua y Basura,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020600,61020600,Seguro de Edificio y Locales,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020700,61020700,Combustibles y Lubricantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020800,61020800,Alquileres / Arrendamientos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52020900,61020900,Franquicias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021000,61021000,Eventos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021100,61021100,Seguros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021200,61021200,Servicios de Mensajería,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021300,61021300,Flete y Carga,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021400,61021400,Cuotas y Suscripciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52021500,61021500,Alojamiento en Hoteles,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202"
-do_niif_52030101,61030101,Legales (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030102,61030102,Contabilidad y Auditoría (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030103,61030103,Tecnología (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030104,61030104,Mantenimientos de Planta (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030105,61030105,Mantenimientos de Local (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030106,61030106,Mantenimientos Mobiliarios y Equipos (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030107,61030107,Asesorías (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030108,61030108,Fumigaciones (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030109,61030109,Copias y Escaneos (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030110,61030110,Servicios de Vigilancia (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030111,61030111,Otros Servicios Profesionales (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301"
-do_niif_52030201,61030201,Legales (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030202,61030202,Contabilidad y Auditoría (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030203,61030203,Tecnología (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030204,61030204,Mantenimiento de Planta (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030205,61030205,Mantenimiento del Local (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030206,61030206,Mantenimiento Mobiliario y Equipos (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030207,61030207,Asesorías (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030208,61030208,Fumigaciones (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030209,61030209,Copias y Escaneos (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030210,61030210,Servicios de Vigilancia (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030211,61030211,Otros Servicios Profesionales  (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302"
-do_niif_52030301,61030301,Honorarios por Servicios del Exterior - Relacionadas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520303"
-do_niif_52030302,61030302,Honorarios por Servicios del Exterior - Terceros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520303"
-do_niif_52040100,61040100,Gastos por Depreciación de Edificios,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52040200,61040200,Gastos por Depreciación de Equipo de Transporte,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52040300,61040300,Gastos por Depreciación de Mobiliario y Equipos,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52040400,61040400,Gastos por Depreciación de Maquinaria,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52040500,61040500,Gastos por Depreciación de Herramientas,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52040600,61040600,Gastos por Depreciación de Instalaciones,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204"
-do_niif_52050100,61050100,Gastos por Reparación de Edificios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52050200,61050200,Gastos por Reparación de Equipo de Transporte,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52050300,61050300,Gastos por Reparación de Mobiliario y Equipos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52050400,61050400,Gastos por Reparación de Maquinaria,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52050500,61050500,Gastos por Reparación de Herramientas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52050600,61050600,Gastos por Reparación de Instalaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205"
-do_niif_52060100,61060100,Relaciones Públicas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060200,61060200,Publicidad,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060300,61060300,Gastos de Viajes y Representación,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060400,61060400,Donaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060500,61060500,Donaciones a ProIndustria (Ley 392-07),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060600,61060600,Promociones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52060700,61060700,Gastos en Restaurantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206"
-do_niif_52070100,61070100,Gastos por Préstamos Financieros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070200,61070200,Retención por Cheques o Transferencias Electrónicas (0.15%),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070300,61070300,Intereses Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070400,61070400,Comisiones Bancarias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070500,61070500,Comisiones de Tarjeta de Crédito,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070600,61070600,Cargos Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070700,61070700,Seguro sobre Préstamos Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070800,61070800,Pérdidas por Diferencia Cambiaria,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52070900,61070900,Otro Gastos Financieros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207"
-do_niif_52080100,61080100,Pérdidas por Faltante en Caja,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080200,61080200,Pérdidas por Ventas de Activos Fijos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080300,61080300,Pérdidas por Cuentas Incobrables,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080400,61080400,Gastos por ISR,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080500,61080500,Impuestos a los Activos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080600,61080600,Gastos por Penalidades/Recargos de DGII,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080700,61080700,Gastos por Penalidades/Recargos de TSS,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080800,61080800,Gastos sin Comprobantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52080900,61080900,Gastos No Deducibles,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_52081000,61081000,Gastos por Impuestos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208"
-do_niif_61010100,71010100,Ganancias o Pérdidas,account.data_unaffected_earnings,FALSE,do_chart_template,"account_tag_7,account_tag_61,account_tag_6101"
+id,code,name,user_type_id/id,reconcile,chart_template_id/id,tag_ids/id,group_id/id
+do_niif_11010301,11010301,Depósitos a corto plazo en RD$,account.data_account_type_liquidity,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1101,account_tag_110103",l10n_do.account_group_110103
+do_niif_11010302,11010302,Depósitos a corto plazo en USD$,account.data_account_type_liquidity,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1101,account_tag_110103",l10n_do.account_group_110103
+do_niif_11020100,11020100,Bonos y Acciones Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102",l10n_do.account_group_1102
+do_niif_11020200,11020200,Operaciones en Bolsa,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102",l10n_do.account_group_1102
+do_niif_11020300,11020300,Otros Valores Negociables,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1102",l10n_do.account_group_1102
+do_niif_11030101,11030101,Cheques Devueltos por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110301",l10n_do.account_group_110301
+do_niif_11030102,11030102,Intereses por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110301",l10n_do.account_group_110301
+do_niif_11030201,11030201,Cuentas por Cobrar a Clientes,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302",l10n_do.account_group_110302
+do_niif_11030202,11030202,Cuentas por Cobrar a Funcionarios y Empleados,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302",l10n_do.account_group_110302
+do_niif_11030203,11030203,Cuentas por Cobrar a Afiliadas,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302",l10n_do.account_group_110302
+do_niif_11030204,11030204,Cuentas por Cobrar a Accionistas,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302",l10n_do.account_group_110302
+do_niif_11030205,11030205,Otras Cuentas por Cobrar,account.data_account_type_receivable,TRUE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1103,account_tag_110302",l10n_do.account_group_110302
+do_niif_11040100,11040100,Provisiones de Incobrables a Clientes,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104",l10n_do.account_group_1104
+do_niif_11040200,11040200,Provisiones de Incobrables a Funcionarios y Empleados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104",l10n_do.account_group_1104
+do_niif_11040300,11040300,Provisiones de Incobrables a Afiliadas,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104",l10n_do.account_group_1104
+do_niif_11040400,11040400,Provisiones de Incobrables a Accionistas,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104",l10n_do.account_group_1104
+do_niif_11040500,11040500,Provisiones de Otras Cuentas Incobrables,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1104",l10n_do.account_group_1104
+do_niif_11050100,11050100,Inventario de Mercancías o Productos Terminados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11050200,11050200,Inventario de Materia Prima,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11050300,11050300,Inventario en Tránsito,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11050400,11050400,Inventario de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11050500,11050500,Inventario de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11050600,11050600,Bienes Enviados No Facturados,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1105",l10n_do.account_group_1105
+do_niif_11060100,11060100,Deterioro Acum. de Inventario en Almacen,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106",l10n_do.account_group_1106
+do_niif_11060200,11060200,Deterioro Acum. de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106",l10n_do.account_group_1106
+do_niif_11060300,11060300,Deterioro Acum. de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1106",l10n_do.account_group_1106
+do_niif_11070100,11070100,Obsolescencia de Inventario en Almacen,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107",l10n_do.account_group_1107
+do_niif_11070200,11070200,Obsolescencia de Materiales y Suministros,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107",l10n_do.account_group_1107
+do_niif_11070300,11070300,Obsolescencia de Combustibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1107",l10n_do.account_group_1107
+do_niif_11080101,11080101,ITBIS Pagado en Compras de Bienes Locales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080102,11080102,ITBIS Pagado en Compras de Servicios Deducibles,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080103,11080103,ITBIS Pagado en Importaciones,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080104,11080104,ITBIS en Compras de Bienes o Servicios Sujetos a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080105,11080105,ITBIS en Importaciones Sujeto a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080106,11080106,ITBIS Pagado en Importaciones Sujeto a Proporcionalidad,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110801",l10n_do.account_group_110801
+do_niif_11080301,11080301,ITBIS Retenido por Ventas (N08-04 y N02-05),account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803",l10n_do.account_group_110803
+do_niif_11080302,11080302,ITBIS Retenido por Entidades del Estado (5%),account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803",l10n_do.account_group_110803
+do_niif_11080303,11080303,Saldo a Favor Anterior,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1108,account_tag_110803",l10n_do.account_group_110803
+do_niif_11090100,11090100,Acciones Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109",l10n_do.account_group_1109
+do_niif_11090200,11090200,Depósitos a Plazo Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109",l10n_do.account_group_1109
+do_niif_11090300,11090300,Bonos Temporales,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109",l10n_do.account_group_1109
+do_niif_11090400,11090400,Fianzas y Depósitos,account.data_account_type_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1109",l10n_do.account_group_1109
+do_niif_11100100,11100100,Avance a Proveedores,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_11100200,11100200,Alquileres pagados por Anticipado,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_11100300,11100300,Anticipos para Seguros,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_11100400,11100400,Anticipos para ISR,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_11100500,11100500,Anticipos para Gastos,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_11100600,11100600,Anticipos para 1% Activos,account.data_account_type_prepayments,FALSE,do_chart_template,"account_tag_1,account_tag_11,account_tag_1110",l10n_do.account_group_1110
+do_niif_12010101,12010101,Terrenos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101",l10n_do.account_group_120101
+do_niif_12010102,12010102,Edificaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101",l10n_do.account_group_120101
+do_niif_12010103,12010103,Mejoras en Edificaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101",l10n_do.account_group_120101
+do_niif_12010104,12010104,Mejoras en Edificaciones y Locales Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120101",l10n_do.account_group_120101
+do_niif_12010201,12010201,Equipos de Transporte Liviano,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120102",l10n_do.account_group_120102
+do_niif_12010202,12010202,Mobiliarios y Equipos de Oficina,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120102",l10n_do.account_group_120102
+do_niif_12010301,12010301,Maquinarias,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103",l10n_do.account_group_120103
+do_niif_12010302,12010302,Herramientas,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103",l10n_do.account_group_120103
+do_niif_12010303,12010303,Instalaciones,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103",l10n_do.account_group_120103
+do_niif_12010304,12010304,Sistemas de Cámara y Seguridad,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103",l10n_do.account_group_120103
+do_niif_12010305,12010305,Misceláneos u otros activos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1201,account_tag_120103",l10n_do.account_group_120103
+do_niif_12020100,12020100,Depreciación Acum. de Edificios,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12020200,12020200,Depreciación Acum. de Equipos de Transporte,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12020300,12020300,Depreciación Acum. de Mobiliarios y Equipos,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12020400,12020400,Depreciación Acum. de Maquinarias,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12020500,12020500,Depreciación Acum. de Herramientas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12020600,12020600,Depreciación Acum. de Instalaciones,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1202",l10n_do.account_group_1202
+do_niif_12040100,12040100,Marcas y Patentes,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1204",l10n_do.account_group_1204
+do_niif_12040200,12040200,Licencias y Programas Informáticos,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1204",l10n_do.account_group_1204
+do_niif_12050100,12050100,Edificaciones y Locales Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205",l10n_do.account_group_1205
+do_niif_12050200,12050200,Maquinarias y Equipos Arrendados,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205",l10n_do.account_group_1205
+do_niif_12050300,12050300,Instalaciones Arrendadas,account.data_account_type_fixed_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1205",l10n_do.account_group_1205
+do_niif_12060100,12060100,Depreciación Acum. Edificaciones y Locales Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206",l10n_do.account_group_1206
+do_niif_12060200,12060200,Depreciación Acum. Maquinarias y Equipos Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206",l10n_do.account_group_1206
+do_niif_12060300,12060300,Depreciación Acum. Instalaciones Arrendadas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1206",l10n_do.account_group_1206
+do_niif_12070100,12070100,Deterioro Valor Acum. Edificios y Locales Arrendados,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207",l10n_do.account_group_1207
+do_niif_12070200,12070200,Deterioro Valor Acum. Maquinaria y Equipo Arrendado,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207",l10n_do.account_group_1207
+do_niif_12070300,12070300,Deterioro Valor Acum. Instalaciones Arrendadas,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1207",l10n_do.account_group_1207
+do_niif_12080100,12080100,Acciones en otras sociedades,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1208",l10n_do.account_group_1208
+do_niif_12090100,12090100,Diferencias temporales deducibles,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209",l10n_do.account_group_1209
+do_niif_12090200,12090200,Gastos Organizacionales Diferidos,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209",l10n_do.account_group_1209
+do_niif_12090300,12090300,ISR Deducible,account.data_account_type_non_current_assets,FALSE,do_chart_template,"account_tag_1,account_tag_12,account_tag_1209",l10n_do.account_group_1209
+do_niif_13010100,13010101,Costos de Construcción en Proceso,account.data_account_type_non_current_assets,FALSE,do_chart_template,,
+do_niif_21010100,21010100,Préstamos Bancarios por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010200,21010200,Cuentas por Pagar a Proveedores Locales,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010300,21010300,Cuentas por Pagar a Proveedores del Exterior,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010400,21010400,Cuentas por Pagar a Afiliadas,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010500,21010500,Cuentas por Pagar a Accionistas,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010600,21010600,Nóminas por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010700,21010700,Intereses por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21010800,21010800,Otras Cuentas por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2101",l10n_do.account_group_2101
+do_niif_21020100,21020100,Dividendos por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020200,21020200,Comisiones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020300,21020300,Vacaciones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020400,21020400,Bonificaciones por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020500,21020500,Regalía Pascual por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020600,21020600,Seguro Médico por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020700,21020700,Seguro Familiar de Salud (SFS) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020800,21020800,Aporte a Fondo de Pensiones (AFP) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21020900,21020900,Seguro de Riesgo Laboral (SRL) por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21021000,21021000,INFOTEP por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21021100,21021100,Tesorería de la Seguridad Social (TSS) por Pagar,account.data_account_type_payable,TRUE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21021200,21021200,Bienes Recibidos no Facturados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2102",l10n_do.account_group_2102
+do_niif_21030101,21030101,ITBIS por Venta Servicios,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301",l10n_do.account_group_210301
+do_niif_21030102,21030102,ITBIS por Venta Bienes,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301",l10n_do.account_group_210301
+do_niif_21030103,21030103,ITBIS por Venta Servicios en Nombre de Terceros,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210301",l10n_do.account_group_210301
+do_niif_21030201,21030201,ITBIS Retenido a Persona Jurídica (N02-05),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302",l10n_do.account_group_210302
+do_niif_21030202,21030202,ITBIS Retenido a Persona Física (R293-11),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302",l10n_do.account_group_210302
+do_niif_21030203,21030203,ITBIS Retenido a Entidades No Lucrativas (N01-11),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302",l10n_do.account_group_210302
+do_niif_21030204,21030204,ITBIS Retenido por Servicios Profesionales (N02-05),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302",l10n_do.account_group_210302
+do_niif_21030205,21030205,ITBIS Retenido a Informales de Bienes (N08-10),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210302",l10n_do.account_group_210302
+do_niif_21030301,21030301,ISR Retenido por Honorarios Profesionales de Personas Físicas,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030302,21030302,ISR Retenido por Alquileres Pagados a Personas Físicas,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030303,21030303,ISR Retenido por Dividendos Pagados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030304,21030304,ISR Retenido por Intereses Pagados al Exterior,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030305,21030305,ISR Retenido por Intereses Pagados,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030306,21030306,ISR Retenido por Transferencias de Títulos y Propiedades,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030307,21030307,ISR Retenido por Remesas al Exterior (L253-12),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030308,21030308,Otras Retenciones (N07-07),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030309,21030309,Otras Retenciones,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210303",l10n_do.account_group_210303
+do_niif_21030401,21030401,Retención de Impuesto al Salario (ISR del IR3),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304",l10n_do.account_group_210304
+do_niif_21030402,21030402,Retención de Seguro Familiar de Salud (SFS),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304",l10n_do.account_group_210304
+do_niif_21030403,21030403,Retención de Fondo de Pensiones (AFP),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304",l10n_do.account_group_210304
+do_niif_21030404,21030404,Retención de INFOTEP (0.5%),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210304",l10n_do.account_group_210304
+do_niif_21030501,21030501,ISR por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305",l10n_do.account_group_210305
+do_niif_21030502,21030502,Anticipos ISR por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305",l10n_do.account_group_210305
+do_niif_21030503,21030503,Propina Legal por Pagar (L16-92),account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305",l10n_do.account_group_210305
+do_niif_21030504,21030504,Otros Impuestos por Pagar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2103,account_tag_210305",l10n_do.account_group_210305
+do_niif_21040100,21040100,Provisiones Pago Alquileres,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104",l10n_do.account_group_2104
+do_niif_21040200,21040200,Provisiones Arrendamiento Financiero,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104",l10n_do.account_group_2104
+do_niif_21040300,21040300,Provisiones Gastos Fijos,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2104",l10n_do.account_group_2104
+do_niif_21050100,21050100,Tarjeta de Crédito Empresarial,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2105",l10n_do.account_group_2105
+do_niif_21050200,21050200,Prima de Tarjetas de Crédito,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_21,account_tag_2105",l10n_do.account_group_2105
+do_niif_22010100,22010100,Préstamos Bancarios Largo Plazo,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201",l10n_do.account_group_2201
+do_niif_22010200,22010200,Préstamos Hipotecarios LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201",l10n_do.account_group_2201
+do_niif_22012300,22012300,Préstamos Accionistas / Particulares,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2201",l10n_do.account_group_2201
+do_niif_22020100,22020100,Provisiones Beneficios de Empleados LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202",l10n_do.account_group_2202
+do_niif_22020200,22020200,Provisiones Prestaciones Laborales,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202",l10n_do.account_group_2202
+do_niif_22020300,22020300,Provisiones Indemnizaciones,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2202",l10n_do.account_group_2202
+do_niif_22030100,22030100,Anticipos o Garantías de Clientes,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2203",l10n_do.account_group_2203
+do_niif_22030200,22030200,Depósitos por Identificar,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2203",l10n_do.account_group_2203
+do_niif_22040100,22040100,Provisiones Arrendamiento Financiero LP,account.data_account_type_non_current_liabilities,FALSE,do_chart_template,"account_tag_2,account_tag_22,account_tag_2204",l10n_do.account_group_2204
+do_niif_31010100,31010100,Capital Social Autorizado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101",l10n_do.account_group_3101
+do_niif_31010200,31010200,Capital Social en Acciones no Emitidas,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101",l10n_do.account_group_3101
+do_niif_31010300,31010300,Capital Social Pagado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101",l10n_do.account_group_3101
+do_niif_31010400,31010400,Capital Social No Pagado,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101",l10n_do.account_group_3101
+do_niif_31010500,31010500,Acciones o Participaciones en Tesorería,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3101",l10n_do.account_group_3101
+do_niif_31020100,31020100,Superávit por Revaluación de Terrenos,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102",l10n_do.account_group_3102
+do_niif_31020200,31020200,Superávit por Revaluación de Edificaciones,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102",l10n_do.account_group_3102
+do_niif_31020300,31020300,Superávit por Revaluación de Instalaciones,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102",l10n_do.account_group_3102
+do_niif_31020400,31020400,Superávit por Revaluación de Mobiliario y Equipo,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_31,account_tag_3102",l10n_do.account_group_3102
+do_niif_32010100,32010100,Reserva Legal,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_32,account_tag_3201",l10n_do.account_group_3201
+do_niif_33010100,33010100,Utilidades de Ejercicios Anteriores,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3301",l10n_do.account_group_3301
+do_niif_33010200,33010200,Pérdidas de Ejercicios Anteriores,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3301",l10n_do.account_group_3301
+do_niif_33020100,33020100,Utilidad del Ejercicio,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3302",l10n_do.account_group_3302
+do_niif_33020200,33020200,Pérdidas del Ejercicio,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3302",l10n_do.account_group_3302
+do_niif_33040100,33040100,Superávit en Reserva,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3304",l10n_do.account_group_3304
+do_niif_33040200,33040200,Déficit en Reserva,account.data_account_type_equity,FALSE,do_chart_template,"account_tag_3,account_tag_33,account_tag_3304",l10n_do.account_group_3304
+do_niif_41010100,41010100,Ventas de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4101",l10n_do.account_group_4101
+do_niif_41010200,41010200,Ventas por Exportaciones de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4101",l10n_do.account_group_4101
+do_niif_41020100,41020100,Ventas de Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4102",l10n_do.account_group_4102
+do_niif_41020200,41020200,Ventas por Exportaciones de Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4102",l10n_do.account_group_4102
+do_niif_41030100,41030100,Devoluciones de Bienes,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4103",l10n_do.account_group_4103
+do_niif_41030200,41030200,Devoluciones por Servicios,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4103",l10n_do.account_group_4103
+do_niif_41040100,41040100,Descuentos por Ventas (por NC),account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_41,account_tag_4104",l10n_do.account_group_4104
+do_niif_42010100,42010100,Intereses sobre Certificados,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201",l10n_do.account_group_4201
+do_niif_42010200,42010200,Intereses por Cuentas Bancarias,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201",l10n_do.account_group_4201
+do_niif_42010300,42010300,Intereses por Financiamientos,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4201",l10n_do.account_group_4201
+do_niif_42020100,42020100,Ingresos por Ventas de Activos Depreciables (CAT II y III) ,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4202",l10n_do.account_group_4202
+do_niif_42030100,42030100,Ingresos por Dividendos Ganados,account.data_account_type_revenue,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4203",l10n_do.account_group_4203
+do_niif_42040100,42040100,Ingresos por Diferencia Cambiaria,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204",l10n_do.account_group_4204
+do_niif_42040200,42040200,Cobro de Cuentas Incobrables,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204",l10n_do.account_group_4204
+do_niif_42040300,42040300,Ingresos por Sobrante en Caja,account.data_account_type_other_income,FALSE,do_chart_template,"account_tag_4,account_tag_42,account_tag_4204",l10n_do.account_group_4204
+do_niif_51010100,51010100,Costos de Bienes,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101",l10n_do.account_group_5101
+do_niif_51010200,51010200,Costos de Servicios,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101",l10n_do.account_group_5101
+do_niif_51010300,51010300,Diferencia en Precio,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101",l10n_do.account_group_5101
+do_niif_51020400,51020400,Costos de Importación,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102",l10n_do.account_group_5102
+do_niif_51010500,51010500,ITBIS llevado al Costo,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5101",l10n_do.account_group_5101
+do_niif_51020100,51020100,Costos de Materia Prima,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102",l10n_do.account_group_5102
+do_niif_51020200,51020200,Costos de Mano de Obra,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102",l10n_do.account_group_5102
+do_niif_51020300,51020300,Costos Indirectos,account.data_account_type_direct_costs,FALSE,do_chart_template,"account_tag_5,account_tag_51,account_tag_5102",l10n_do.account_group_5102
+do_niif_52010100,61010100,Sueldos y Salarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010200,61010200,Regalía Pascual,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010300,61010300,Retribuciones Complementarias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010400,61010400,Bono Vacacional,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010500,61010500,Bono por Desempeño,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010600,61010600,Comisiones a Empleados,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010700,61010700,Indemnizaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010800,61010800,Bonificaciones y Gratificaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010900,61010900,Comidas o Dietas al Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011000,61011000,Cursos y Entrenamientos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011100,61011100,Prestaciones Laborales (Preaviso y Cesantia),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011200,61011200,Incentivos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011300,61011300,Horas Extras,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011400,61011400,Uniformes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52011500,61011500,Otros Gastos de Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201",l10n_do.account_group_6101
+do_niif_52010102,61010102,Contribución a la Administradora de Fondos de Pensiones (AFP),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101",l10n_do.account_group_610101
+do_niif_52010103,61010103,Contribución al Seguro Riesgo Laboral (SRL),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101",l10n_do.account_group_610101
+do_niif_52010104,61010104,Contribución al Seguro Familiar de Salud (SFS),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520101",l10n_do.account_group_610101
+do_niif_52010201,61010201,Contribución a la Administradora de Riesgos de Salud (ARS),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102",l10n_do.account_group_610102
+do_niif_52010202,61010202,Contribución a Seguros del Personal,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102",l10n_do.account_group_610102
+do_niif_52010203,61010203,Contribución a Planes Complementarios de Salud,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102",l10n_do.account_group_610102
+do_niif_52010204,61010204,Contribución Seguros de Vida,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102",l10n_do.account_group_610102
+do_niif_52010205,61010205,Contribución al INFOTEP,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5201,account_tag_520102",l10n_do.account_group_610102
+do_niif_52020100,61020100,Energía Eléctrica,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020200,61020200,Comunicaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020300,61020300,Suministros de Oficina (Papelería y útiles),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020400,61020400,Útiles de Aseo y Limpieza,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020500,61020500,Agua y Basura,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020600,61020600,Seguro de Edificio y Locales,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020700,61020700,Combustibles y Lubricantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020800,61020800,Alquileres / Arrendamientos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52020900,61020900,Franquicias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021000,61021000,Eventos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021100,61021100,Seguros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021200,61021200,Servicios de Mensajería,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021300,61021300,Flete y Carga,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021400,61021400,Cuotas y Suscripciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52021500,61021500,Alojamiento en Hoteles,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5202",l10n_do.account_group_6102
+do_niif_52030101,61030101,Legales (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030102,61030102,Contabilidad y Auditoría (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030103,61030103,Tecnología (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030104,61030104,Mantenimientos de Planta (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030105,61030105,Mantenimientos de Local (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030106,61030106,Mantenimientos Mobiliarios y Equipos (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030107,61030107,Asesorías (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030108,61030108,Fumigaciones (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030109,61030109,Copias y Escaneos (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030110,61030110,Servicios de Vigilancia (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030111,61030111,Otros Servicios Profesionales (P. Física),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520301",l10n_do.account_group_610301
+do_niif_52030201,61030201,Legales (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030202,61030202,Contabilidad y Auditoría (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030203,61030203,Tecnología (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030204,61030204,Mantenimiento de Planta (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030205,61030205,Mantenimiento del Local (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030206,61030206,Mantenimiento Mobiliario y Equipos (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030207,61030207,Asesorías (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030208,61030208,Fumigaciones (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030209,61030209,Copias y Escaneos (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030210,61030210,Servicios de Vigilancia (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030211,61030211,Otros Servicios Profesionales  (P. Jurídica),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520302",l10n_do.account_group_610302
+do_niif_52030301,61030301,Honorarios por Servicios del Exterior - Relacionadas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520303",l10n_do.account_group_610303
+do_niif_52030302,61030302,Honorarios por Servicios del Exterior - Terceros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5203,account_tag_520303",l10n_do.account_group_610303
+do_niif_52040100,61040100,Gastos por Depreciación de Edificios,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52040200,61040200,Gastos por Depreciación de Equipo de Transporte,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52040300,61040300,Gastos por Depreciación de Mobiliario y Equipos,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52040400,61040400,Gastos por Depreciación de Maquinaria,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52040500,61040500,Gastos por Depreciación de Herramientas,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52040600,61040600,Gastos por Depreciación de Instalaciones,account.data_account_type_depreciation,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5204",l10n_do.account_group_6104
+do_niif_52050100,61050100,Gastos por Reparación de Edificios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52050200,61050200,Gastos por Reparación de Equipo de Transporte,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52050300,61050300,Gastos por Reparación de Mobiliario y Equipos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52050400,61050400,Gastos por Reparación de Maquinaria,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52050500,61050500,Gastos por Reparación de Herramientas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52050600,61050600,Gastos por Reparación de Instalaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5205",l10n_do.account_group_6105
+do_niif_52060100,61060100,Relaciones Públicas,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060200,61060200,Publicidad,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060300,61060300,Gastos de Viajes y Representación,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060400,61060400,Donaciones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060500,61060500,Donaciones a ProIndustria (Ley 392-07),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060600,61060600,Promociones,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52060700,61060700,Gastos en Restaurantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5206",l10n_do.account_group_6106
+do_niif_52070100,61070100,Gastos por Préstamos Financieros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070200,61070200,Retención por Cheques o Transferencias Electrónicas (0.15%),account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070300,61070300,Intereses Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070400,61070400,Comisiones Bancarias,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070500,61070500,Comisiones de Tarjeta de Crédito,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070600,61070600,Cargos Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070700,61070700,Seguro sobre Préstamos Bancarios,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070800,61070800,Pérdidas por Diferencia Cambiaria,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52070900,61070900,Otro Gastos Financieros,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5207",l10n_do.account_group_6107
+do_niif_52080100,61080100,Pérdidas por Faltante en Caja,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080200,61080200,Pérdidas por Ventas de Activos Fijos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080300,61080300,Pérdidas por Cuentas Incobrables,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080400,61080400,Gastos por ISR,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080500,61080500,Impuestos a los Activos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080600,61080600,Gastos por Penalidades/Recargos de DGII,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080700,61080700,Gastos por Penalidades/Recargos de TSS,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080800,61080800,Gastos sin Comprobantes,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52080900,61080900,Gastos No Deducibles,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_52081000,61081000,Gastos por Impuestos,account.data_account_type_expenses,FALSE,do_chart_template,"account_tag_6,account_tag_52,account_tag_5208",l10n_do.account_group_6108
+do_niif_61010100,71010100,Ganancias o Pérdidas,account.data_unaffected_earnings,FALSE,do_chart_template,"account_tag_7,account_tag_61,account_tag_6101",l10n_do.account_group_7101
diff --git a/addons/l10n_do/data/account.tax.template.xml b/addons/l10n_do/data/account.tax.template.xml
index 61bc5d5d2a7..6e49d7244dc 100644
--- a/addons/l10n_do/data/account.tax.template.xml
+++ b/addons/l10n_do/data/account.tax.template.xml
@@ -12,7 +12,7 @@
             <field name="type_tax_use">sale</field>
             <field eval="0" name="price_include"/>
             <field eval="[(6,0,[ref('tag_V_EXENTA')])]" name="tag_ids"/>
-            <field name="tax_group_id" ref="tax_group_itbis_0"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="tax_0_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
@@ -24,13 +24,13 @@
             <field name="type_tax_use">purchase</field>
             <field eval="0" name="price_include"/>
             <field eval="[(6,0,[ref('tag_C_EXENTA')])]" name="tag_ids"/>
-            <field name="tax_group_id" ref="tax_group_itbis_0"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="tax_18_sale" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">1</field>
             <field name="name">18% ITBIS Ventas</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -44,7 +44,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">2</field>
             <field name="name">18% ITBIS Incl. Ventas</field>
-            <field name="description">18% Incl</field>
+            <field name="description">18% ITBIS</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -58,7 +58,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">3</field>
             <field name="name">10% Propina Legal</field>
-            <field name="description">10%</field>
+            <field name="description">10% Legal</field>
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
@@ -71,7 +71,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">18% ITBIS Compras</field>
             <field name="sequence">11</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS (B)</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -85,7 +85,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">12</field>
             <field name="name">18% ITBIS Incl. Compras</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS (Incl B)</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -99,7 +99,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">16% ITBIS Compras</field>
             <field name="sequence">13</field>
-            <field name="description">16%</field>
+            <field name="description">16% ITBIS (B)</field>
             <field name="amount">16</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -112,7 +112,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">16% ITBIS Incl. Compras</field>
             <field name="sequence">14</field>
-            <field name="description">16%</field>
+            <field name="description">16% ITBIS (Incl B)</field>
             <field name="amount">16</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -125,7 +125,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">9% ITBIS Compras</field>
             <field name="sequence">15</field>
-            <field name="description">9% (L690-16)</field>
+            <field name="description">9% ITBIS (L690-16)</field>
             <field name="amount">9</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -138,7 +138,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">9% ITBIS Incl. Compras</field>
             <field name="sequence">16</field>
-            <field name="description">9% (L690-16)</field>
+            <field name="description">9% ITBIS (L690-16)</field>
             <field name="amount">9</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -151,7 +151,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">8% ITBIS Compras</field>
             <field name="sequence">17</field>
-            <field name="description">8% (L690-16)</field>
+            <field name="description">8% ITBIS (L690-16)</field>
             <field name="amount">8</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -164,7 +164,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">8% ITBIS Incl. Compras</field>
             <field name="sequence">18</field>
-            <field name="description">8% (L690-16)</field>
+            <field name="description">8% ITBIS (L690-16)</field>
             <field name="amount">8</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -177,7 +177,7 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">19</field>
             <field name="name">10% Propina Legal</field>
-            <field name="description">10%</field>
+            <field name="description">10% Legal</field>
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -190,10 +190,10 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
             <field name="name">18% ITBIS Compras - Servicios</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS (S)</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_11080102"/>
             <field name="refund_account_id" ref="do_niif_11080102"/>
             <field eval="0" name="price_include"/>
@@ -204,10 +204,10 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
             <field name="name">18% ITBIS Incl. Compras - Servicios</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS (Incl S)</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_11080102"/>
             <field name="refund_account_id" ref="do_niif_11080102"/>
             <field eval="1" name="price_include"/>
@@ -218,10 +218,10 @@
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
             <field name="name">18% ITBIS - Importaciones</field>
-            <field name="description">18%</field>
+            <field name="description">18% ITBIS (IMP)</field>
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_11080103"/>
             <field name="refund_account_id" ref="do_niif_11080103"/>
             <field eval="0" name="price_include"/>
@@ -244,24 +244,24 @@
         <record id="tax_0015_bank" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
-            <field name="name">Impuesto 0.15% Transferencia Bancaria</field>
-            <field name="description">0.15%</field>
+            <field name="name">0.15% Transferencia Bancaria</field>
+            <field name="description">0.15% Trans</field>
             <field name="amount">0.0015</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">purchase</field>
+            <field name="type_tax_use">none</field>
             <field name="account_id" ref="do_niif_52070200"/>
-            <field name="refund_account_id" ref="do_niif_11080303"/>
+            <field name="refund_account_id" ref="do_niif_52070200"/>
             <field eval="1" name="price_include"/>
             <field name="tax_group_id" ref="group_tax"/>
         </record>
         <record id="tax_10_telco" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
-            <field name="name">Impuesto 10% Telecomunicaciones (ISC)</field>
-            <field name="description">ISC</field>
+            <field name="name">10% ISC Telecomunicaciones</field>
+            <field name="description">10% ISC</field>
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_52020200"/>
             <field name="refund_account_id" ref="do_niif_52020200"/>
             <field eval="0" name="price_include"/>
@@ -271,11 +271,11 @@
         <record id="tax_2_telco" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
-            <field name="name">Impuesto 2% Telecomunicaciones (CDT)</field>
-            <field name="description">CDT</field>
+            <field name="name">2% CDT Telecomunicaciones</field>
+            <field name="description">2% CDT</field>
             <field name="amount">2</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_52020200"/>
             <field name="refund_account_id" ref="do_niif_52020200"/>
             <field eval="0" name="price_include"/>
@@ -289,27 +289,27 @@
             <field eval="0" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
-            <field eval="[(6, 0, [ref('tax_10_telco'), ref('tax_2_telco')])]" name="children_tax_ids"/>
-            <field name="tax_group_id" ref="tax_group_isc"/>
+            <field eval="[(6, 0, [ref('tax_18_purch'), ref('tax_10_telco'), ref('tax_2_telco')])]" name="children_tax_ids"/>
+            <field name="tax_group_id" ref="group_tax"/>
         </record>
         <record id="ret_100_tax_security" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">40</field>
-            <field name="name">Retención ITBIS 100% Servicios de Seguridad (N07-09)</field>
-            <field name="description">100% ITBIS</field>
+            <field name="name">Retención 100% ITBIS Servicios de Seguridad (N07-09)</field>
+            <field name="description">-100% ITBIS (N07-09)</field>
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_21030201"/>
             <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_100_tax_nonprofit" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">41</field>
-            <field name="name">Retención ITBIS 100% Servicios No Lucrativas (N01-11)</field>
-            <field name="description">100% ITBIS</field>
+            <field name="name">Retención 100% ITBIS Servicios No Lucrativas (N01-11)</field>
+            <field name="description">-100% ITBIS (N01-11)</field>
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -317,13 +317,13 @@
             <field name="refund_account_id" ref="do_niif_21030203"/>
             <field eval="0" name="price_include"/>
             <field eval="[(6,0,[ref('tag_R_ITBIS_18')])]" name="tag_ids"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_100_tax_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">42</field>
-            <field name="name">Retención ITBIS 100% Servicios a Físicas (R293-11)</field>
-            <field name="description">100% ITBIS</field>
+            <field name="name">Retención 100% ITBIS Servicios a Físicas (R293-11)</field>
+            <field name="description">-100% ITBIS (R293-11)</field>
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -331,55 +331,56 @@
             <field name="refund_account_id" ref="do_niif_21030202"/>
             <field eval="0" name="price_include"/>
             <field eval="[(6,0,[ref('tag_R_ITBIS_18')])]" name="tag_ids"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_30_tax_moral" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">43</field>
-            <field name="name">Retención ITBIS 30% Servicios a Jurídicas (N02-05)</field>
-            <field name="description">30% ITBIS</field>
+            <field name="name">Retención 30% ITBIS Servicios a Jurídicas (N02-05)</field>
+            <field name="description">-30% ITBIS (N02-05)</field>
             <field name="amount">-5.4</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_21030201"/>
             <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_30_tax_freelance" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
+            <field name="active">False</field>
             <field name="sequence">43</field>
-            <field name="name">Retención ITBIS 30% Servicios Profesionales (N02-05)</field>
-            <field name="description">30% ITBIS</field>
+            <field name="name">Retención 30% ITBIS Servicios Profesionales (N02-05)</field>
+            <field name="description">-30% ITBIS (N02-05)</field>
             <field name="amount">-5.4</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">none</field>
             <field name="account_id" ref="do_niif_21030201"/>
             <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_75_tax_nonformal" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">44</field>
-            <field name="name">Retención ITBIS 75% Bienes a Informales (N08-10)</field>
-            <field name="description">75% ITBIS</field>
+            <field name="name">Retención 75% ITBIS Bienes a Informales (N08-10)</field>
+            <field name="description">-75% ITBIS (N08-10)</field>
             <field name="amount">-13.5</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_21030205"/>
             <field name="refund_account_id" ref="do_niif_21030205"/>
             <field eval="0" name="price_include"/>
-            <field name="tax_group_id" ref="group_ret"/>
+            <field name="tax_group_id" ref="group_itbis"/>
         </record>
         <record id="ret_10_income_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">40</field>
-            <field name="name">Retención ISR 10% Servicios a Físicas</field>
-            <field name="description">10% ISR</field>
+            <field name="name">Retención 10% ISR Honorarios a Físicas</field>
+            <field name="description">-10% ISR</field>
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_21030301"/>
             <field name="refund_account_id" ref="do_niif_21030301"/>
             <field eval="0" name="price_include"/>
@@ -389,8 +390,8 @@
         <record id="ret_10_income_rent" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">50</field>
-            <field name="name">Retención ISR 10% Alquileres a Físicas</field>
-            <field name="description">10% ISR</field>
+            <field name="name">Retención 10% ISR Alquileres a Físicas</field>
+            <field name="description">-10% ISR</field>
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -403,8 +404,8 @@
         <record id="ret_10_income_dividend" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">51</field>
-            <field name="name">Retención ISR 10% por Dividendos (L253-12)</field>
-            <field name="description">10% ISR</field>
+            <field name="name">Retención 10% ISR por Dividendos (L253-12)</field>
+            <field name="description">-10% ISR</field>
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -417,11 +418,11 @@
         <record id="ret_2_income_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">52</field>
-            <field name="name">Retención ISR 2% a Persona Física (Servicios)</field>
-            <field name="description">2% ISR (N07-07)</field>
+            <field name="name">Retención 2% ISR a Física (con Materiales)</field>
+            <field name="description">-2% ISR (N07-07)</field>
             <field name="amount">-2</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
             <field name="account_id" ref="do_niif_21030308"/>
             <field name="refund_account_id" ref="do_niif_21030308"/>
             <field eval="0" name="price_include"/>
@@ -431,8 +432,8 @@
         <record id="ret_2_income_transfer" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">53</field>
-            <field name="name">Retención ISR 2% por Transferencia de Títulos</field>
-            <field name="description">2% ISR</field>
+            <field name="name">Retención 2% ISR por Transferencia de Títulos</field>
+            <field name="description">-2% ISR</field>
             <field name="amount">-2</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -445,8 +446,8 @@
         <record id="ret_27_income_remittance" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">49</field>
-            <field name="name">Retención ISR 27% por Remesas al Exterior (L253-12)</field>
-            <field name="description">27% ISR</field>
+            <field name="name">Retención 27% ISR por Remesas al Exterior (L253-12)</field>
+            <field name="description">-27% ISR</field>
             <field name="amount">-27</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
@@ -458,11 +459,11 @@
         <record id="ret_5_income_gov" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">50</field>
-            <field name="name">Retención ISR 5% Gubernamentales</field>
+            <field name="name">Retención 5% ISR Gubernamentales</field>
             <field name="description">-5% ISR</field>
             <field name="amount">-5</field>
             <field name="amount_type">percent</field>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">sale</field>
             <field name="account_id" ref="do_niif_21030308"/>
             <field name="refund_account_id" ref="do_niif_21030308"/>
             <field eval="0" name="price_include"/>
@@ -471,7 +472,7 @@
         <record id="tax_group_nonformal" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">60</field>
-            <field name="name">Retención a Proveedores Informales de Bienes</field>
+            <field name="name">Retención a Proveedores Informales de Bienes (75%)</field>
             <field name="amount_type">group</field>
             <field eval="0" name="amount"/>
             <field name="type_tax_use">purchase</field>
@@ -481,10 +482,11 @@
         <record id="tax_group_person_construction" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">61</field>
-            <field name="name">Retención a Persona Física (Servicios Construcción con Materiales)</field>
+            <field name="name">Retención a Físicas por Servicios con Materiales (2%)</field>
             <field name="amount_type">group</field>
             <field eval="0" name="amount"/>
-            <field name="type_tax_use">none</field>
+            <field name="type_tax_use">purchase</field>
+            <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_100_tax_person'), ref('ret_2_income_person')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
         <record id="tax_group_moral_construction" model="account.tax.template">
@@ -499,17 +501,17 @@
         <record id="tax_group_person_services" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">58</field>
-            <field name="name">Retención a Físicas por Servicios Profesionales</field>
+            <field name="name">Retención a Físicas por Honorarios por Servicios (10%)</field>
             <field name="amount_type">group</field>
             <field eval="0" name="amount"/>
             <field name="type_tax_use">purchase</field>
-            <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_100_tax_person'), ref('ret_2_income_person')])]" name="children_tax_ids"/>
+            <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_100_tax_person'), ref('ret_10_income_person')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
         <record id="tax_group_moral_services" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">58</field>
-            <field name="name">Retención a Jurídicas por Servicios Profesionales</field>
+            <field name="name">Retención a Jurídicas por Servicios Profesionales (30%)</field>
             <field name="amount_type">group</field>
             <field eval="0" name="amount"/>
             <field name="type_tax_use">purchase</field>
@@ -538,4 +540,4 @@
         </record>
 
     </data>
-</odoo>
-\ No newline at end of file
+</odoo>
diff --git a/addons/l10n_do/data/account_group.xml b/addons/l10n_do/data/account_group.xml
new file mode 100644
index 00000000000..7aa42a8eda1
--- /dev/null
+++ b/addons/l10n_do/data/account_group.xml
@@ -0,0 +1,470 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_group_1" model="account.group">
+            <field name="name">Activos</field>
+            <field name="code_prefix">1</field>
+        </record>
+        <record id="account_group_11" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1"/>
+            <field name="name">Activos Corrientes</field>
+            <field name="code_prefix">11</field>
+        </record>
+        <record id="account_group_1101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Efectivo y Equivalentes de Efectivo</field>
+            <field name="code_prefix">1101</field>
+        </record>
+        <record id="account_group_110101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1101"/>
+            <field name="name">Caja</field>
+            <field name="code_prefix">110101</field>
+        </record>
+        <record id="account_group_110102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1101"/>
+            <field name="name">Bancos</field>
+            <field name="code_prefix">110102</field>
+        </record>
+        <record id="account_group_110103" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1101"/>
+            <field name="name">Inversiones Temporales Plazo Menor 90 días</field>
+            <field name="code_prefix">110103</field>
+        </record>
+        <record id="account_group_1102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Inversiones en Valores a Corto Plazo</field>
+            <field name="code_prefix">1102</field>
+        </record>
+        <record id="account_group_110301" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Cuentas y Documentos por Cobrar</field>
+            <field name="code_prefix">1103</field>
+        </record>
+        <record id="account_group_documentosporcobrar" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_110301"/>
+            <field name="name">Documentos por Cobrar</field>
+            <field name="code_prefix">110301</field>
+        </record>
+        <record id="account_group_110302" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_110301"/>
+            <field name="name">Cuentas por Cobrar</field>
+            <field name="code_prefix">110302</field>
+        </record>
+        <record id="account_group_1104" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Provisión para Cuentas Incobrables</field>
+            <field name="code_prefix">1104</field>
+        </record>
+        <record id="account_group_1105" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Inventarios</field>
+            <field name="code_prefix">1105</field>
+        </record>
+        <record id="account_group_1106" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Deterioro Acumulado de Valor de Inventarios</field>
+            <field name="code_prefix">1106</field>
+        </record>
+        <record id="account_group_1107" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Estimación por Obsolencia de Inventario</field>
+            <field name="code_prefix">1107</field>
+        </record>
+        <record id="account_group_1108" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Impuestos Adelantados</field>
+            <field name="code_prefix">1108</field>
+        </record>
+        <record id="account_group_110801" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1108"/>
+            <field name="name">ITBIS Adelantado en Compras</field>
+            <field name="code_prefix">110801</field>
+        </record>
+        <record id="account_group_110803" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1108"/>
+            <field name="name">Otros Impuestos y Saldos</field>
+            <field name="code_prefix">110803</field>
+        </record>
+        <record id="account_group_1109" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Inversiones Temporales</field>
+            <field name="code_prefix">1109</field>
+        </record>
+        <record id="account_group_1110" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_11"/>
+            <field name="name">Pagos Anticipados</field>
+            <field name="code_prefix">1110</field>
+        </record>
+        <record id="account_group_12" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1"/>
+            <field name="name">Activo Fijos</field>
+            <field name="code_prefix">12</field>
+        </record>
+        <record id="account_group_1201" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Propiedades, Planta y Equipo</field>
+            <field name="code_prefix">1201</field>
+        </record>
+        <record id="account_group_120101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1201"/>
+            <field name="name">Bienes Inmuebles (CAT 1)</field>
+            <field name="code_prefix">120101</field>
+        </record>
+        <record id="account_group_120102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1201"/>
+            <field name="name">Bienes Muebles (CAT 2)</field>
+            <field name="code_prefix">120102</field>
+        </record>
+        <record id="account_group_120103" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_1201"/>
+            <field name="name">Bienes Muebles (CAT 3)</field>
+            <field name="code_prefix">120103</field>
+        </record>
+        <record id="account_group_1202" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Depreciación Acumulada de Propiedades, Planta y Equipo</field>
+            <field name="code_prefix">1202</field>
+        </record>
+        <record id="account_group_1203" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Deterioro de Valor Acumulado de Propiedades, Planta y Equipo</field>
+            <field name="code_prefix">1203</field>
+        </record>
+        <record id="account_group_1204" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Activos Intangibles</field>
+            <field name="code_prefix">1204</field>
+        </record>
+        <record id="account_group_1205" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Bienes en Arrendamiento</field>
+            <field name="code_prefix">1205</field>
+        </record>
+        <record id="account_group_1206" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Depreciación Acumulada de Bienes en Arrendamiento</field>
+            <field name="code_prefix">1206</field>
+        </record>
+        <record id="account_group_1207" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Deterioro de Valor Acumulado de Bienes en Arrendamiento</field>
+            <field name="code_prefix">1207</field>
+        </record>
+        <record id="account_group_1208" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Inversiones Permanentes</field>
+            <field name="code_prefix">1208</field>
+        </record>
+        <record id="account_group_1209" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_12"/>
+            <field name="name">Activos Diferidos</field>
+            <field name="code_prefix">1209</field>
+        </record>
+        <record id="account_group_13" model="account.group">
+            <field name="name">Costos de Construcción</field>
+            <field name="code_prefix">13</field>
+        </record>
+        <record id="account_group_1301" model="account.group">
+            <field name="name">Construcción en Proceso</field>
+            <field name="code_prefix">1301</field>
+        </record>
+        <record id="account_group_130101" model="account.group">
+            <field name="name">Costos de Costrucción en Proceso</field>
+            <field name="code_prefix">130101</field>
+        </record>
+        <record id="account_group_2" model="account.group">
+            <field name="name">Pasivos</field>
+            <field name="code_prefix">2</field>
+        </record>
+        <record id="account_group_21" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2"/>
+            <field name="name">Pasivo Corriente</field>
+            <field name="code_prefix">21</field>
+        </record>
+        <record id="account_group_2101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_21"/>
+            <field name="name">Cuentas y Documentos por Pagar a Corto Plazo</field>
+            <field name="code_prefix">2101</field>
+        </record>
+        <record id="account_group_2102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_21"/>
+            <field name="name">Beneficios por Pagar a Corto Plazo</field>
+            <field name="code_prefix">2102</field>
+        </record>
+        <record id="account_group_2103" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_21"/>
+            <field name="name">Impuestos y Retenciones</field>
+            <field name="code_prefix">2103</field>
+        </record>
+        <record id="account_group_210301" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2103"/>
+            <field name="name">ITBIS por Pagar</field>
+            <field name="code_prefix">210301</field>
+        </record>
+        <record id="account_group_210302" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2103"/>
+            <field name="name">ITBIS Retenido</field>
+            <field name="code_prefix">210302</field>
+        </record>
+        <record id="account_group_210303" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2103"/>
+            <field name="name">ISR Retenido</field>
+            <field name="code_prefix">210303</field>
+        </record>
+        <record id="account_group_210304" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2103"/>
+            <field name="name">Retenciones en Nómina</field>
+            <field name="code_prefix">210304</field>
+        </record>
+        <record id="account_group_210305" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2103"/>
+            <field name="name">Otros Impuestos o Retenciones</field>
+            <field name="code_prefix">210305</field>
+        </record>
+        <record id="account_group_2104" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_21"/>
+            <field name="name">Provisiones a Corto Plazo</field>
+            <field name="code_prefix">2104</field>
+        </record>
+        <record id="account_group_2105" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_21"/>
+            <field name="name">Tarjetas de Crédito</field>
+            <field name="code_prefix">2105</field>
+        </record>
+        <record id="account_group_22" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_2"/>
+            <field name="name">Pasivo No Corriente</field>
+            <field name="code_prefix">22</field>
+        </record>
+        <record id="account_group_2201" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_22"/>
+            <field name="name">Cuentas y Documentos por Pagar a Largo Plazo</field>
+            <field name="code_prefix">2201</field>
+        </record>
+        <record id="account_group_2202" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_22"/>
+            <field name="name">Provisión para Obligaciones Laborales</field>
+            <field name="code_prefix">2202</field>
+        </record>
+        <record id="account_group_2203" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_22"/>
+            <field name="name">Anticipos de Clientes y Pagos no Identificados</field>
+            <field name="code_prefix">2203</field>
+        </record>
+        <record id="account_group_2204" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_22"/>
+            <field name="name">Provisiones a Largo Plazo</field>
+            <field name="code_prefix">2204</field>
+        </record>
+        <record id="account_group_3" model="account.group">
+            <field name="name">Capital</field>
+            <field name="code_prefix">3</field>
+        </record>
+        <record id="account_group_31" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_3"/>
+            <field name="name">Capital Contable</field>
+            <field name="code_prefix">31</field>
+        </record>
+        <record id="account_group_3101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_31"/>
+            <field name="name">Capital Social</field>
+            <field name="code_prefix">3101</field>
+        </record>
+        <record id="account_group_3102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_31"/>
+            <field name="name">Superávit por Revaluación de Activos</field>
+            <field name="code_prefix">3102</field>
+        </record>
+        <record id="account_group_32" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_3"/>
+            <field name="name">Utilidades Restringidas</field>
+            <field name="code_prefix">32</field>
+        </record>
+        <record id="account_group_3201" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_32"/>
+            <field name="name">Reserva Legal</field>
+            <field name="code_prefix">3201</field>
+        </record>
+        <record id="account_group_33" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_3"/>
+            <field name="name">Resultados</field>
+            <field name="code_prefix">33</field>
+        </record>
+        <record id="account_group_3301" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_33"/>
+            <field name="name">Resultados Acumulados</field>
+            <field name="code_prefix">3301</field>
+        </record>
+        <record id="account_group_3302" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_33"/>
+            <field name="name">Resultados del Ejercicio</field>
+            <field name="code_prefix">3302</field>
+        </record>
+        <record id="account_group_3304" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_33"/>
+            <field name="name">Otras Reservas de Patrimonio</field>
+            <field name="code_prefix">3304</field>
+        </record>
+        <record id="account_group_4" model="account.group">
+            <field name="name">Ingresos y Ganancias</field>
+            <field name="code_prefix">4</field>
+        </record>
+        <record id="account_group_41" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_4"/>
+            <field name="name">Ingresos por Operaciones</field>
+            <field name="code_prefix">41</field>
+        </record>
+        <record id="account_group_4101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_41"/>
+            <field name="name">Ventas de Bienes</field>
+            <field name="code_prefix">4101</field>
+        </record>
+        <record id="account_group_4102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_41"/>
+            <field name="name">Ventas de Servicios</field>
+            <field name="code_prefix">4102</field>
+        </record>
+        <record id="account_group_4103" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_41"/>
+            <field name="name">Devoluciones</field>
+            <field name="code_prefix">4103</field>
+        </record>
+        <record id="account_group_4104" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_41"/>
+            <field name="name">Descuentos</field>
+            <field name="code_prefix">4104</field>
+        </record>
+        <record id="account_group_42" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_41"/>
+            <field name="name">Ingresos No Operacionales</field>
+            <field name="code_prefix">42</field>
+        </record>
+        <record id="account_group_4201" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_4"/>
+            <field name="name">Intereses Ganados</field>
+            <field name="code_prefix">4201</field>
+        </record>
+        <record id="account_group_4202" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_42"/>
+            <field name="name">Ventas de Activos</field>
+            <field name="code_prefix">4202</field>
+        </record>
+        <record id="account_group_4203" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_42"/>
+            <field name="name">Dividendos Ganados</field>
+            <field name="code_prefix">4203</field>
+        </record>
+        <record id="account_group_4204" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_42"/>
+            <field name="name">Ingresos Extraordinarios</field>
+            <field name="code_prefix">4204</field>
+        </record>
+        <record id="account_group_5" model="account.group">
+            <field name="name">Costos, Gastos y Pérdidas</field>
+            <field name="code_prefix">5</field>
+        </record>
+        <record id="account_group_51" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_5"/>
+            <field name="name">Costos de Operación</field>
+            <field name="code_prefix">51</field>
+        </record>
+        <record id="account_group_5101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_51"/>
+            <field name="name">Costos de Ventas</field>
+            <field name="code_prefix">5101</field>
+        </record>
+        <record id="account_group_5102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_51"/>
+            <field name="name">Costos de Producción</field>
+            <field name="code_prefix">5102</field>
+        </record>
+        <record id="account_group_6" model="account.group">
+            <field name="name">Gastos y Pérdidas</field>
+            <field name="code_prefix">6</field>
+        </record>
+        <record id="account_group_61" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6"/>
+            <field name="name">Gastos de Operación</field>
+            <field name="code_prefix">61</field>
+        </record>
+        <record id="account_group_6101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos de Personal</field>
+            <field name="code_prefix">6101</field>
+        </record>
+        <record id="account_group_610101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6101"/>
+            <field name="name">Aportes a la Seguridad Social</field>
+            <field name="code_prefix">610101</field>
+        </record>
+        <record id="account_group_610102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6101"/>
+            <field name="name">Otras Cargas Patronales</field>
+            <field name="code_prefix">610102</field>
+        </record>
+        <record id="account_group_6102" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos de Administración</field>
+            <field name="code_prefix">6102</field>
+        </record>
+        <record id="account_group_6103" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos por Trabajo, Suministros y Servicios</field>
+            <field name="code_prefix">6103</field>
+        </record>
+        <record id="account_group_610301" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6103"/>
+            <field name="name">Gastos Honorarios por Servicios Profesionales (P. Física)</field>
+            <field name="code_prefix">610301</field>
+        </record>
+        <record id="account_group_610302" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6103"/>
+            <field name="name">Gastos Honorarios por Servicios Profesionales (P. Jurídica)</field>
+            <field name="code_prefix">610302</field>
+        </record>
+        <record id="account_group_610303" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_6103"/>
+            <field name="name">Gastos Honorarios por Servicios Profesionales (P. Jurídica)</field>
+            <field name="code_prefix">610303</field>
+        </record>
+        <record id="account_group_6104" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos por Depreciación</field>
+            <field name="code_prefix">6104</field>
+        </record>
+        <record id="account_group_6105" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos por Reparaciones</field>
+            <field name="code_prefix">6105</field>
+        </record>
+        <record id="account_group_6106" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos de Representación</field>
+            <field name="code_prefix">6106</field>
+        </record>
+        <record id="account_group_6107" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos Financieros</field>
+            <field name="code_prefix">6107</field>
+        </record>
+        <record id="account_group_6108" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_61"/>
+            <field name="name">Gastos Extraordinarios</field>
+            <field name="code_prefix">6108</field>
+        </record>
+        <record id="account_group_7" model="account.group">
+            <field name="name">Cuentas Liquidadoras de Resultados</field>
+            <field name="code_prefix">7</field>
+        </record>
+        <record id="account_group_71" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_7"/>
+            <field name="name">Cuenta Liquidadora</field>
+            <field name="code_prefix">71</field>
+        </record>
+        <record id="account_group_7101" model="account.group">
+            <field name="parent_id" ref="l10n_do.account_group_71"/>
+            <field name="name">Pérdidas y Ganancias</field>
+            <field name="code_prefix">7101</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/l10n_generic_coa/data/account_bank_statement_demo.xml b/addons/l10n_generic_coa/data/account_bank_statement_demo.xml
index 88294df47bd..3f620cb4bb2 100644
--- a/addons/l10n_generic_coa/data/account_bank_statement_demo.xml
+++ b/addons/l10n_generic_coa/data/account_bank_statement_demo.xml
@@ -84,6 +84,7 @@
                 ('company_id', '=', obj().env['res.company']._company_default_get('account.journal').id)]"/>
             <field name="amount">750.0</field>
             <field name="date" eval="time.strftime('%Y')+'-01-01'"/>
+            <field name="partner_id" ref="base.res_partner_2"/>
         </record>
 
     </data>
diff --git a/addons/l10n_mx/models/chart_template.py b/addons/l10n_mx/models/chart_template.py
index 37292bf303f..edf8000544e 100644
--- a/addons/l10n_mx/models/chart_template.py
+++ b/addons/l10n_mx/models/chart_template.py
@@ -44,7 +44,8 @@ class AccountChartTemplate(models.Model):
     @api.model
     def _prepare_transfer_account_for_direct_creation(self, name, company):
         res = super(AccountChartTemplate, self)._prepare_transfer_account_for_direct_creation(name, company)
-        xml_id = self.env.ref('l10n_mx.account_tag_102_01').id
-        res.setdefault('tag_ids', [])
-        res['tag_ids'].append((4, xml_id))
+        if company.country_id.code == 'MX':
+            xml_id = self.env.ref('l10n_mx.account_tag_102_01').id
+            res.setdefault('tag_ids', [])
+            res['tag_ids'].append((4, xml_id))
         return res
diff --git a/addons/l10n_nl/models/account_chart_template.py b/addons/l10n_nl/models/account_chart_template.py
index 886afdb59d4..483ce15650c 100644
--- a/addons/l10n_nl/models/account_chart_template.py
+++ b/addons/l10n_nl/models/account_chart_template.py
@@ -9,15 +9,17 @@ class AccountChartTemplate(models.Model):
     def load_for_current_company(self, sale_tax_rate, purchase_tax_rate):
         # Add tag to 999999 account
         res = super(AccountChartTemplate, self).load_for_current_company(sale_tax_rate, purchase_tax_rate)
-        account = self.env['account.account'].search([('code', '=', '999999'), ('company_id', '=', self.env.user.company_id.id)])
-        if account:
-            account.tag_ids = [(4, self.env.ref('l10n_nl.account_tag_12').id)]
+        if self.env.user.company_id.country_id.code == 'NL':
+            account = self.env['account.account'].search([('code', '=', '999999'), ('company_id', '=', self.env.user.company_id.id)])
+            if account:
+                account.tag_ids = [(4, self.env.ref('l10n_nl.account_tag_12').id)]
         return res
 
     @api.model
     def _prepare_transfer_account_for_direct_creation(self, name, company):
         res = super(AccountChartTemplate, self)._prepare_transfer_account_for_direct_creation(name, company)
-        xml_id = self.env.ref('l10n_nl.account_tag_25').id
-        res.setdefault('tag_ids', [])
-        res['tag_ids'].append((4, xml_id))
+        if company.country_id.code == 'NL':
+            xml_id = self.env.ref('l10n_nl.account_tag_25').id
+            res.setdefault('tag_ids', [])
+            res['tag_ids'].append((4, xml_id))
         return res
diff --git a/addons/l10n_nl/models/account_journal.py b/addons/l10n_nl/models/account_journal.py
index 0114aa0db18..987da59cd18 100644
--- a/addons/l10n_nl/models/account_journal.py
+++ b/addons/l10n_nl/models/account_journal.py
@@ -10,10 +10,11 @@ class AccountJournal(models.Model):
     def _prepare_liquidity_account(self, name, company, currency_id, type):
         account_vals = super(AccountJournal, self)._prepare_liquidity_account(name, company, currency_id, type)
 
-        # Ensure the newly liquidity accounts have the right account tag in order to be part
-        # of the Dutch financial reports.
-        tag_ids = account_vals.get('tag_ids', [])
-        tag_ids.append((4, self.env.ref('l10n_nl.account_tag_25').id))
-        account_vals['tag_ids'] = tag_ids
+        if company.country_id.code == 'NL':
+            # Ensure the newly liquidity accounts have the right account tag in order to be part
+            # of the Dutch financial reports.
+            tag_ids = account_vals.get('tag_ids', [])
+            tag_ids.append((4, self.env.ref('l10n_nl.account_tag_25').id))
+            account_vals['tag_ids'] = tag_ids
 
         return account_vals
diff --git a/addons/link_tracker/i18n/da.po b/addons/link_tracker/i18n/da.po
index ce63704c3e5..d79290a1f69 100644
--- a/addons/link_tracker/i18n/da.po
+++ b/addons/link_tracker/i18n/da.po
@@ -9,16 +9,17 @@
 # Jonathan Stein <cgs@image.dk>, 2018
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:20+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -205,6 +206,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Dette er et navn, der hjælper dig med at holde styr på dine forskellige "
+"kampagneindsatser"
 
 #. module: link_tracker
 #: model:ir.model.fields,help:link_tracker.field_link_tracker__medium_id
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 00734c1ebd1..4222f5c026e 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -13,9 +13,9 @@
 # Jonathan Stein <cgs@image.dk>, 2018
 # JonathanStein <jstein@image.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:20+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -957,7 +957,7 @@ msgstr "Med venlig hilsen,"
 #: model:ir.model.fields,field_description:mail.field_mail_channel_partner__is_blacklisted
 #: model:ir.model.fields,field_description:mail.field_res_partner__is_blacklisted
 msgid "Blacklist"
-msgstr ""
+msgstr "Blacklist"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree
@@ -1057,7 +1057,7 @@ msgstr ""
 #: model:ir.model.fields,help:mail.field_mail_activity__activity_category
 #: model:ir.model.fields,help:mail.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
-msgstr ""
+msgstr "Kategorier kan udløse specifikke opgaver som at åbne kalendervisning"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category
@@ -1265,7 +1265,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form
@@ -2476,6 +2476,8 @@ msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
 msgstr ""
+"Hvis e-mailadressen er blacklisted, vil kontakten ikke længere modtage "
+"masseudskrifter fra enhver liste"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_res_config_settings__alias_domain
@@ -2822,7 +2824,7 @@ msgstr "Forsinkede aktiviteter"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__layout
 #: model:ir.model.fields,field_description:mail.field_mail_message__layout
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban
@@ -3588,7 +3590,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_type_id
 #: model:ir.model.fields,field_description:mail.field_res_partner__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_activity__has_recommended_activities
@@ -4415,7 +4417,7 @@ msgstr "Relationsfelt"
 #. module: mail
 #: selection:mail.activity.type,category:0
 msgid "Reminder"
-msgstr ""
+msgstr "Påmindelse"
 
 #. module: mail
 #. openerp-web
@@ -4791,7 +4793,7 @@ msgstr "Genvej"
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
 #: model_terms:ir.ui.view,arch_db:mail.res_partner_view_search_inherit_mail
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: mail
 #: code:addons/mail/models/mail_channel.py:914
@@ -4889,6 +4891,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_email_template_preview__sub_model_object_field
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 47b10c4d552..65bc64c0722 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -2626,7 +2626,7 @@ msgstr "Alias inattivo"
 #: code:addons/mail/static/src/xml/discuss.xml:216
 #, python-format
 msgid "Inbox"
-msgstr "In Arrivo"
+msgstr "In arrivo"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_activity__automated
@@ -4902,7 +4902,8 @@ msgstr "Invia messaggi per email"
 
 #. module: mail
 #. openerp-web
-#: code:addons/mail/static/src/xml/thread.xml:397
+#: code:addons/mail/static/src/xml/thread.xml:390
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_search
 #: selection:mail.mail,state:0 selection:mail.notification,email_status:0
 #, python-format
@@ -6070,6 +6071,7 @@ msgstr "Riunioni del board"
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/activity.xml:43
+#: model_terms:ir.ui.view,arch_db:mail.message_notification_email
 #: model_terms:ir.ui.view,arch_db:mail.view_mail_form
 #, python-format
 msgid "by"
diff --git a/addons/mail/i18n/uk.po b/addons/mail/i18n/uk.po
index de0c9c298f3..28235acec9b 100644
--- a/addons/mail/i18n/uk.po
+++ b/addons/mail/i18n/uk.po
@@ -2874,7 +2874,7 @@ msgstr "Останнє оновлення"
 #: code:addons/mail/static/src/xml/systray.xml:94
 #, python-format
 msgid "Late"
-msgstr "Запізнено"
+msgstr "Пізно"
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_search
@@ -3006,7 +3006,7 @@ msgstr "Зробити примітку"
 #: code:addons/mail/static/src/xml/chatter.xml:92
 #, python-format
 msgid "Log or schedule an activity"
-msgstr "Увійдіть або заплануйте активність"
+msgstr "Увійдіть або заплануйте дію"
 
 #. module: mail
 #. openerp-web
@@ -3115,7 +3115,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/activity.xml:80
 #, python-format
 msgid "Mark Done"
-msgstr "Позначити Виконано"
+msgstr "Позначити як Виконано"
 
 #. module: mail
 #. openerp-web
@@ -3134,7 +3134,7 @@ msgstr "Позначити все як прочитане"
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.mail_activity_view_form_popup
 msgid "Mark as Done"
-msgstr "Позначте, як зроблено"
+msgstr "Позначити як зроблено"
 
 #. module: mail
 #. openerp-web
@@ -3150,14 +3150,14 @@ msgstr "Позначити як прочитане"
 #: code:addons/mail/static/src/xml/thread.xml:340
 #, python-format
 msgid "Mark as Todo"
-msgstr "Позначити для виконання"
+msgstr "Позначити як Зробити"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/web_kanban_activity.xml:71
 #, python-format
 msgid "Mark as done"
-msgstr "Позначте як зроблено"
+msgstr "Позначити як зроблено"
 
 #. module: mail
 #: model:ir.ui.menu,name:mail.mail_blacklist_menu
@@ -3167,7 +3167,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__image_medium
 msgid "Medium-sized photo"
-msgstr "Середнє фото"
+msgstr "Фото середнього розміру"
 
 #. module: mail
 #: model:ir.model.fields,help:mail.field_mail_channel__image_medium
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index aff8b1d2a5f..59eb67a1bf0 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -1513,7 +1513,7 @@ msgstr "尊敬的"
 #: model:ir.model.fields,field_description:mail.field_mail_activity__activity_decoration
 #: model:ir.model.fields,field_description:mail.field_mail_activity_type__decoration_type
 msgid "Decoration Type"
-msgstr "作业类型"
+msgstr "排版类型"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_message_subtype__default
@@ -3278,7 +3278,7 @@ msgstr "消息唯一编号"
 #: model:ir.model.fields,field_description:mail.field_mail_mail__message_id
 #: model:ir.model.fields,field_description:mail.field_mail_message__message_id
 msgid "Message-Id"
-msgstr "消息编号"
+msgstr "消息ID"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_view_mail_message
@@ -3410,7 +3410,7 @@ msgstr "管理状态"
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_res_users__moderation_counter
 msgid "Moderation count"
-msgstr "管理账户"
+msgstr "审核数"
 
 #. module: mail
 #: model:ir.model.fields,field_description:mail.field_mail_channel__is_moderator
diff --git a/addons/mail/models/mail_mail.py b/addons/mail/models/mail_mail.py
index 6a50a198347..7aff20cf59e 100644
--- a/addons/mail/models/mail_mail.py
+++ b/addons/mail/models/mail_mail.py
@@ -64,7 +64,18 @@ class MailMail(models.Model):
         # notification field: if not set, set if mail comes from an existing mail.message
         if 'notification' not in values and values.get('mail_message_id'):
             values['notification'] = True
-        return super(MailMail, self).create(values)
+        new_mail = super(MailMail, self).create(values)
+        if values.get('attachment_ids'):
+            new_mail.attachment_ids.check(mode='read')
+        return new_mail
+
+    @api.multi
+    def write(self, vals):
+        res = super(MailMail, self).write(vals)
+        if vals.get('attachment_ids'):
+            for mail in self:
+                mail.attachment_ids.check(mode='read')
+        return res
 
     @api.multi
     def unlink(self):
diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py
index f368cf41f12..77469f2fe94 100644
--- a/addons/mail/models/mail_message.py
+++ b/addons/mail/models/mail_message.py
@@ -14,7 +14,7 @@ from odoo.osv import expression
 from odoo.tools import groupby
 
 _logger = logging.getLogger(__name__)
-_image_dataurl = re.compile(r'(data:image/[a-z]+?);base64,([a-z0-9+/\n]{3,}=*)\n*([\'"])', re.I)
+_image_dataurl = re.compile(r'(data:image/[a-z]+?);base64,([a-z0-9+/\n]{3,}=*)\n*([\'"])(?: data-filename="([^"]*)")?', re.I)
 
 
 class Message(models.Model):
@@ -390,7 +390,8 @@ class Message(models.Model):
             for notification in message.notification_ids.filtered(filter_notification):
                 customer_email_data.append((partner_tree[notification.res_partner_id.id][0], partner_tree[notification.res_partner_id.id][1], notification.email_status))
 
-            main_attachment = message.model and message.res_id and self.env[message.model].search([('id', '=',message.res_id)]) and getattr(self.env[message.model].browse(message.res_id), 'message_main_attachment_id')
+            has_access_to_model = message.model and self.env[message.model].check_access_rights('read', raise_exception=False)
+            main_attachment = has_access_to_model and message.res_id and self.env[message.model].search([('id', '=',message.res_id)]) and getattr(self.env[message.model].browse(message.res_id), 'message_main_attachment_id')
             attachment_ids = []
             for attachment in message.attachment_ids:
                 if attachment.id in attachments_tree:
@@ -950,12 +951,13 @@ class Message(models.Model):
             def base64_to_boundary(match):
                 key = match.group(2)
                 if not data_to_url.get(key):
-                    name = 'image%s' % len(data_to_url)
+                    name = match.group(4) if match.group(4) else 'image%s' % len(data_to_url)
                     attachment = Attachments.create({
                         'name': name,
                         'datas': match.group(2),
                         'datas_fname': name,
-                        'res_model': 'mail.message',
+                        'res_model': values.get('model'),
+                        'res_id': values.get('res_id'),
                     })
                     attachment.generate_access_token()
                     values['attachment_ids'].append((4, attachment.id))
@@ -966,6 +968,10 @@ class Message(models.Model):
         # delegate creation of tracking after the create as sudo to avoid access rights issues
         tracking_values_cmd = values.pop('tracking_value_ids', False)
         message = super(Message, self).create(values)
+
+        if values.get('attachment_ids'):
+            message.attachment_ids.check(mode='read')
+
         if tracking_values_cmd:
             vals_lst = [dict(cmd[2], mail_message_id=message.id) for cmd in tracking_values_cmd if len(cmd) == 3 and cmd[0] == 0]
             other_cmd = [cmd for cmd in tracking_values_cmd if len(cmd) != 3 or cmd[0] != 0]
@@ -991,6 +997,9 @@ class Message(models.Model):
         if 'model' in vals or 'res_id' in vals:
             self._invalidate_documents()
         res = super(Message, self).write(vals)
+        if vals.get('attachment_ids'):
+            for mail in self:
+                mail.attachment_ids.check(mode='read')
         if 'notification_ids' in vals or 'model' in vals or 'res_id' in vals:
             self._invalidate_documents()
         return res
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index b950cf756e3..20163ea15f3 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -199,6 +199,8 @@ class MailThread(models.AbstractModel):
     @api.multi
     def _get_message_needaction(self):
         res = dict((res_id, 0) for res_id in self.ids)
+        if not res:
+            return
 
         # search for unread messages, directly in SQL to improve performances
         self._cr.execute(""" SELECT msg.res_id FROM mail_message msg
@@ -1919,7 +1921,7 @@ class MailThread(models.AbstractModel):
     def message_post(self, body='', subject=None,
                      message_type='notification', subtype=None,
                      parent_id=False, attachments=None,
-                     notif_layout=False, add_sign=False, model_description=False,
+                     notif_layout=False, add_sign=True, model_description=False,
                      mail_auto_delete=True, **kwargs):
         """ Post a new message in an existing thread, returning the new
             mail.message ID.
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index f56e245fae0..32a2f4014bd 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -46,7 +46,7 @@ class Partner(models.Model):
             if message.add_sign:
                 signature = "<p>-- <br/>%s</p>" % message.author_id.name
 
-        company = record.company_id if record and 'company_id' in record else user.company_id
+        company = record.company_id.sudo() if record and 'company_id' in record else user.company_id
         if company.website:
             website_url = 'http://%s' % company.website if not company.website.lower().startswith(('http:', 'https:')) else company.website
         else:
diff --git a/addons/mail/static/src/js/composers/mention_manager.js b/addons/mail/static/src/js/composers/mention_manager.js
index 7acecadc062..907263328cc 100644
--- a/addons/mail/static/src/js/composers/mention_manager.js
+++ b/addons/mail/static/src/js/composers/mention_manager.js
@@ -378,9 +378,9 @@ var MentionManager = Widget.extend({
         var textInput = this._composer.$input.val();
         var id = $(ev.currentTarget).data('id');
         var suggestions = _.flatten(this.get('mention_suggestions'));
-        var selectedSuggestion = _.find(suggestions, function (s) {
+        var selectedSuggestion = _.clone(_.find(suggestions, function (s) {
             return s.id === id;
-        });
+        }));
         var substitution = selectedSuggestion.substitution;
         if (!substitution) {
             // no substitution string given, so use the mention name instead
diff --git a/addons/mail/static/src/js/discuss.js b/addons/mail/static/src/js/discuss.js
index 032ab1bddef..2cb9fe749d7 100644
--- a/addons/mail/static/src/js/discuss.js
+++ b/addons/mail/static/src/js/discuss.js
@@ -852,7 +852,7 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, {
 
             // Update control panel before focusing the composer, otherwise
             // focus is on the searchview
-            self.set("title", '#' + self._thread.getName());
+            self.set("title", self._thread.getTitle());
             self._updateControlPanel();
             self._updateControlPanelButtons(self._thread);
 
@@ -1321,12 +1321,16 @@ var Discuss = AbstractAction.extend(ControlPanelMixin, {
      */
     _onPostMessage: function (messageData) {
         var self = this;
+        var options = {};
         if (this._selectedMessage) {
             messageData.subtype = this._selectedMessage.isNote() ? 'mail.mt_note': 'mail.mt_comment';
             messageData.subtype_id = false;
             messageData.message_type = 'comment';
+
+            options.documentID = this._selectedMessage.getDocumentID();
+            options.documentModel = this._selectedMessage.getDocumentModel();
         }
-        this._thread.postMessage(messageData)
+        this._thread.postMessage(messageData, options)
             .then(function () {
                 if (self._selectedMessage) {
                     self._renderSnackbar('mail.discuss.MessageSentSnackbar', {
diff --git a/addons/mail/static/src/js/models/threads/channel.js b/addons/mail/static/src/js/models/threads/channel.js
index 808e8b7fbca..ff90ca8edfb 100644
--- a/addons/mail/static/src/js/models/threads/channel.js
+++ b/addons/mail/static/src/js/models/threads/channel.js
@@ -217,21 +217,11 @@ var Channel = SearchableThread.extend(ThreadTypingMixin, {
         return _.extend(result, {
             author: lastMessage ? lastMessage.getDisplayedAuthor() : '',
             body: lastMessage ? mailUtils.parseAndTransform(lastMessage.getBody(), mailUtils.inline) : '',
-            date: lastMessage ? lastMessage.getDate() : moment(),
+            date: lastMessage ? lastMessage.getDate() : undefined,
             isMyselfAuthor: this.hasMessages() && this.getLastMessage().isMyselfAuthor(),
         });
     },
     /**
-     * Returns the title to display in thread window's headers.
-     * For channels, the title is prefixed with "#".
-     *
-     * @override
-     * @returns {string|Object} the name of the thread by default (see getName)
-     */
-    getTitle: function () {
-        return "#" + this._super.apply(this, arguments);
-    },
-    /**
      * Get the UUID of the channel.
      * This is a string that uniquely links this channel to a server channel.
      *
diff --git a/addons/mail/static/src/js/models/threads/mailbox.js b/addons/mail/static/src/js/models/threads/mailbox.js
index 82d65bdd6cc..263072f575e 100644
--- a/addons/mail/static/src/js/models/threads/mailbox.js
+++ b/addons/mail/static/src/js/models/threads/mailbox.js
@@ -189,6 +189,27 @@ var Mailbox = SearchableThread.extend({
             throw (_.str(_t("Missing domain for mailbox with ID '%s'"), this._id));
         }
     },
+    /**
+     * Post a message from inbox. This is used when using the 'reply' feature
+     * on a message that is linked to a document thread.
+     *
+     * @override
+     * @private
+     * @param {Object} messageData
+     * @param {Object} options
+     * @param {integer} options.documentID
+     * @param {string} options.documentModel
+     * @returns {$.Promise}
+     */
+    _postMessage: function (messageData, options) {
+        var documentThread = this.call(
+            'mail_service',
+            'getDocumentThread',
+            options.documentModel,
+            options.documentID
+        );
+        return documentThread.postMessage(messageData);
+    },
 });
 
 return Mailbox;
diff --git a/addons/mail/static/src/js/models/threads/multi_user_channel.js b/addons/mail/static/src/js/models/threads/multi_user_channel.js
index c1681744127..85d60fc1183 100644
--- a/addons/mail/static/src/js/models/threads/multi_user_channel.js
+++ b/addons/mail/static/src/js/models/threads/multi_user_channel.js
@@ -26,6 +26,16 @@ var MultiUserChannel = Channel.extend({
     //--------------------------------------------------------------------------
 
     /**
+     * Returns the title to display in thread window's headers.
+     * For channels, the title is prefixed with "#".
+     *
+     * @override
+     * @returns {string|Object} the name of the thread by default (see getName)
+     */
+    getTitle: function () {
+        return "#" + this._super.apply(this, arguments);
+    },
+    /**
      * States whether this thread has the mass mailing setting active or not.
      * This is a server-side setting, that determine the type of composer that
      * is used (basic or extended composer).
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index c21089b7095..6a49cdf0183 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -1108,8 +1108,9 @@ var MailManager =  AbstractService.extend({
      * Sort previews
      *
      *      1. unread,
-     *      2. two-user thread,
-     *      3. date,
+     *      2. dated previews
+     *      3. two-user thread,
+     *      4. date,
      *
      * @private
      * @param {Object[]} previews
@@ -1118,13 +1119,10 @@ var MailManager =  AbstractService.extend({
     _sortPreviews: function (previews) {
         var res = previews.sort(function (p1, p2) {
             var unreadDiff = Math.min(1, p2.unreadCounter) - Math.min(1, p1.unreadCounter);
+            var datedDiff = !!p2.date - !!p1.date;
             var isTwoUserThreadDiff = p2.isTwoUserThread - p1.isTwoUserThread;
-            var dateDiff = (!!p2.date - !!p1.date) ||
-                              (
-                                p2.date &&
-                                p2.date.diff(p1.date)
-                              );
-            return  unreadDiff || isTwoUserThreadDiff || dateDiff;
+            var dateDiff = p2.date && p2.date.diff(p1.date);
+            return  unreadDiff || datedDiff || isTwoUserThreadDiff || dateDiff;
         });
         return res;
     },
diff --git a/addons/mail/static/src/js/systray/systray_messaging_menu.js b/addons/mail/static/src/js/systray/systray_messaging_menu.js
index d86e9e3913b..df35de47174 100644
--- a/addons/mail/static/src/js/systray/systray_messaging_menu.js
+++ b/addons/mail/static/src/js/systray/systray_messaging_menu.js
@@ -102,8 +102,8 @@ var MessagingMenu = Widget.extend({
         var channelUnreadCounters = _.map(channels, function (channel) {
             return channel.getUnreadCounter();
         });
-        var unreadChannelCounter = _.reduce(channelUnreadCounters, function (c1, c2) {
-            return c1 + c2;
+        var unreadChannelCounter = _.reduce(channelUnreadCounters, function (acc, c) {
+            return c > 0 ? acc + 1 : acc;
         }, 0);
         var inboxCounter = this.call('mail_service', 'getMailbox', 'inbox').getMailboxCounter();
         var mailFailureCounter = this.call('mail_service', 'getMailFailures').length;
diff --git a/addons/mail/static/src/js/tour.js b/addons/mail/static/src/js/tour.js
index 10ee548b00b..6b7160f2aa6 100644
--- a/addons/mail/static/src/js/tour.js
+++ b/addons/mail/static/src/js/tour.js
@@ -6,21 +6,53 @@ var tour = require('web_tour.tour');
 
 var _t = core._t;
 
-tour.register('mail_tour', [{
+tour.register('mail_tour', {
+    url: "/web",
+}, [tour.STEPS.SHOW_APPS_MENU_ITEM, {
+    trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]',
+    content: _t('Want to <b>get in touch</b> with your contacts? <i>Discuss with them here.</i>'),
+    position: 'right',
+    edition: 'community',
+}, {
+    trigger: '.o_app[data-menu-xmlid="mail.menu_root_discuss"]',
+    content: _t('Want to <b>get in touch</b> with your contacts? <i>Discuss with them here.</i>'),
+    position: 'bottom',
+    edition: 'enterprise',
+}, {
     trigger: '.o_mail_discuss .o_mail_discuss_sidebar .o_add[data-type="public"]',
     content: _t("<p>Channels make it easy to organize information across different topics and groups.</p> <p>Try to <b>create your first channel</b> (e.g. sales, marketing, product XYZ, after work party, etc).</p>"),
     position: 'bottom',
 }, {
+    trigger: '.o_mail_discuss .o_mail_discuss_sidebar .o_mail_add_thread[data-type="public"]',
+    content: _t("<p>Create a channel here.</p>"),
+    position: 'right',
+    run: function (actions) {
+        var t = new Date().getTime();
+        actions.text("SomeChannel_" + t, this.$anchor.find("input"));
+    },
+}, {
+    trigger: ".ui-menu-item > a",
+    auto: true,
+    in_modal: false,
+}, {
     trigger: '.o_mail_discuss .o_composer_text_field',
     content: _t("<p><b>Write a message</b> to the members of the channel here.</p> <p>You can notify someone with <i>'@'</i> or link another channel with <i>'#'</i>. Start your message with <i>'/'</i> to get the list of possible commands.</p>"),
     position: "top",
     width: 350,
+    run: function (actions) {
+        var t = new Date().getTime();
+        actions.text("SomeText_" + t, this.$anchor);
+    },
+}, {
+    trigger: '.o_mail_discuss .o_thread_composer .o_composer_button_send',
+    content: _t("Post your message on the thread"),
+    position: "top",
 }, {
-    trigger: ".o_mail_discuss .o_mail_thread .o_thread_message_star",
+    trigger: '.o_mail_discuss .o_mail_thread .o_thread_message_star',
     content: _t("Messages can be <b>starred</b> to remind you to check back later."),
     position: "right",
 }, {
-    trigger: '.o_mail_discuss .o_mail_item_item[data-thread-id="mailbox_starred"]',
+    trigger: '.o_mail_discuss .o_mail_discuss_item[data-thread-id="mailbox_starred"]',
     content: _t("Once a message has been starred, you can come back and review it at any time here."),
     position: "bottom",
 }, {
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index e5db4a72524..f28e071b2f3 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -338,7 +338,7 @@
                         <i t-if="options.displayStars and !message.isSystemNotification() and !message.needsModeration()"
                             t-att-class="'fa fa-lg o_thread_icon o_thread_message_star ' + (message.isStarred() ? 'fa-star' : 'fa-star-o')"
                             t-att-data-message-id="message.getID()" title="Mark as Todo" role="img" aria-label="Mark as Todo"/>
-                       <i t-if="message.originatesFromChannel() and options.displayReplyIcons"
+                       <i t-if="message.isLinkedToDocumentThread() and options.displayReplyIcons"
                            class="fa fa-reply o_thread_icon o_thread_message_reply"
                            t-att-data-message-id="message.getID()" title="Reply" role="img" aria-label="Reply"/>
                         <i t-if="message.isNeedaction() and options.displayMarkAsRead"
diff --git a/addons/mail/static/tests/discuss_tests.js b/addons/mail/static/tests/discuss_tests.js
index 215d7486488..f9d0e992a44 100644
--- a/addons/mail/static/tests/discuss_tests.js
+++ b/addons/mail/static/tests/discuss_tests.js
@@ -424,7 +424,7 @@ QUnit.test('@ mention in channel', function (assert) {
 });
 
 QUnit.test('@ mention with special chars', function (assert) {
-    assert.expect(9);
+    assert.expect(10);
     var done = assert.async();
     var fetchListenersDef = $.Deferred();
     var receiveMessageDef = $.Deferred();
@@ -506,6 +506,12 @@ QUnit.test('@ mention with special chars', function (assert) {
                         assert.strictEqual(discuss.$('.o_thread_message_content a').text(),
                             "@\u0405pëciãlUser<&>\"`' \u30C4",
                             "should have correct mention link in the message content");
+                        $input.val("@");
+                        $input.trigger('keyup');
+                        var $mention = discuss.$('.o_mention_proposition');
+                        assert.strictEqual($mention.find('.o_mention_name').text(),
+                            '\u0405pëciãlUser<&>"`\' \u30C4',
+                            "first partner mention should still display the correct partner name");
                         discuss.destroy();
                         done();
                 });
@@ -513,6 +519,85 @@ QUnit.test('@ mention with special chars', function (assert) {
     });
 });
 
+QUnit.test('@ mention in mailing channel', function (assert) {
+    assert.expect(8);
+    var done = assert.async();
+
+    var fetchListenersDef = $.Deferred();
+
+    this.data.initMessaging = {
+        channel_slots: {
+            channel_channel: [{
+                id: 1,
+                channel_type: "channel",
+                name: "general",
+                mass_mailing: true,
+            }],
+        },
+    };
+
+    createDiscuss({
+        id: 1,
+        context: {},
+        params: {},
+        data: this.data,
+        services: this.services,
+        mockRPC: function (route, args) {
+            if (args.method === 'channel_fetch_listeners') {
+                fetchListenersDef.resolve();
+                return $.when([
+                    {id: 1, name: 'Admin'},
+                ]);
+            }
+            return this._super.apply(this, arguments);
+        },
+    })
+    .then(function (discuss) {
+        var $general = discuss.$('.o_mail_discuss_sidebar')
+                        .find('.o_mail_discuss_item[data-thread-id=1]');
+
+        // click on general
+        $general.click();
+        // 1st composer: basic composer (hidden), 2nd composer: extended (shown)
+        var $input = discuss.$('textarea.o_composer_text_field').eq(1);
+        assert.ok($input.length, "should display a composer input");
+
+        // Simulate '@' typed by user with mocked Window.getSelection
+        // Note: focus is needed in order to trigger rpc 'channel_fetch_listeners'
+        $input.focus();
+        $input.val("@");
+        $input.trigger('keyup');
+
+        fetchListenersDef
+            .then(concurrency.delay.bind(concurrency, 0))
+            .then(function () {
+                assert.strictEqual(discuss.$('.dropup.o_composer_mention_dropdown.show').length, 1,
+                "dropup menu for partner mentions should be open");
+
+                var $mention = discuss.$('.o_mention_proposition');
+                assert.strictEqual($mention.length, 1,
+                    "should display 1 partner mention proposition");
+
+                // correct mention proposition
+                assert.ok($mention.hasClass('active'),
+                    "partner mention should be active");
+                assert.strictEqual($mention.data('id'), 1,
+                    "partner mention should link to the correct partner id");
+                assert.strictEqual($mention.find('.o_mention_name').text(), "Admin",
+                    "partner mention should display the correct partner name");
+
+                // equivalent to $mentionPropositions.find('active').click();
+                $input.trigger($.Event('keyup', {which: $.ui.keyCode.ENTER}));
+
+                assert.ok($input.is(':focus'), "composer body should have focus");
+                assert.notOk(discuss.$('.o_composer_subject').is(':focus'));
+
+                discuss.destroy();
+                done();
+        });
+    });
+});
+
 QUnit.test('no crash focusout emoji button', function (assert) {
     assert.expect(3);
     var done = assert.async();
@@ -1055,5 +1140,84 @@ QUnit.test('drag and drop file in composer', function (assert) {
     });
 });
 
+QUnit.test('reply to message from inbox', function (assert) {
+    var done = assert.async();
+    assert.expect(11);
+
+    var self = this;
+    this.data['mail.message'].records = [{
+        author_id: [5, 'Demo User'],
+        body: '<p>test 1</p>',
+        id: 1,
+        needaction: true,
+        needaction_partner_ids: [3],
+        res_id: 100,
+        model: 'some.document',
+        record_name: 'SomeDocument',
+    }];
+    this.data.initMessaging = {
+        needaction_inbox_counter: 1,
+    };
+
+    createDiscuss({
+        id: 1,
+        context: {},
+        params: {},
+        data: this.data,
+        services: this.services,
+        session: { partner_id: 3 },
+        mockRPC: function (route, args) {
+            if (args.method === 'message_post') {
+                assert.step(args.method);
+                assert.strictEqual(args.model, 'some.document',
+                    "should post message to correct document model");
+                assert.strictEqual(args.args[0], 100,
+                    "should post message to correct document ID");
+
+                self.data['mail.message'].records.push({
+                    author_id: [3, 'Me'],
+                    body: args.kwargs.body,
+                    id: 2,
+                    res_id: 100,
+                    model: 'some.document',
+                    record_name: 'SomeDocument',
+                });
+                return $.when(2);
+            }
+            return this._super.apply(this, arguments);
+        },
+    })
+    .then(function (discuss) {
+        assert.strictEqual(discuss.$('.o_mail_discuss_item.o_active').data('thread-id'),
+            'mailbox_inbox',
+            "Inbox should be selected by default");
+        assert.containsOnce(discuss, '.o_thread_message',
+            "should display a single message in inbox");
+        assert.strictEqual(discuss.$('.o_thread_message').data('message-id'), 1,
+            "message should be linked to correct message");
+        assert.containsOnce(discuss.$('.o_thread_message'), '.o_thread_message_reply',
+            "should display the reply icon for message linked to a document");
+
+        testUtils.dom.click(discuss.$('.o_thread_message_reply'));
+        var $composer = discuss.$('.o_thread_composer_extended');
+        assert.isVisible($composer,
+            "extended composer should become visible");
+        assert.strictEqual($composer.find('.o_composer_subject input').val(),
+            'Re: SomeDocument',
+            "composer should have copied document name as subject of message");
+
+        var $textarea = $composer.find('.o_composer_input textarea').first();
+        testUtils.fields.editInput($textarea, 'someContent');
+        assert.containsOnce($composer, '.o_composer_button_send',
+            "should have button to send reply message");
+        testUtils.dom.click($composer.find('.o_composer_button_send'));
+
+        assert.verifySteps(['message_post']);
+
+        discuss.destroy();
+        done();
+    });
+});
+
 });
 });
diff --git a/addons/mail/static/tests/systray/systray_messaging_menu_tests.js b/addons/mail/static/tests/systray/systray_messaging_menu_tests.js
index d020cf81151..44651a70523 100644
--- a/addons/mail/static/tests/systray/systray_messaging_menu_tests.js
+++ b/addons/mail/static/tests/systray/systray_messaging_menu_tests.js
@@ -625,5 +625,161 @@ QUnit.test("messaging menu widget: channel seen notification", function ( assert
     messagingMenu.destroy();
 });
 
+QUnit.test("messaging menu widget: preview with no message should be undated", function ( assert ) {
+    assert.expect(2);
+
+    // remove any message on the channel
+    this.data['mail.channel'].records[0].channel_message_ids = [];
+    this.data['mail.message'].records[0].channel_ids = [];
+
+    var messagingMenu = new MessagingMenu();
+    testUtils.addMockEnvironment(messagingMenu, {
+        services: this.services,
+        data: this.data,
+    });
+
+    messagingMenu.appendTo($('#qunit-fixture'));
+
+    messagingMenu.$('.dropdown-toggle').click();
+
+    assert.strictEqual(messagingMenu.$('.o_mail_preview').length, 1,
+        "should have two previews in messaging menu");
+
+    assert.ok(_.isEmpty(messagingMenu.$('.o_mail_preview .o_last_message_date').text().trim()),
+        "should have preview as undated");
+
+    messagingMenu.destroy();
+});
+
+QUnit.test("messaging menu widget: sort dated previews before undated previews", function ( assert ) {
+    assert.expect(5);
+
+    var dm = {
+        id: 2,
+        name: "DM",
+        channel_type: "chat",
+    };
+
+    this.data['mail.channel'].records.push(dm);
+    this.data.initMessaging.channel_slots.direct_message = [dm];
+
+    var messagingMenu = new MessagingMenu();
+    testUtils.addMockEnvironment(messagingMenu, {
+        services: this.services,
+        data: this.data,
+    });
+
+    messagingMenu.appendTo($('#qunit-fixture'));
+    messagingMenu.$('.dropdown-toggle').click();
+
+    assert.strictEqual(messagingMenu.$('.o_mail_preview').length, 2,
+        "should have two previews in messaging menu");
+
+    var $preview1 = messagingMenu.$('.o_mail_preview').eq(0);
+    var $preview2 = messagingMenu.$('.o_mail_preview').eq(1);
+
+    assert.strictEqual($preview1.data('preview-id'), 1,
+        "should have channel preview as the 1st preview (dated preview)");
+    assert.notOk(_.isEmpty($preview1.find('.o_last_message_date').text().trim()),
+        "should have channel preview as dated");
+    assert.strictEqual($preview2.data('preview-id'), 2,
+        "should have DM preview as the 1st preview (non-dated preview)");
+    assert.ok(_.isEmpty($preview2.find('.o_last_message_date').text().trim()),
+        "should have DM preview as undated");
+
+    messagingMenu.destroy();
+});
+
+QUnit.test('global counter with channel previews', function (assert) {
+    assert.expect(5);
+
+    var channels = [{
+        id: 1,
+        name: "channel1",
+        channel_type: "channel",
+        channel_message_ids: [1, 2],
+        message_unread_counter: 2,
+    }, {
+        id: 2,
+        name: "channel2",
+        channel_type: "channel",
+        channel_message_ids: [3],
+        message_unread_counter: 1,
+    }, {
+        id: 3,
+        name: "channel3",
+        channel_type: "channel",
+        channel_message_ids: [4],
+        message_unread_counter: 0,
+    }];
+
+    var messages = [{
+        author_id: [1, "Demo"],
+        body: "<p>message 1</p>",
+        channel_ids: [1],
+        id: 1,
+        model: 'mail.channel',
+        record_name: 'channel1',
+        res_id: 1,
+    }, {
+        author_id: [1, "Demo"],
+        body: "<p>message 2</p>",
+        channel_ids: [1],
+        id: 2,
+        model: 'mail.channel',
+        record_name: 'channel1',
+        res_id: 1,
+    }, {
+        author_id: [1, "Demo"],
+        body: "<p>message 3</p>",
+        channel_ids: [2],
+        id: 3,
+        model: 'mail.channel',
+        record_name: 'channel2',
+        res_id: 2,
+    }, {
+        author_id: [1, "Demo"],
+        body: "<p>message 4</p>",
+        channel_ids: [3],
+        id: 4,
+        model: 'mail.channel',
+        record_name: 'channel3',
+        res_id: 3,
+    }];
+
+    this.data['mail.channel'].records = channels;
+    this.data.initMessaging.channel_slots.channel_channel = channels;
+    this.data['mail.message'].records = messages;
+
+    var messagingMenu = new MessagingMenu();
+    testUtils.addMockEnvironment(messagingMenu, {
+        services: this.services,
+        data: this.data,
+        session: {
+            partner_id: 3,
+        },
+    });
+    messagingMenu.appendTo($('#qunit-fixture'));
+    assert.strictEqual(messagingMenu.$('.o_notification_counter').text(), '2',
+        "should display a counter of 2 on the messaging menu icon");
+
+    messagingMenu.$('.dropdown-toggle').click();
+
+    assert.strictEqual(messagingMenu.$('.o_mail_preview').length, 3,
+        "should display 3 previews");
+    var $previewChannel1 = messagingMenu.$('.o_mail_preview[data-preview-id=1]');
+    var $previewChannel2 = messagingMenu.$('.o_mail_preview[data-preview-id=2]');
+    var $previewChannel3 = messagingMenu.$('.o_mail_preview[data-preview-id=3]');
+
+    assert.strictEqual($previewChannel1.data('unread-counter'), 2,
+        "preview of channel 1 should have unread counter of 2");
+    assert.strictEqual($previewChannel2.data('unread-counter'), 1,
+        "preview of channel 2 should have unread counter of 1");
+    assert.strictEqual($previewChannel3.data('unread-counter'), 0,
+        "preview of channel 3 should have unread counter of 0");
+
+    messagingMenu.destroy();
+});
+
 });
 });
diff --git a/addons/mail/static/tests/thread_window/blank_thread_window_tests.js b/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
index 0f3c7c7bbe7..4f103f71163 100644
--- a/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
@@ -229,7 +229,7 @@ QUnit.test('open new DM chat from blank thread window', function (assert) {
     selectDef.then(function () {
         assert.strictEqual($('.o_thread_window').length, 1,
             "should be a single window");
-        assert.strictEqual($('.o_thread_window_title').text().trim(), "#DemoUser1",
+        assert.strictEqual($('.o_thread_window_title').text().trim(), "DemoUser1",
             "should have thread window of the DM chat with 'DemoUser1'");
         assert.strictEqual($('.o_composer_text_field').length, 1,
             "should have a composer in the DM chat window");
@@ -285,7 +285,7 @@ QUnit.test('open already detached DM chat from blank thread window', function (a
 
     assert.strictEqual($('.o_thread_window').length, 1,
         "should be a single window");
-    assert.strictEqual($('.o_thread_window_title').text().trim(), "#DemoUser1",
+    assert.strictEqual($('.o_thread_window_title').text().trim(), "DemoUser1",
         "should have thread window of the DM chat with 'DemoUser1'");
     assert.strictEqual($('.o_composer_text_field').length, 1,
         "should have a composer in the DM chat window");
@@ -304,7 +304,7 @@ QUnit.test('open already detached DM chat from blank thread window', function (a
     selectDef.then(function () {
         assert.strictEqual($('.o_thread_window').length, 1,
             "should now have a single thread window open");
-        assert.strictEqual($('.o_thread_window_title').text().trim(), "#DemoUser1",
+        assert.strictEqual($('.o_thread_window_title').text().trim(), "DemoUser1",
             "the remaining thread window should be the DM chat with 'DemoUser1'");
 
         self.unpatchAutocomplete();
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 35d04f66659..e8d9cbcbda3 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from lxml import etree
+from lxml.html import builder as html
+
 from odoo import _, api, fields, models
 
 
@@ -12,18 +15,27 @@ class Invite(models.TransientModel):
     @api.model
     def default_get(self, fields):
         result = super(Invite, self).default_get(fields)
+        if self._context.get('mail_invite_follower_channel_only'):
+            result['send_mail'] = False
+        if 'message' not in fields:
+            return result
+
         user_name = self.env.user.display_name
         model = result.get('res_model')
         res_id = result.get('res_id')
-        if self._context.get('mail_invite_follower_channel_only'):
-            result['send_mail'] = False
-        if 'message' in fields and model and res_id:
-            model_name = self.env['ir.model']._get(model).display_name
-            document_name = self.env[model].browse(res_id).display_name
-            message = _('<div><p>Hello,</p><p>%s invited you to follow %s document: %s.</p></div>') % (user_name, model_name, document_name)
-            result['message'] = message
-        elif 'message' in fields:
-            result['message'] = _('<div><p>Hello,</p><p>%s invited you to follow a new document.</p></div>') % user_name
+        if model and res_id:
+            document = self.env['ir.model']._get(model).display_name
+            title = self.env[model].browse(res_id).display_name
+            msg_fmt = _('%(user_name)s invited you to follow %(document)s document: %(title)s')
+        else:
+            msg_fmt = _('%(user_name)s invited you to follow a new document.')
+
+        text = msg_fmt % locals()
+        message = html.DIV(
+            html.P(_('Hello,')),
+            html.P(text)
+        )
+        result['message'] = etree.tostring(message)
         return result
 
     res_model = fields.Char('Related Document Model', required=True, index=True, help='Model of the followed resource')
diff --git a/addons/mail_bot/i18n/da.po b/addons/mail_bot/i18n/da.po
index 01b07890f00..6fd9d1a2a59 100644
--- a/addons/mail_bot/i18n/da.po
+++ b/addons/mail_bot/i18n/da.po
@@ -9,13 +9,15 @@
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:05+0000\n"
-"PO-Revision-Date: 2018-10-02 10:05+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:20+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +76,7 @@ msgstr ""
 #. module: mail_bot
 #: model:ir.model,name:mail_bot.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: mail_bot
 #: code:addons/mail_bot/models/mail_channel.py:38
diff --git a/addons/mail_bot/models/mail_channel.py b/addons/mail_bot/models/mail_channel.py
index 3e2258902bf..efada26b88a 100644
--- a/addons/mail_bot/models/mail_channel.py
+++ b/addons/mail_bot/models/mail_channel.py
@@ -12,13 +12,6 @@ class Channel(models.Model):
         self.env['mail.bot']._apply_logic(self, kwargs, command="help")  # kwargs are not usefull but...
 
     @api.model
-    def channel_fetch_listeners(self, uuid):
-        """ Return the id, name and email of partners listening to the given channel """
-        result = super().channel_fetch_listeners(uuid)
-        odoobot = self.env.ref("base.partner_root").sudo()
-        return result + [{'id': odoobot.id, 'name': odoobot.name, 'email': odoobot.email}]
-
-    @api.model
     def init_odoobot(self):
         if self.env.user.odoobot_state == 'not_initialized':
             partner = self.env.user.partner_id
diff --git a/addons/maintenance/i18n/da.po b/addons/maintenance/i18n/da.po
index 9ad04d0aa1c..243c6081f4f 100644
--- a/addons/maintenance/i18n/da.po
+++ b/addons/maintenance/i18n/da.po
@@ -12,9 +12,9 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Martin Trigaux, 2018
 # Jesper Carstensen <info@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:20+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -414,7 +414,7 @@ msgstr "Udført"
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_request__duration
@@ -882,7 +882,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__activity_type_id
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_request__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_form
@@ -1211,7 +1211,7 @@ msgstr "Opsætning"
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_search
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_search
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: maintenance
 #: model:maintenance.equipment.category,name:maintenance.equipment_software
@@ -1243,6 +1243,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: maintenance
 #: model:mail.message.subtype,description:maintenance.mt_req_status
diff --git a/addons/maintenance/i18n/es.po b/addons/maintenance/i18n/es.po
index fe9b482c230..2e2293bd089 100644
--- a/addons/maintenance/i18n/es.po
+++ b/addons/maintenance/i18n/es.po
@@ -3,20 +3,22 @@
 # * maintenance
 # 
 # Translators:
-# Martin Trigaux, 2018
-# Cristopher Cravioto <ccr@odoo.com>, 2018
 # Miquel Torner <miq@odoo.com>, 2018
+# Cristopher Cravioto <ccr@odoo.com>, 2018
 # e2f <projects@e2f.com>, 2018
+# Martin Trigaux, 2018
 # Antonio Trueba, 2018
 # RGB Consulting <odoo@rgbconsulting.com>, 2018
 # Nicolás Broggi <rnbroggi@gmail.com>, 2018
+# Emilio Silva <efsilvay@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: Nicolás Broggi <rnbroggi@gmail.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:20+0000\n"
+"Last-Translator: Emilio Silva <efsilvay@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,7 +29,7 @@ msgstr ""
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban
 msgid "<b>Category:</b>"
-msgstr "Categoría"
+msgstr "<b>Categoría</b>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
@@ -42,17 +44,17 @@ msgstr "<b>Petición a:</b>"
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban
 msgid "<b>Serial Number:</b>"
-msgstr "<b>Número de seri:</b>"
+msgstr "<b>Número de serie:</b>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
 msgid "<span class=\"badge badge-warning float-right\">Canceled</span>"
-msgstr ""
+msgstr "<span class=\"badge badge-warning float-right\">Cancelado</span>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
 msgid "<span class=\"ml8\">hours</span>"
-msgstr ""
+msgstr "<span class=\"ml8\">horas</span>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.maintenance_team_kanban
@@ -67,12 +69,12 @@ msgstr "<span>Ver</span>"
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
 msgid "<strong>Equipments:</strong>"
-msgstr "<strong/>"
+msgstr "<strong>Equipamiento</strong>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.view_maintenance_equipment_category_kanban
 msgid "<strong>Maintenance:</strong>"
-msgstr "<strong/>"
+msgstr "<strong>Mantenimiento</strong>"
 
 #. module: maintenance
 #: model:ir.model.fields,help:maintenance.field_maintenance_equipment_category__alias_defaults
@@ -317,7 +319,7 @@ msgstr "Creado por"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_request__owner_user_id
 msgid "Created by User"
-msgstr ""
+msgstr "Creado por Usuario"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__create_date
@@ -704,7 +706,7 @@ msgstr "Calendario de mantenimiento"
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__maintenance_count
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__maintenance_count
 msgid "Maintenance Count"
-msgstr ""
+msgstr "Cuenta de mantenimiento"
 
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__maintenance_duration
@@ -725,7 +727,7 @@ msgstr "Equipo de mantenimiento"
 #. module: maintenance
 #: model:ir.model,name:maintenance.model_maintenance_equipment_category
 msgid "Maintenance Equipment Category"
-msgstr ""
+msgstr "Categoría Equipo de mantenimiento"
 
 #. module: maintenance
 #: model:ir.model,name:maintenance.model_maintenance_request
@@ -1119,6 +1121,8 @@ msgstr "Solicitud hecha"
 #, python-format
 msgid "Request planned for <a href=\"#\" data-oe-model=\"%s\" data-oe-id=\"%s\">%s</a>"
 msgstr ""
+"Solicitud planeada para <a href=\"#\" data-oe-model=\"%s\" data-oe-"
+"id=\"%s\">%s</a>"
 
 #. module: maintenance
 #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_form
@@ -1427,7 +1431,7 @@ msgstr "Muy baja"
 #. module: maintenance
 #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment__warranty_date
 msgid "Warranty Expiration Date"
-msgstr ""
+msgstr "Fecha Expiración Garantía"
 
 #. module: maintenance
 #: code:addons/maintenance/models/maintenance.py:77
diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml
index 9e8fadfe24b..0fefbc07f78 100644
--- a/addons/maintenance/security/maintenance.xml
+++ b/addons/maintenance/security/maintenance.xml
@@ -65,4 +65,8 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record id="base.user_admin" model="res.users">
+        <field name="groups_id" eval="[(4, ref('group_equipment_manager'))]"/>
+    </record>
+
 </odoo>
diff --git a/addons/mass_mailing/i18n/da.po b/addons/mass_mailing/i18n/da.po
index 17c6a336780..fa573d545f0 100644
--- a/addons/mass_mailing/i18n/da.po
+++ b/addons/mass_mailing/i18n/da.po
@@ -13,9 +13,9 @@
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:20+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -357,7 +357,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_list_contact_rel__is_blacklisted
 #: model:ir.ui.menu,name:mass_mailing.mail_blacklist_mm_menu
 msgid "Blacklist"
-msgstr ""
+msgstr "Blacklist"
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.unsubscribe
@@ -510,7 +510,7 @@ msgstr "Firma navn"
 #. module: mass_mailing
 #: model:ir.model,name:mass_mailing.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: mass_mailing
 #: model:ir.ui.menu,name:mass_mailing.mass_mailing_configuration
@@ -569,7 +569,7 @@ msgstr ""
 #. module: mass_mailing
 #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_contacts
 msgid "Create a contact in your address book"
-msgstr ""
+msgstr "Opret en kontakt i din adressebog"
 
 #. module: mass_mailing
 #: model_terms:ir.actions.act_window,help:mass_mailing.action_create_ab_mass_mailings_from_campaign
@@ -778,7 +778,7 @@ msgstr "Udkast"
 #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban
 #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form
@@ -997,6 +997,8 @@ msgid ""
 "If the email address is on the blacklist, the contact won't receive mass "
 "mailing anymore, from any list"
 msgstr ""
+"Hvis e-mailadressen er blacklisted, vil kontakten ikke længere modtage "
+"masseudskrifter fra enhver liste"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__ignored
@@ -1579,6 +1581,7 @@ msgstr "Odoo præsenterer"
 #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_contacts
 msgid "Odoo helps you to easily track all activities related to a customer."
 msgstr ""
+"Odoo hjælper dig med at spore alle aktiviteter relateret til en kunde."
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_image_text
diff --git a/addons/mass_mailing/i18n/uk.po b/addons/mass_mailing/i18n/uk.po
index 40701bc6fb2..4903518d364 100644
--- a/addons/mass_mailing/i18n/uk.po
+++ b/addons/mass_mailing/i18n/uk.po
@@ -1602,7 +1602,7 @@ msgstr "Odoo допоможе вам легко відстежувати дії,
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_image_text
 msgid "Omnichannel sales"
-msgstr "Omnichannel продажі"
+msgstr "Багато-канальні продажі"
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_rel_list_contact_view_tree
@@ -1827,7 +1827,7 @@ msgstr "Повторити"
 #. module: mass_mailing
 #: model:ir.model,name:mass_mailing.model_mail_mass_mailing_test
 msgid "Sample Mail Wizard"
-msgstr "Помічник Sample Mail"
+msgstr "Помічник прикладу пошти"
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.mass_mailing_schedule_date_view_form
@@ -2010,7 +2010,7 @@ msgstr "Область"
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__state_update
 msgid "State Update"
-msgstr "Онвлення етапу"
+msgstr "Оновлення етапу"
 
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail__statistics_ids
@@ -2111,7 +2111,7 @@ msgid ""
 "                                business experts to build hundreds of apps in just a few years."
 msgstr ""
 "Модель Odoo з відкритим вихідним кодом дозволила нам використати тисячі розробників та\n"
-"експертів з бізнесу створили сотні додатків всього за кілька років."
+"експертів з бізнесу, щоб створити сотні додатків всього за кілька років."
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image
@@ -2267,7 +2267,7 @@ msgid ""
 "Usability improvements made on Odoo will automatically apply to all\n"
 "                                of our fully integrated apps."
 msgstr ""
-"Удосконалення юзабіліті, внесені на Odoo, автоматично застосовуватимуться до всіх\n"
+"Удосконалення використання, внесене на Odoo, автоматично застосовуватиметься до всіх\n"
 "наших повністю інтегрованих додатків."
 
 #. module: mass_mailing
@@ -2313,10 +2313,10 @@ msgid ""
 " back please accept this 20% discount on you next purchase by clicking the "
 "button."
 msgstr ""
-"Ми продовжуємо рости, і ми не хочемо, щоб ви були частиною цього! Ми "
-"збільшили час магазину та отримали багато нових брендів. Щоб привітати вас "
-"назад, будь ласка, прийміть цю знижку на 20% на наступну покупку, натиснувши"
-" кнопку."
+"Ми продовжуємо рости і хочемо, щоби ви були частиною цього! Ми збільшили час"
+" магазину та отримали багато нових брендів. Щоби привітати вас із "
+"поверненням, будь ласка, прийміть цю знижку на 20% на наступну покупку, "
+"натиснувши кнопку."
 
 #. module: mass_mailing
 #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text
@@ -2324,7 +2324,7 @@ msgid ""
 "We want to take this opportunity to welcome you to our ever-growing "
 "community!<br/>"
 msgstr ""
-"Ми хочемо скористатися цією можливістю, щоб вітати вас у нашій постійно "
+"Ми хочемо скористатися цією можливістю, щоби привітати вас у нашій постійно "
 "зростаючій спільноті!<br/>"
 
 #. module: mass_mailing
@@ -2337,7 +2337,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__website_message_ids
 msgid "Website Messages"
-msgstr "Повідомлення з вебсайту"
+msgstr "Повідомлення з веб-сайту"
 
 #. module: mass_mailing
 #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__website_message_ids
@@ -2355,7 +2355,7 @@ msgid ""
 "With strong technical foundations, Odoo's framework is unique.\n"
 "                                It provides top notch usability that scales across all apps."
 msgstr ""
-"Завдяки сильним технічним засадам, система Odoo унікальна.\n"
+"Завдяки сильним технічним засадам, система Odoo - унікальна.\n"
 "Вона забезпечує високу зручність використання, що поширюється у всіх додатках."
 
 #. module: mass_mailing
@@ -2364,8 +2364,8 @@ msgid ""
 "With strong technical foundations, Odoo's framework is unique. It provides "
 "<strong>top notch usability that scales across all apps</strong>."
 msgstr ""
-"Завдяки сильним технічним засадам, система Odoo унікальна. Це "
-"передбачає<strong>високу юзабіліті, яка масштабується у всіх "
+"Завдяки сильним технічним засадам, система Odoo - унікальна. Це "
+"передбачає<strong>високе використання, яке масштабується у всіх "
 "додатках</strong>."
 
 #. module: mass_mailing
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index 898742d8b7f..717f36b90e6 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +33,7 @@ msgstr "# Оплачено"
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_report_membership__num_waiting
 msgid "# Waiting"
-msgstr "# В черзі"
+msgstr "# Очікування"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.membership_products_kanban
@@ -39,6 +41,8 @@ msgid ""
 "<i class=\"fa fa-clock-o\" role=\"img\" aria-label=\"Period\" "
 "title=\"Period\"/><strong> From: </strong>"
 msgstr ""
+"<i class=\"fa fa-clock-o\" role=\"img\" aria-label=\"Period\" "
+"title=\"Period\"/><strong> Від: </strong>"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.membership_products_kanban
@@ -52,6 +56,8 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Член, з яким ви хочете пов'язувати ваше членство. Він буде розглядати стан "
+"членства асоційованого члена."
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line__account_invoice_line
@@ -66,17 +72,17 @@ msgstr "Додати опис..."
 #. module: membership
 #: model_terms:ir.actions.act_window,help:membership.action_membership_members
 msgid "Add a new member"
-msgstr ""
+msgstr "Додати нового члена"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "All Members"
-msgstr "Всі учасники"
+msgstr "Усі учасники"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "All non Members"
-msgstr "Всі не учасники"
+msgstr "Усі не учасники"
 
 #. module: membership
 #: model:ir.model.fields,help:membership.field_membership_membership_line__member_price
@@ -94,7 +100,7 @@ msgstr "Доданий учасник"
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_report_membership_search
 msgid "Associated Partner"
-msgstr "Асоційований партнер"
+msgstr "Доданий партнер"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_partner_form
@@ -244,13 +250,13 @@ msgstr "Дата завершення членства"
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "Кінцева дата членства"
 
 #. module: membership
 #: sql_constraint:product.template:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
 msgstr ""
-"Помилка ! Дата завершення не може бути призначеною перед Датою початку."
+"Помилка! Дата завершення не може бути призначеною перед датою початку."
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_report_membership_search
@@ -264,7 +270,7 @@ msgstr "Прогноз"
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
-msgstr "Вільний учасник"
+msgstr "Безкоштовний учасник"
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line__date_from
@@ -357,9 +363,9 @@ msgstr ""
 "Це вказує на статус членства.\n"
 "-Учасник: Учасник, який не подав заявку на членство.\n"
 "-Скасований учасник: Учасник, який скасував своє членство.\n"
-"-Старий учасник: Учасник чиє членство закінчилося.\n"
-"-Учасник в очікування: Учасник, який подав заявку на членство, а рахунок-фактура буде створена.\n"
-"-Учасник з рахунок: Учасник, чий рахунок було створено.\n"
+"-Старий учасник: Учасник, чиє членство закінчилося.\n"
+"-Учасник в очікування: Учасник, який подав заявку на членство, а рахунок-фактуру буде створено.\n"
+"-Рахунок-фактура учасника: Учасник, чий рахунок було створено.\n"
 "-Учасник, що оплатив: Учасник, який оплатив своє членство."
 
 #. module: membership
@@ -463,7 +469,7 @@ msgstr "Рахунок-фактура членства"
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Membership Line"
-msgstr ""
+msgstr "Рядок членства"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_res_partner_member_filter
@@ -542,6 +548,8 @@ msgid ""
 "Odoo helps you easily track all activities related to a member: \n"
 "                  Current Membership Status, Discussions and History of Membership, etc."
 msgstr ""
+"Odoo допомагає вам легко відстежувати всі дії, пов'язані з членом:\n"
+"                  Поточний статус членства, дискусії та історія членства тощо."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -572,7 +580,7 @@ msgstr "У партнера немає адреси, щоби виставити
 #: code:addons/membership/models/partner.py:184
 #, python-format
 msgid "Partner is a free Member."
-msgstr "Партнер - вільний учасник."
+msgstr "Партнер - безкоштовний учасник."
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_report_membership__tot_pending
@@ -622,7 +630,7 @@ msgstr "Початкова дата"
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.view_res_partner_member_filter
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Початкова дата членства"
 
 #. module: membership
 #: model_terms:ir.ui.view,arch_db:membership.membership_products_form
@@ -649,7 +657,7 @@ msgstr "Відображатимуться сплачені, старі та з�
 #: model_terms:ir.ui.view,arch_db:membership.view_report_membership_search
 msgid "This will display waiting, invoiced and total pending columns"
 msgstr ""
-"Будуть відображатися стовпці очікування, рахунки-фактури та очікувана сума"
+"Будуть відображатися стовпці очікування, рахунка-фактури та очікуваної суми"
 
 #. module: membership
 #: model:ir.model.fields,field_description:membership.field_membership_membership_line__date_to
@@ -672,4 +680,4 @@ msgstr "Учасник в учікування"
 #: code:addons/membership/models/partner.py:162
 #, python-format
 msgid "You cannot create recursive associated members."
-msgstr ""
+msgstr "Ви не можете створювати рекурсивних асоційованих учасників."
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index 355c6997837..bfd30db9fb2 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -9,10 +9,10 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
 "PO-Revision-Date: 2018-08-24 09:21+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -752,7 +752,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_configuration
@@ -2015,7 +2015,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:mrp.field_mrp_production__activity_type_id
 #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_routing_workcenter__batch
@@ -3105,7 +3105,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
 #: model_terms:ir.ui.view,arch_db:mrp.view_mrp_production_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: mrp
 #: model:product.product,description:mrp.product_product_computer_desk_head
@@ -3200,6 +3200,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_warehouse__sam_type_id
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index b4381ede79e..70110497d97 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -77,7 +77,7 @@ msgstr ""
 #: model:product.product,description:mrp.product_product_computer_desk_leg
 #: model:product.template,description:mrp.product_product_computer_desk_leg_product_template
 msgid "18″ x 2½″ Square Leg"
-msgstr "18″ x 2½″ Квадратна нога"
+msgstr "18 \"x 2½\" плоскогір'я"
 
 #. module: mrp
 #: code:addons/mrp/models/mrp_bom.py:339
@@ -123,7 +123,7 @@ msgstr "<span class=\"o_stat_text\">Продуктивність</span>"
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_production_form_view
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_production_workorder_form_view_inherit
 msgid "<span class=\"o_stat_text\">Scraps</span>"
-msgstr "<span class=\"o_stat_text\">Записки</span>"
+msgstr "<span class=\"o_stat_text\">Брак</span>"
 
 #. module: mrp
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_routing_form_view
@@ -264,7 +264,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_document__access_token
 msgid "Access Token"
-msgstr "Доступ Токена"
+msgstr "Токен доступу"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_rule__action
@@ -398,7 +398,7 @@ msgstr "Підрахунок прикріплення"
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_mrp_document__local_url
 msgid "Attachment URL"
-msgstr "URL долучення"
+msgstr "URL прикріплення"
 
 #. module: mrp
 #. openerp-web
@@ -408,7 +408,7 @@ msgstr "URL долучення"
 #: model_terms:ir.ui.view,arch_db:mrp.report_mrp_bom
 #, python-format
 msgid "Attachments"
-msgstr "Долучення"
+msgstr "Прикріплення"
 
 #. module: mrp
 #: selection:mrp.workcenter.productivity.loss.type,loss_type:0
@@ -686,7 +686,7 @@ msgstr "Змінити кількість товару"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Production Qty"
-msgstr ""
+msgstr "Змінити кількість виробницта"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
@@ -3268,7 +3268,7 @@ msgstr "Переміщення запасів"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: mrp
 #: model:ir.model.fields,field_description:mrp.field_stock_warehouse__sam_loc_id
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 0e9facd7819..c961c14f400 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -1260,7 +1260,7 @@ msgstr "从"
 #. module: mrp
 #: model_terms:ir.ui.view,arch_db:mrp.oee_search_view
 msgid "Fully Productive"
-msgstr "所有生产力"
+msgstr "全部生产力"
 
 #. module: mrp
 #: model_terms:ir.ui.view,arch_db:mrp.mrp_unbuild_search_view
diff --git a/addons/mrp/models/mrp_bom.py b/addons/mrp/models/mrp_bom.py
index 8a3708ad90c..b756f77957f 100644
--- a/addons/mrp/models/mrp_bom.py
+++ b/addons/mrp/models/mrp_bom.py
@@ -71,8 +71,12 @@ class MrpBom(models.Model):
     @api.constrains('product_id', 'product_tmpl_id', 'bom_line_ids')
     def _check_product_recursion(self):
         for bom in self:
-            if bom.bom_line_ids.filtered(lambda x: x.product_id.product_tmpl_id == bom.product_tmpl_id):
-                raise ValidationError(_('BoM line product %s should not be same as BoM product.') % bom.display_name)
+            if bom.product_id:
+                if bom.bom_line_ids.filtered(lambda x: x.product_id == bom.product_id):
+                    raise ValidationError(_('BoM line product %s should not be same as BoM product.') % bom.display_name)
+            else:
+                if bom.bom_line_ids.filtered(lambda x: x.product_id.product_tmpl_id == bom.product_tmpl_id):
+                    raise ValidationError(_('BoM line product %s should not be same as BoM product.') % bom.display_name)
 
     @api.onchange('product_uom_id')
     def onchange_product_uom_id(self):
diff --git a/addons/mrp_bom_cost/i18n/uk.po b/addons/mrp_bom_cost/i18n/uk.po
index bf1f1f0cae6..eb7d8b4d891 100644
--- a/addons/mrp_bom_cost/i18n/uk.po
+++ b/addons/mrp_bom_cost/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:06+0000\n"
-"PO-Revision-Date: 2018-10-02 10:06+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +27,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:mrp_bom_cost.product_product_view_form_normal_inherit_extended
 #: model_terms:ir.ui.view,arch_db:mrp_bom_cost.product_variant_easy_edit_view_bom_inherit
 msgid "Compute Price from BoM"
-msgstr ""
+msgstr "Розрахуйте ціну зі специфікації"
 
 #. module: mrp_bom_cost
 #: model_terms:ir.ui.view,arch_db:mrp_bom_cost.product_product_ext_form_view2
@@ -35,8 +37,8 @@ msgid ""
 "Compute the price of the product using products and operations of related "
 "bill of materials, for manufactured products only."
 msgstr ""
-"Обчислити ціну товару, використовуючи товари та операції відповідного "
-"векселя матеріалів, тільки для виготовлених товарів."
+"Обчисліть ціну товару, використовуючи товари та операції відповідної "
+"специфікації, тільки для виготовлених товарів."
 
 #. module: mrp_bom_cost
 #: model:ir.model,name:mrp_bom_cost.model_product_product
@@ -55,3 +57,5 @@ msgid ""
 "The inventory valuation of some products %s is automated. You can only "
 "update their cost from the product form."
 msgstr ""
+"Складську оцінку деяких товарів %s автоматизовано. Ви можете оновити їх "
+"вартість лише з форми товару."
diff --git a/addons/mrp_byproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po
index c45e948250c..90cf2dbae60 100644
--- a/addons/mrp_byproduct/i18n/uk.po
+++ b/addons/mrp_byproduct/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +28,7 @@ msgstr "Специфікація"
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct__bom_id
 msgid "BoM"
-msgstr "СЦ"
+msgstr "Специфікація"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
@@ -42,7 +44,7 @@ msgstr "Побічні товари"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Production Qty"
-msgstr ""
+msgstr "Змінити кількість виробництва"
 
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct__create_uid
@@ -82,7 +84,7 @@ msgstr "Останнє оновлення"
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct__operation_id
 msgid "Produced at Operation"
-msgstr "Вироблення під час операції"
+msgstr "Виготовлено під час операції"
 
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct__product_id
@@ -126,11 +128,13 @@ msgid ""
 "The unit of measure you chose is in a different category than the product "
 "unit of measure."
 msgstr ""
+"Одиниця вимірювання, яку ви вибрали, знаходиться в іншій категорії, ніж "
+"одиниця виміру товару."
 
 #. module: mrp_byproduct
 #: model:ir.model.fields,field_description:mrp_byproduct.field_mrp_subproduct__product_uom_id
 msgid "Unit of Measure"
-msgstr "Одиниця виміру"
+msgstr "Одиниця вимірювання"
 
 #. module: mrp_byproduct
 #: code:addons/mrp_byproduct/models/mrp_subproduct.py:31
diff --git a/addons/note/i18n/da.po b/addons/note/i18n/da.po
index 0619b0d4bcf..31a297a6078 100644
--- a/addons/note/i18n/da.po
+++ b/addons/note/i18n/da.po
@@ -9,9 +9,9 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -19,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2018-08-24 09:21+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr ""
 #: code:addons/note/static/src/xml/systray.xml:14
 #, python-format
 msgid "Add a note"
-msgstr ""
+msgstr "Tilføj en note"
 
 #. module: note
 #. openerp-web
@@ -100,7 +100,7 @@ msgstr "Ved gul seddel kategori"
 #. module: note
 #: model:ir.model.fields,help:note.field_mail_activity_type__category
 msgid "Categories may trigger specific behavior like opening calendar view"
-msgstr ""
+msgstr "Kategorier kan udløse specifikke opgaver som at åbne kalendervisning"
 
 #. module: note
 #: model:ir.model.fields,field_description:note.field_mail_activity_type__category
@@ -159,7 +159,7 @@ msgstr "Vis navn"
 #. module: note
 #: model_terms:ir.ui.view,arch_db:note.view_note_note_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: note
 #: model:ir.model.fields,field_description:note.field_note_stage__fold
@@ -297,7 +297,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: note
 #: model:ir.model.fields,field_description:note.field_note_note__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: note
 #: model:ir.model,name:note.model_note_note
@@ -410,7 +410,7 @@ msgstr ""
 #: selection:mail.activity.type,category:0
 #: model:mail.activity.type,name:note.mail_activity_data_reminder
 msgid "Reminder"
-msgstr ""
+msgstr "Påmindelse"
 
 #. module: note
 #: model:ir.model.fields,field_description:note.field_note_note__activity_user_id
@@ -440,7 +440,7 @@ msgstr ""
 #. module: note
 #: model_terms:ir.ui.view,arch_db:note.view_note_note_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: note
 #: model:ir.model.fields,field_description:note.field_note_note__stage_id
@@ -483,6 +483,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: note
 #: model:ir.model.fields,field_description:note.field_note_tag__name
diff --git a/addons/pad/i18n/da.po b/addons/pad/i18n/da.po
index f6ae146c793..16e2b7f9776 100644
--- a/addons/pad/i18n/da.po
+++ b/addons/pad/i18n/da.po
@@ -8,13 +8,15 @@
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +37,7 @@ msgstr "Virksomheder"
 #. module: pad
 #: model:ir.model,name:pad.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: pad
 #: model:ir.model.fields,field_description:pad.field_pad_common__display_name
diff --git a/addons/partner_autocomplete/i18n/da.po b/addons/partner_autocomplete/i18n/da.po
index 2ab2d3810d8..563a6f62f0f 100644
--- a/addons/partner_autocomplete/i18n/da.po
+++ b/addons/partner_autocomplete/i18n/da.po
@@ -6,13 +6,15 @@
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:06+0000\n"
-"PO-Revision-Date: 2018-10-02 10:06+0000\n"
-"Last-Translator: Jesper Carstensen <jc@danodoo.dk>, 2018\n"
+"PO-Revision-Date: 2018-09-21 14:23+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -138,7 +140,7 @@ msgstr ""
 #. module: partner_autocomplete
 #: model:ir.model,name:partner_autocomplete.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: partner_autocomplete
 #: model:ir.model,name:partner_autocomplete.model_res_partner
diff --git a/addons/payment/i18n/it.po b/addons/payment/i18n/it.po
index 8166389d9ad..b761232a74b 100644
--- a/addons/payment/i18n/it.po
+++ b/addons/payment/i18n/it.po
@@ -234,18 +234,20 @@ msgid ""
 "<span><i>Pending</i>... The order will be validated after the "
 "payment.</span>"
 msgstr ""
+"<span><i>In attesa</i>... L'ordine verrà confermato dopo il "
+"pagamento.</span>"
 
 #. module: payment
 #: code:addons/payment/models/account_invoice.py:72
 #, python-format
 msgid "A journal must be specified of the acquirer %s."
-msgstr ""
+msgstr "Deve essere specificato un registro per il servizio %s."
 
 #. module: payment
 #: code:addons/payment/models/account_invoice.py:65
 #, python-format
 msgid "A payment acquirer is required to create a transaction."
-msgstr ""
+msgstr "Per creare una transazione è necessario un servizio di pagamento."
 
 #. module: payment
 #: code:addons/payment/models/account_payment.py:55
@@ -297,13 +299,13 @@ msgstr "Modello piano dei conti"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__acc_number
 msgid "Account Number"
-msgstr "Numero del Conto"
+msgstr "Numero conto"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_id
 #: model_terms:ir.ui.view,arch_db:payment.acquirer_kanban
 msgid "Acquirer"
-msgstr "Acquirente"
+msgstr "Servizio"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token__acquirer_id
@@ -313,22 +315,22 @@ msgstr ""
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token__acquirer_ref
 msgid "Acquirer Ref."
-msgstr ""
+msgstr "Rif. servizio"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_reference
 msgid "Acquirer Reference"
-msgstr "Riferimento Acquirente"
+msgstr "Riferimento servizio"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_icon__acquirer_ids
 msgid "Acquirers"
-msgstr ""
+msgstr "Servizi"
 
 #. module: payment
 #: model_terms:ir.ui.view,arch_db:payment.payment_icon_form_view
 msgid "Acquirers list"
-msgstr ""
+msgstr "Elenco servizi"
 
 #. module: payment
 #: model_terms:ir.ui.view,arch_db:payment.acquirer_kanban
@@ -421,7 +423,7 @@ msgstr "Banca"
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Bank Account"
-msgstr "Conto Bancario"
+msgstr "Conto bancario"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__journal_name
@@ -541,7 +543,7 @@ msgstr "Chiudi"
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Communication"
-msgstr "Comunicazione"
+msgstr "Comunicazioni"
 
 #. module: payment
 #: model:ir.model,name:payment.model_res_company
@@ -566,7 +568,7 @@ msgstr "Configura"
 #. module: payment
 #: model_terms:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
 msgid "Configure your payment methods."
-msgstr ""
+msgstr "Configura i metodi di pagamento."
 
 #. module: payment
 #. openerp-web
@@ -605,7 +607,7 @@ msgstr "Nazione"
 #. module: payment
 #: model_terms:ir.actions.act_window,help:payment.action_payment_acquirer
 msgid "Create a new payment acquirer"
-msgstr ""
+msgstr "Crea un nuovo servizio di pagamento"
 
 #. module: payment
 #: model_terms:ir.actions.act_window,help:payment.action_payment_transaction
@@ -658,7 +660,7 @@ msgstr "Personalizzato"
 #. module: payment
 #: selection:payment.acquirer.onboarding.wizard,payment_method:0
 msgid "Custom payment instructions"
-msgstr "Istruzioni di pagamento"
+msgstr "Istruzioni di pagamento personalizzate"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_id
@@ -734,7 +736,7 @@ msgstr "Errore"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer__error_msg
 msgid "Error Message"
-msgstr "Messaggio di Errore"
+msgstr "Messaggio di errore"
 
 #. module: payment
 #. openerp-web
@@ -879,7 +881,7 @@ msgstr ""
 #: code:addons/payment/models/account_invoice.py:55
 #, python-format
 msgid "Invalid token found! Token acquirer %s != %s"
-msgstr ""
+msgstr "Rilevato token non valido. Token del servizio %s != %s"
 
 #. module: payment
 #: code:addons/payment/models/account_invoice.py:58
@@ -1014,7 +1016,8 @@ msgstr "Messaggio da mostrare una volta processato il pagamento."
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer__pre_msg
 msgid "Message displayed to explain and help the payment process."
-msgstr "Messaggio da mostrare per spiegare il processo di pagamento."
+msgstr ""
+"Messaggio da visualizzare per aiutare a chiarire il processo di pagamento."
 
 #. module: payment
 #: model:ir.model.fields,help:payment.field_payment_acquirer__error_msg
@@ -1025,7 +1028,7 @@ msgstr ""
 #: model:ir.model.fields,help:payment.field_payment_acquirer__cancel_msg
 msgid "Message displayed, if order is cancel during the payment process."
 msgstr ""
-"Messaggio mostrato se l'ordine viene annullato durante il processo di "
+"Messaggio visualizzato se l'ordine viene annullato durante il processo di "
 "pagamento."
 
 #. module: payment
@@ -1081,7 +1084,7 @@ msgstr "Mai"
 #. module: payment
 #: model_terms:ir.ui.view,arch_db:payment.pay
 msgid "No payment acquirer found."
-msgstr ""
+msgstr "Nessun servizio di pagamento trovato."
 
 #. module: payment
 #. openerp-web
@@ -1235,14 +1238,14 @@ msgstr "Pagamento"
 #: model:ir.model,name:payment.model_payment_acquirer
 #: model_terms:ir.ui.view,arch_db:payment.acquirer_form
 msgid "Payment Acquirer"
-msgstr "Acquirente di pagamento"
+msgstr "Servizio di pagamento"
 
 #. module: payment
 #: model:ir.actions.act_window,name:payment.action_payment_acquirer
 #: model:ir.ui.menu,name:payment.payment_acquirer_menu
 #: model_terms:ir.ui.view,arch_db:payment.acquirer_list
 msgid "Payment Acquirers"
-msgstr "Acquirenti di Pagamento"
+msgstr "Servizi di pagamento"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer__payment_flow
@@ -1269,7 +1272,7 @@ msgstr "Istruzioni di pagamento"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer__journal_id
 msgid "Payment Journal"
-msgstr "Sezionale Pagamento"
+msgstr "Registro di pagamento"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__payment_method
@@ -1429,13 +1432,13 @@ msgstr ""
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the following transfer details"
-msgstr "Usa le seguenti informazioni per il bonifico bancario. "
+msgstr "Usare le seguenti informazioni per il bonifico"
 
 #. module: payment
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_custom
 #: model_terms:payment.acquirer,post_msg:payment.payment_acquirer_transfer
 msgid "Please use the order name as communication reference."
-msgstr "Usa il nome dell'ordine come riferimento di comunicazione. "
+msgstr "Usare il nome dell'ordine come riferimento per le comunicazioni."
 
 #. module: payment
 #. openerp-web
@@ -1582,7 +1585,7 @@ msgstr ""
 #. module: payment
 #: model_terms:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step
 msgid "Set payments"
-msgstr "Salda i pagamenti"
+msgstr "Imposta pagamenti"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_token__short_name
@@ -1658,7 +1661,7 @@ msgstr "Test"
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer__post_msg
 msgid "Thanks Message"
-msgstr "Messaggio di Ringraziamento"
+msgstr "Messaggio di ringraziamento"
 
 #. module: payment
 #: code:addons/payment/models/payment_acquirer.py:871
@@ -1914,7 +1917,7 @@ msgstr ""
 #: model:payment.acquirer,name:payment.payment_acquirer_transfer
 #: selection:payment.acquirer,provider:0
 msgid "Wire Transfer"
-msgstr "Bonifico Bancario"
+msgstr "Bonifico bancario"
 
 #. module: payment
 #. openerp-web
diff --git a/addons/payment/i18n/uk.po b/addons/payment/i18n/uk.po
index 195b200f322..cb4de6e0c58 100644
--- a/addons/payment/i18n/uk.po
+++ b/addons/payment/i18n/uk.po
@@ -1135,7 +1135,7 @@ msgstr ""
 #. module: payment
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment
 #. openerp-web
@@ -1653,7 +1653,7 @@ msgstr "Статус"
 #: selection:payment.acquirer,provider:0
 #: selection:res.company,payment_onboarding_payment_method:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__stripe_publishable_key
diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index 77a14264dca..8ccb48ec0de 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -4,6 +4,7 @@ odoo.define('payment.payment_form', function (require) {
     var ajax = require('web.ajax');
     var config = require('web.config');
     var core = require('web.core');
+    var dom = require('web.dom');
     var Dialog = require("web.Dialog");
     var Widget = require("web.Widget");
     var rpc = require("web.rpc");
@@ -23,6 +24,11 @@ odoo.define('payment.payment_form', function (require) {
             this._super.apply(this, arguments);
             this.options = _.extend(options || {}, {
             });
+
+            // TODO simplify this using the 'async' keyword in the events
+            // property definition as soon as this widget is converted in
+            // frontend widget.
+            this.payEvent = dom.makeButtonHandler(this.payEvent);
         },
 
         start: function () {
@@ -95,7 +101,7 @@ odoo.define('payment.payment_form', function (require) {
                     }
 
                     // do the call to the route stored in the 'data_set' input of the acquirer form, the data must be called 'create-route'
-                    ajax.jsonRpc(ds.dataset.createRoute, 'call', form_data).then(function (data) {
+                    return ajax.jsonRpc(ds.dataset.createRoute, 'call', form_data).then(function (data) {
                         // if the server has returned true
                         if (data.result) {
                             // and it need a 3DS authentication
@@ -106,7 +112,7 @@ odoo.define('payment.payment_form', function (require) {
                             else {
                                 checked_radio.value = data.id; // set the radio value to the new card id
                                 form.submit();
-                                return;
+                                return $.Deferred();
                             }
                         }
                         // if the server has returned false, we display an error
@@ -125,7 +131,7 @@ odoo.define('payment.payment_form', function (require) {
                         $(button).attr('disabled', false);
                         $(button).children('.fa').addClass('fa-plus-circle')
                         $(button).find('span.o_loader').remove();
-                    }).fail(function (data, event) {
+                    }).fail(function (error, event) {
                         // if the rpc fails, pretty obvious
                         $(button).attr('disabled', false);
                         $(button).children('.fa').addClass('fa-plus-circle')
@@ -134,7 +140,7 @@ odoo.define('payment.payment_form', function (require) {
                         self.displayError(
                             _t('Server Error'),
                             _t("We are not able to add your payment method at the moment.") +
-                               message.data.message
+                               error.data.message
                         );
                     });
                 }
@@ -146,7 +152,7 @@ odoo.define('payment.payment_form', function (require) {
                         // if the user wants to save his credit card info
                         var form_save_token = acquirer_form.find('input[name="o_payment_form_save_token"]').prop('checked');
                         // then we call the route to prepare the transaction
-                        ajax.jsonRpc($tx_url[0].value, 'call', {
+                        return ajax.jsonRpc($tx_url[0].value, 'call', {
                             'acquirer_id': parseInt(acquirer_id),
                             'save_token': form_save_token,
                             'access_token': self.options.accessToken,
@@ -168,6 +174,7 @@ odoo.define('payment.payment_form', function (require) {
                                 $(newForm).find('input[data-remove-me]').remove(); // remove all the input that should be removed
                                 if(action_url) {
                                     newForm.submit(); // and finally submit the form
+                                    return $.Deferred();
                                 }
                             }
                             else {
@@ -176,11 +183,11 @@ odoo.define('payment.payment_form', function (require) {
                                     _t("We are not able to redirect you to the payment form.")
                                 );
                             }
-                        }).fail(function (data, event) {
+                        }).fail(function (error, event) {
                             self.displayError(
                                 _t('Server Error'),
                                 _t("We are not able to redirect you to the payment form. ") +
-                                   message.data.message
+                                   error.data.message
                             );
                         });
                     }
@@ -194,6 +201,7 @@ odoo.define('payment.payment_form', function (require) {
                 }
                 else {  // if the user is using an old payment then we just submit the form
                     form.submit();
+                    return $.Deferred();
                 }
             }
             else {
@@ -292,7 +300,7 @@ odoo.define('payment.payment_form', function (require) {
                     $(button).attr('disabled', false);
                     $(button).children('.fa').addClass('fa-plus-circle')
                     $(button).find('span.o_loader').remove();
-                }).fail(function (data, event) {
+                }).fail(function (error, event) {
                     // if the rpc fails, pretty obvious
                     $(button).attr('disabled', false);
                     $(button).children('.fa').addClass('fa-plus-circle')
@@ -301,7 +309,7 @@ odoo.define('payment.payment_form', function (require) {
                     self.displayError(
                         _t('Server error'),
                         _t("We are not able to add your payment method at the moment.</p>") +
-                           data.data.message
+                           error.data.message
                     );
                 });
             }
diff --git a/addons/payment_adyen/i18n/uk.po b/addons/payment_adyen/i18n/uk.po
index 93b1f56632f..166d27d009e 100644
--- a/addons/payment_adyen/i18n/uk.po
+++ b/addons/payment_adyen/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -91,7 +93,7 @@ msgstr "Комерційний обліковий запис"
 #. module: payment_adyen
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_adyen
 #: selection:payment.acquirer,provider:0
@@ -136,7 +138,7 @@ msgstr "Ключ Skin HMAC"
 #. module: payment_adyen
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_adyen
 #: selection:payment.acquirer,provider:0
diff --git a/addons/payment_adyen/static/description/icon.png b/addons/payment_adyen/static/description/icon.png
index bfb5111fff8..40cbb9e27b5 100644
--- a/addons/payment_adyen/static/description/icon.png
+++ b/addons/payment_adyen/static/description/icon.png
diff --git a/addons/payment_adyen/static/description/icon.svg b/addons/payment_adyen/static/description/icon.svg
new file mode 100644
index 00000000000..79ba689e91a
--- /dev/null
+++ b/addons/payment_adyen/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M19.25 45h2.714v2.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H38.5V31h10.536v-3.212a.342.342 0 0 0-.339-.343H38.5v-2.742h10.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V45zm-3.79 10.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm13.58-34.853a4.263 4.263 0 0 1 4.281 4.28v17.004H18.281A4.263 4.263 0 0 1 14 37.151v-4.757a4.263 4.263 0 0 1 4.28-4.28h4.638v6.777c0 .595.476 1.19 1.19 1.19h2.377v-9.394c0-.595-.475-1.19-1.189-1.19h-10.94v-5.35h16.648z"/><path id="e" d="M19.25 43h2.714v2.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H38.5V29h10.536v-3.212a.342.342 0 0 0-.339-.343H38.5v-2.742h10.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V43zm-3.79 10.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm13.58-34.853a4.263 4.263 0 0 1 4.281 4.28v17.004H18.281A4.263 4.263 0 0 1 14 35.151v-4.757a4.263 4.263 0 0 1 4.28-4.28h4.638v6.777c0 .595.476 1.19 1.19 1.19h2.377v-9.394c0-.595-.475-1.19-1.189-1.19h-10.94v-5.35h16.648z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L14.423 18.5 35 25.5l3.5-2.797L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_authorize/i18n/uk.po b/addons/payment_authorize/i18n/uk.po
index a0f4c978895..9afc9940ec8 100644
--- a/addons/payment_authorize/i18n/uk.po
+++ b/addons/payment_authorize/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:21+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +53,7 @@ msgid ""
 "fingerprint (%s)"
 msgstr ""
 "Авторизація: отримані дані з відсутнім посиланням (%s) або trans_id (%s) або"
-" відбитків пальців (%s)"
+" відбитки пальців (%s)"
 
 #. module: payment_authorize
 #: selection:payment.acquirer,provider:0
@@ -81,7 +83,7 @@ msgstr "Закінчується (мм/рр)"
 #. module: payment_authorize
 #: model_terms:ir.ui.view,arch_db:payment_authorize.acquirer_form_authorize
 msgid "How to get paid with Authorize.Net"
-msgstr "Як отримати плату за допомогою Authorize.Net"
+msgstr "Як отримати оплату за допомогою Authorize.Net"
 
 #. module: payment_authorize
 #: code:addons/payment_authorize/controllers/main.py:64
@@ -99,6 +101,8 @@ msgid ""
 "Invalid token found: the Authorize profile is missing.Please make sure the "
 "token has a valid acquirer reference."
 msgstr ""
+"Знайдений неприйнятний токен: відсутній профіль авторизації. Будь ласка, "
+"переконайтеся, що токен має дійсний довідковий номер покупця."
 
 #. module: payment_authorize
 #: selection:payment.acquirer,provider:0
@@ -108,7 +112,7 @@ msgstr "Ручне налаштування"
 #. module: payment_authorize
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_authorize
 #: selection:payment.acquirer,provider:0
@@ -166,7 +170,7 @@ msgstr "Набирає"
 #. module: payment_authorize
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_authorize
 #: code:addons/payment_authorize/models/payment.py:365
@@ -190,7 +194,7 @@ msgid ""
 "This contains the unique reference for this partner/payment token "
 "combination in the Authorize.net backend"
 msgstr ""
-"Вона містить унікальну посилання для цієї комбінації токенів "
+"Вона містить унікальне посилання для цієї комбінації токенів "
 "партнерів/платіжних засобів в автозапуску Authorize.net"
 
 #. module: payment_authorize
diff --git a/addons/payment_authorize/static/description/icon.png b/addons/payment_authorize/static/description/icon.png
index a4d905166aa..235f1adbd41 100644
--- a/addons/payment_authorize/static/description/icon.png
+++ b/addons/payment_authorize/static/description/icon.png
diff --git a/addons/payment_authorize/static/description/icon.svg b/addons/payment_authorize/static/description/icon.svg
new file mode 100644
index 00000000000..c2755ee6bc7
--- /dev/null
+++ b/addons/payment_authorize/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H33.625l-2.62-6.5h18.031v-3.212a.342.342 0 0 0-.339-.343H29.765l-1.018-2.742h20.289c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm17.163-12.266c0 .228-.19.342-.57.342-.253 0-.481-.013-.684-.038l-4.826-.076-4.826.076a4.036 4.036 0 0 1-.57.038c-.507 0-.76-.127-.76-.38 0-.279.342-.418 1.026-.418 2.23-.025 3.344-.253 3.344-.684 0-.025-.025-.127-.076-.304l-.304-1.026-.19-.532c-.228-.785-.785-2.52-1.672-5.206h-8.132c-1.52 4.053-2.28 6.384-2.28 6.992 0 .355.152.57.456.646.076.025.71.076 1.9.152.735.025 1.102.152 1.102.38 0 .253-.33.38-.988.38-1.165 0-2.52-.05-4.066-.152-.38-.025-.773-.038-1.178-.038-.405 0-.798.025-1.178.076A4.157 4.157 0 0 1 9.62 43c-.355 0-.532-.114-.532-.342 0-.228.399-.355 1.197-.38.798-.025 1.374-.146 1.729-.361s.633-.627.836-1.235c3.268-9.323 5.928-16.809 7.98-22.458a5.04 5.04 0 0 1 .304-1.026l.19-.684c.076-.279.177-.418.304-.418.076 0 .14.076.19.228.33.988 1.077 3.053 2.242 6.194.912 2.457 3.18 8.626 6.802 18.506.203.557.462.912.779 1.064.317.152.969.24 1.957.266.659.025.988.152.988.38zM24.25 33.652l-2.014-5.662-1.824-5.206c-1.064 2.787-2.343 6.41-3.838 10.868h7.676z"/><path id="e" d="M19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H33.625l-2.62-6.5h18.031v-3.212a.342.342 0 0 0-.339-.343H29.765l-1.018-2.742h20.289c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm17.163-12.266c0 .228-.19.342-.57.342-.253 0-.481-.013-.684-.038l-4.826-.076-4.826.076a4.036 4.036 0 0 1-.57.038c-.507 0-.76-.127-.76-.38 0-.279.342-.418 1.026-.418 2.23-.025 3.344-.253 3.344-.684 0-.025-.025-.127-.076-.304l-.304-1.026-.19-.532c-.228-.785-.785-2.52-1.672-5.206h-8.132c-1.52 4.053-2.28 6.384-2.28 6.992 0 .355.152.57.456.646.076.025.71.076 1.9.152.735.025 1.102.152 1.102.38 0 .253-.33.38-.988.38-1.165 0-2.52-.05-4.066-.152-.38-.025-.773-.038-1.178-.038-.405 0-.798.025-1.178.076A4.157 4.157 0 0 1 9.62 41c-.355 0-.532-.114-.532-.342 0-.228.399-.355 1.197-.38.798-.025 1.374-.146 1.729-.361s.633-.627.836-1.235c3.268-9.323 5.928-16.809 7.98-22.458a5.04 5.04 0 0 1 .304-1.026l.19-.684c.076-.279.177-.418.304-.418.076 0 .14.076.19.228.33.988 1.077 3.053 2.242 6.194.912 2.457 3.18 8.626 6.802 18.506.203.557.462.912.779 1.064.317.152.969.24 1.957.266.659.025.988.152.988.38zM24.25 31.652l-2.014-5.662-1.824-5.206c-1.064 2.787-2.343 6.41-3.838 10.868h7.676z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916l21.6-19.82 3.4 8.607h12.25L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_buckaroo/i18n/uk.po b/addons/payment_buckaroo/i18n/uk.po
index 5836c98418b..3d5d1535aca 100644
--- a/addons/payment_buckaroo/i18n/uk.po
+++ b/addons/payment_buckaroo/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +78,7 @@ msgstr "Ручне налаштування"
 #. module: payment_buckaroo
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_buckaroo
 #: selection:payment.acquirer,provider:0
@@ -116,7 +118,7 @@ msgstr "Набирає"
 #. module: payment_buckaroo
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_buckaroo
 #: model:ir.model.fields,field_description:payment_buckaroo.field_payment_acquirer__brq_websitekey
diff --git a/addons/payment_buckaroo/i18n/zh_CN.po b/addons/payment_buckaroo/i18n/zh_CN.po
index 4a79f101287..329354bcc20 100644
--- a/addons/payment_buckaroo/i18n/zh_CN.po
+++ b/addons/payment_buckaroo/i18n/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
 # inspur qiuguodong <qiuguodong@inspur.com>, 2018
 # 
 msgid ""
@@ -80,7 +81,7 @@ msgstr "Ogone"
 #. module: payment_buckaroo
 #: selection:payment.acquirer,provider:0
 msgid "PayUmoney"
-msgstr "付给你钱"
+msgstr "PayUmoney"
 
 #. module: payment_buckaroo
 #: model:ir.model,name:payment_buckaroo.model_payment_acquirer
diff --git a/addons/payment_buckaroo/static/description/icon.png b/addons/payment_buckaroo/static/description/icon.png
index 16d9fffd10d..b7ad04c3cfd 100644
--- a/addons/payment_buckaroo/static/description/icon.png
+++ b/addons/payment_buckaroo/static/description/icon.png
diff --git a/addons/payment_buckaroo/static/description/icon.svg b/addons/payment_buckaroo/static/description/icon.svg
new file mode 100644
index 00000000000..1f21334c31c
--- /dev/null
+++ b/addons/payment_buckaroo/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#CDC484"/><stop offset="100%" stop-color="#B5AA59"/></linearGradient><path id="d" d="M31.757 37.5L34 31h15.036v-3.212a.342.342 0 0 0-.339-.343H35l.92-2.742h13.116c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V37.5H31.757zM15.46 55.642h-1.036V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zM13 19h3.688l2.517 7.42h8.184L29.994 19H33l-8.76 26h-1.97L13 19zm7 11l2.964 9L26 30h-6z"/><path id="e" d="M31.757 35.5L34 29h15.036v-3.212a.342.342 0 0 0-.339-.343H35l.92-2.742h13.116c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V35.5H31.757zM15.46 53.642h-1.036V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zM13 17h3.688l2.517 7.42h8.184L29.994 17H33l-8.76 26h-1.97L13 17zm7 11l2.964 9L26 28h-6z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916l13.5-16.675L18.889 24l11.172-7 .967 5.703 4.533.036L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_ogone/i18n/uk.po b/addons/payment_ogone/i18n/uk.po
index 0dc66c1eb39..4635c4f2efb 100644
--- a/addons/payment_ogone/i18n/uk.po
+++ b/addons/payment_ogone/i18n/uk.po
@@ -3,13 +3,15 @@
 # * payment_ogone
 # 
 # Translators:
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
 # Martin Trigaux, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
 "Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +40,7 @@ msgstr "ID користувача API "
 #. module: payment_ogone
 #: model:ir.model.fields,field_description:payment_ogone.field_payment_acquirer__ogone_password
 msgid "API User Password"
-msgstr "Обліковий запис на пароль API"
+msgstr "Пароль користувача API"
 
 #. module: payment_ogone
 #: selection:payment.acquirer,provider:0
@@ -103,7 +105,7 @@ msgstr "Ручне налаштування"
 #. module: payment_ogone
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_ogone
 #: code:addons/payment_ogone/models/payment.py:249
@@ -175,12 +177,12 @@ msgstr "SHA Key OUT"
 #. module: payment_ogone
 #: selection:payment.acquirer,provider:0
 msgid "Sips"
-msgstr "Набирає"
+msgstr "Sips"
 
 #. module: payment_ogone
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_ogone
 #: selection:payment.acquirer,provider:0
diff --git a/addons/payment_ogone/static/description/icon.png b/addons/payment_ogone/static/description/icon.png
index f8274724529..1d0d993cba4 100644
--- a/addons/payment_ogone/static/description/icon.png
+++ b/addons/payment_ogone/static/description/icon.png
diff --git a/addons/payment_ogone/static/description/icon.svg b/addons/payment_ogone/static/description/icon.svg
new file mode 100644
index 00000000000..46e660daab6
--- /dev/null
+++ b/addons/payment_ogone/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 42h2.714v5.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H30.732c.389-3.667-.582-5.833-2.914-6.5h21.218v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V42zm-3.79 13.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm17.403-34.99c.985.007-2.543 2.376-2.271 2.073h-5.692c.113.126.201.23.298.334 1.214 1.315 1.076 3.081.239 4.432-.597.965-1.488 1.586-2.49 2.049-1.103.518-2.277.747-3.475.909a85.771 85.771 0 0 0-3.555.56c-.274.046-.546.186-.782.34-.383.25-.375.645.047.811.595.23 1.216.411 1.843.532 1.768.343 3.567.532 5.295 1.073.842.265 1.651.598 2.341 1.182 1.138.972 1.222 2.65.013 3.726-.948.85-2.094 1.272-3.295 1.557-1.024.243-2.063.36-3.117.396-2.206.076-4.376-.11-6.481-.823-.77-.265-1.497-.614-2.09-1.2-.333-.322-.582-.69-.64-1.174-.08-.656.198-1.127.696-1.496.701-.517 1.51-.775 2.335-.97.797-.192 1.606-.33 2.345-.482-.471-.161-1.025-.314-1.546-.545-.407-.185-.812-.406-1.146-.7-.655-.571-.655-1.42-.049-2.06.442-.468.997-.76 1.586-.974.513-.192 1.041-.34 1.567-.51-.328-.148-.676-.29-1.004-.459-.748-.39-1.42-.886-1.821-1.658-.777-1.496-.475-2.903.467-4.197.908-1.243 2.204-1.916 3.634-2.345a9.62 9.62 0 0 1 2.742-.387c4.671 0 9.339-.013 14.006.007zM18.778 34.016c-1.03.185-2.057.453-3.064.787-.495.16-.972.475-1.405.82-.421.333-.405.865.006 1.224.269.235.58.424.893.553 1.223.505 2.505.489 4.007.601.526-.08 1.283-.165 2.03-.322.546-.114 1.073-.34 1.483-.845.381-.462.363-.962-.063-1.357a2.674 2.674 0 0 0-.689-.487 25.158 25.158 0 0 0-1.952-.725c-.408-.133-.846-.318-1.246-.249zm4.666-7.55c.368-.527.59-1.137.552-1.813-.061-1.064-.609-1.772-1.446-2.208a3.71 3.71 0 0 0-2.357-.396c-1.155.18-2.127.73-2.802 1.824-.64 1.036-.479 2.313.366 3.145.737.729 1.629.933 2.647.983.182-.02.438-.041.69-.08.94-.162 1.748-.606 2.35-1.455z"/><path id="e" d="M19.25 40h2.714v5.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H30.732c.389-3.667-.582-5.833-2.914-6.5h21.218v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V40zm-3.79 13.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm17.403-34.99c.985.007-2.543 2.376-2.271 2.073h-5.692c.113.126.201.23.298.334 1.214 1.315 1.076 3.081.239 4.432-.597.965-1.488 1.586-2.49 2.049-1.103.518-2.277.747-3.475.909a85.771 85.771 0 0 0-3.555.56c-.274.046-.546.186-.782.34-.383.25-.375.645.047.811.595.23 1.216.411 1.843.532 1.768.343 3.567.532 5.295 1.073.842.265 1.651.598 2.341 1.182 1.138.972 1.222 2.65.013 3.726-.948.85-2.094 1.272-3.295 1.557-1.024.243-2.063.36-3.117.396-2.206.076-4.376-.11-6.481-.823-.77-.265-1.497-.614-2.09-1.2-.333-.322-.582-.69-.64-1.174-.08-.656.198-1.127.696-1.496.701-.517 1.51-.775 2.335-.97.797-.192 1.606-.33 2.345-.482-.471-.161-1.025-.314-1.546-.545-.407-.185-.812-.406-1.146-.7-.655-.571-.655-1.42-.049-2.06.442-.468.997-.76 1.586-.974.513-.192 1.041-.34 1.567-.51-.328-.148-.676-.29-1.004-.459-.748-.39-1.42-.886-1.821-1.658-.777-1.496-.475-2.903.467-4.197.908-1.243 2.204-1.916 3.634-2.345a9.62 9.62 0 0 1 2.742-.387c4.671 0 9.339-.013 14.006.007zM18.778 32.016c-1.03.185-2.057.453-3.064.787-.495.16-.972.475-1.405.82-.421.333-.405.865.006 1.224.269.235.58.424.893.553 1.223.505 2.505.489 4.007.601.526-.08 1.283-.165 2.03-.322.546-.114 1.073-.34 1.483-.845.381-.462.363-.962-.063-1.357a2.674 2.674 0 0 0-.689-.487 25.158 25.158 0 0 0-1.952-.725c-.408-.133-.846-.318-1.246-.249zm4.666-7.55c.368-.527.59-1.137.552-1.813-.061-1.064-.609-1.772-1.446-2.208a3.71 3.71 0 0 0-2.357-.396c-1.155.18-2.127.73-2.802 1.824-.64 1.036-.479 2.313.366 3.145.737.729 1.629.933 2.647.983.182-.02.438-.041.69-.08.94-.162 1.748-.606 2.35-1.455z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L15.591 19.5 34.912 18l-3.89 4.703h6.228L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_paypal/i18n/uk.po b/addons/payment_paypal/i18n/uk.po
index cc1392b16cf..b771019f2ed 100644
--- a/addons/payment_paypal/i18n/uk.po
+++ b/addons/payment_paypal/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +23,12 @@ msgstr ""
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__paypal_api_access_token
 msgid "Access Token"
-msgstr "Доступ Токена"
+msgstr "Токен доступу"
 
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__paypal_api_access_token_validity
 msgid "Access Token Validity"
-msgstr "Символічні доступ до дії"
+msgstr "Термін дії токена доступу"
 
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
@@ -46,7 +48,7 @@ msgstr "Buckaroo"
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_dom_fixed
 msgid "Fixed domestic fees"
-msgstr "Фіксована домашня комісія"
+msgstr "Фіксована внутрішня комісія"
 
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__fees_int_fixed
@@ -56,7 +58,7 @@ msgstr "Фіксована міжнародна комісія"
 #. module: payment_paypal
 #: model_terms:ir.ui.view,arch_db:payment_paypal.acquirer_form_paypal
 msgid "How to configure your paypal account?"
-msgstr "Як налаштувати ваш обліковий запис в Paypal?"
+msgstr "Як налаштувати ваш обліковий запис у Paypal?"
 
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
@@ -66,7 +68,7 @@ msgstr "Ручне налаштування"
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
@@ -85,7 +87,7 @@ msgid ""
 "payments as they are made."
 msgstr ""
 "Передача платіжних даних дозволяє отримувати сповіщення про успішні платежі,"
-" як це робиться."
+" після того, як вони будуть виконані."
 
 #. module: payment_paypal
 #: model:ir.model,name:payment_paypal.model_payment_transaction
@@ -100,7 +102,7 @@ msgstr "Paypal"
 #. module: payment_paypal
 #: model:ir.model.fields,field_description:payment_paypal.field_payment_acquirer__paypal_email_account
 msgid "Paypal Email ID"
-msgstr "ідентифікатор повідомлення електронної пошти"
+msgstr "ID електронної пошти Paypal"
 
 #. module: payment_paypal
 #: model:ir.model.fields,help:payment_paypal.field_payment_acquirer__paypal_use_ipn
@@ -146,7 +148,7 @@ msgstr "Набирає"
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_paypal
 #: model:ir.model.fields,help:payment_paypal.field_payment_acquirer__paypal_seller_account
@@ -154,7 +156,7 @@ msgid ""
 "The Merchant ID is used to ensure communications coming from Paypal are "
 "valid and secured."
 msgstr ""
-"Merchant ID використовується для забезпечення того, щоб повідомлення, що "
+"Merchant ID використовується для забезпечення того, щоби повідомлення, що "
 "надходять від Paypal, були дійсними та захищеними."
 
 #. module: payment_paypal
diff --git a/addons/payment_paypal/i18n/zh_CN.po b/addons/payment_paypal/i18n/zh_CN.po
index e77ed9e0a45..a5a4300523b 100644
--- a/addons/payment_paypal/i18n/zh_CN.po
+++ b/addons/payment_paypal/i18n/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
 # inspur qiuguodong <qiuguodong@inspur.com>, 2018
 # 
 msgid ""
@@ -73,7 +74,7 @@ msgstr "Ogone"
 #. module: payment_paypal
 #: selection:payment.acquirer,provider:0
 msgid "PayUmoney"
-msgstr "付给你钱"
+msgstr "PayUmoney"
 
 #. module: payment_paypal
 #: model:ir.model,name:payment_paypal.model_payment_acquirer
diff --git a/addons/payment_paypal/static/description/icon.png b/addons/payment_paypal/static/description/icon.png
index 26b697a5c36..443af9d40c7 100644
--- a/addons/payment_paypal/static/description/icon.png
+++ b/addons/payment_paypal/static/description/icon.png
diff --git a/addons/payment_paypal/static/description/icon.svg b/addons/payment_paypal/static/description/icon.svg
new file mode 100644
index 00000000000..020f3296ce7
--- /dev/null
+++ b/addons/payment_paypal/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M35.363 37.5c1.129-2.152 1.841-4.318 2.137-6.5h11.536v-3.212a.342.342 0 0 0-.339-.343H37.5c-.109-.965-.34-1.879-.697-2.742h12.233c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V37.5H35.363zM15.46 55.642h-1.036V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm4.765-36h4.547c2.803 0 6.062 2.167 5.09 6.933-.858 4.21-4.06 6.686-7.892 6.686h-2.496c-.549 0-.913.478-.999 1.047L19.334 41h-4.326c-.548 0-1.085-.479-.999-1.048l2.997-19.904c.086-.57.45-1.048 1-1.048h4.182zm11.656 10.987c-.76 3.915-3.604 6.218-7.006 6.218l-.81-.003-.488.003c-.488.003-.727.442-.803.97l-.053.363-.774 5.388c-.081.56-.416 1.036-.92 1.072L19.896 44c-.487 0-.963-.445-.887-.974l.015-.103h1.985l1.043-7.26.029.004.176-1.36h1.589c4.727 0 8.518-3.272 9.606-8.307.512 1.003.717 2.325.393 3.987z"/><path id="e" d="M35.363 35.5c1.129-2.152 1.841-4.318 2.137-6.5h11.536v-3.212a.342.342 0 0 0-.339-.343H37.5c-.109-.965-.34-1.879-.697-2.742h12.233c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742 2.258.007 3.907.022 5.137 0h24.31a.342.342 0 0 0 .339-.343V35.5H35.363zM15.46 53.642h-1.036V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.423 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm4.765-36h4.547c2.803 0 6.062 2.167 5.09 6.933-.858 4.21-4.06 6.686-7.892 6.686h-2.496c-.549 0-.913.478-.999 1.047L19.334 39h-4.326c-.548 0-1.085-.479-.999-1.048l2.997-19.904c.086-.57.45-1.048 1-1.048h4.182zm11.656 10.987c-.76 3.915-3.604 6.218-7.006 6.218l-.81-.003-.488.003c-.488.003-.727.442-.803.97l-.053.363-.774 5.388c-.081.56-.416 1.036-.92 1.072L19.896 42c-.487 0-.963-.445-.887-.974l.015-.103h1.985l1.043-7.26.029.004.176-1.36h1.589c4.727 0 8.518-3.272 9.606-8.307.512 1.003.717 2.325.393 3.987z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L17.423 17.25H28l3.391 5.453h5.859L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_payumoney/i18n/uk.po b/addons/payment_payumoney/i18n/uk.po
index 1f78967e960..42c1515480b 100644
--- a/addons/payment_payumoney/i18n/uk.po
+++ b/addons/payment_payumoney/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +53,7 @@ msgstr "Секретний ключ Merchant"
 #. module: payment_payumoney
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_payumoney
 #: selection:payment.acquirer,provider:0
@@ -69,7 +71,7 @@ msgstr ""
 #: code:addons/payment_payumoney/models/payment.py:102
 #, python-format
 msgid "PayUmoney: received data for reference %s; multiple orders found"
-msgstr "PayUmoney: отримані дані для довідки%s; знайдено декілька замовлень"
+msgstr "PayUmoney: отримані дані для довідки%s; знайдено кілька замовлень"
 
 #. module: payment_payumoney
 #: code:addons/payment_payumoney/models/payment.py:99
@@ -115,7 +117,7 @@ msgstr "Набирає"
 #. module: payment_payumoney
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_payumoney
 #: selection:payment.acquirer,provider:0
diff --git a/addons/payment_payumoney/i18n/zh_CN.po b/addons/payment_payumoney/i18n/zh_CN.po
index 1bafe50833e..50a102a9e8f 100644
--- a/addons/payment_payumoney/i18n/zh_CN.po
+++ b/addons/payment_payumoney/i18n/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2018
 # inspur qiuguodong <qiuguodong@inspur.com>, 2018
 # 
 msgid ""
@@ -48,7 +49,7 @@ msgstr "商家密钥"
 #. module: payment_payumoney
 #: model:ir.model.fields,field_description:payment_payumoney.field_payment_acquirer__payumoney_merchant_salt
 msgid "Merchant Salt"
-msgstr "商家ID"
+msgstr "商家盐"
 
 #. module: payment_payumoney
 #: selection:payment.acquirer,provider:0
diff --git a/addons/payment_payumoney/static/description/icon.png b/addons/payment_payumoney/static/description/icon.png
index 499b2ab2698..d67b26803d0 100644
--- a/addons/payment_payumoney/static/description/icon.png
+++ b/addons/payment_payumoney/static/description/icon.png
diff --git a/addons/payment_payumoney/static/description/icon.svg b/addons/payment_payumoney/static/description/icon.svg
new file mode 100644
index 00000000000..dce75643382
--- /dev/null
+++ b/addons/payment_payumoney/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M32.423 21.58v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H34.25V34.9c0 2.9-.81 5.055-2.43 6.465-1.62 1.41-3.86 2.115-6.72 2.115-2.9 0-5.145-.7-6.735-2.1-1.59-1.4-2.385-3.56-2.385-6.48V21.58h4.71V34.9c0 .58.05 1.15.15 1.71.1.56.31 1.055.63 1.485.32.43.765.78 1.335 1.05s1.335.405 2.295.405c1.68 0 2.84-.375 3.48-1.125.64-.75.96-1.925.96-3.525V21.58h2.883zM19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H38.5V31h10.536v-3.212a.342.342 0 0 0-.339-.343H39.5v-2.742h9.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm23-41.42h3a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-3a1 1 0 0 1-1-1v-3a1 1 0 0 1 1-1zm-5-3h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2a1 1 0 0 1 1-1z"/><path id="e" d="M32.423 19.58v-3a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v4a1 1 0 0 1-1 1H34.25V32.9c0 2.9-.81 5.055-2.43 6.465-1.62 1.41-3.86 2.115-6.72 2.115-2.9 0-5.145-.7-6.735-2.1-1.59-1.4-2.385-3.56-2.385-6.48V19.58h4.71V32.9c0 .58.05 1.15.15 1.71.1.56.31 1.055.63 1.485.32.43.765.78 1.335 1.05s1.335.405 2.295.405c1.68 0 2.84-.375 3.48-1.125.64-.75.96-1.925.96-3.525V19.58h2.883zM19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H38.5V29h10.536v-3.212a.342.342 0 0 0-.339-.343H39.5v-2.742h9.536c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm23-41.42h3a1 1 0 0 1 1 1v3a1 1 0 0 1-1 1h-3a1 1 0 0 1-1-1v-3a1 1 0 0 1 1-1zm-5-3h2a1 1 0 0 1 1 1v2a1 1 0 0 1-1 1h-2a1 1 0 0 1-1-1v-2a1 1 0 0 1 1-1z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16 19.58l3.25.42L35 8.58 38 12l-.89 2 2.584-2 4.729 4-5.923 6.703L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_sips/i18n/uk.po b/addons/payment_sips/i18n/uk.po
index f2ea96bf63f..8668ce97b12 100644
--- a/addons/payment_sips/i18n/uk.po
+++ b/addons/payment_sips/i18n/uk.po
@@ -5,12 +5,13 @@
 # Translators:
 # Martin Trigaux, 2018
 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -116,7 +117,7 @@ msgstr "Секретний ключ"
 #. module: payment_sips
 #: selection:payment.acquirer,provider:0
 msgid "Sips"
-msgstr "Набирає"
+msgstr "Sips"
 
 #. module: payment_sips
 #: code:addons/payment_sips/models/payment.py:160
@@ -127,7 +128,7 @@ msgstr "Sips: отримані дані для довідки %s"
 #. module: payment_sips
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Стрічка"
+msgstr "Stripe"
 
 #. module: payment_sips
 #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_test_url
diff --git a/addons/payment_sips/static/description/icon.png b/addons/payment_sips/static/description/icon.png
index 15a08118ee1..4c03f77626d 100644
--- a/addons/payment_sips/static/description/icon.png
+++ b/addons/payment_sips/static/description/icon.png
diff --git a/addons/payment_sips/static/description/icon.svg b/addons/payment_sips/static/description/icon.svg
new file mode 100644
index 00000000000..d8abf50becd
--- /dev/null
+++ b/addons/payment_sips/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 43h2.714v4.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H32.732c1.623-2.333 2.212-4.5 1.768-6.5h14.536v-3.212a.342.342 0 0 0-.339-.343h-14.79a15.663 15.663 0 0 0-1.215-2.742h16.344c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V43zm-3.79 12.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm-1.394-16.606C15 37.5 14.5 37.025 13.733 35.448c-.556-1.144-.908-2.315-1.026-3.6-.035-.377-.04-1.232-.01-1.572.127-1.427.479-2.634 1.124-3.861a9.868 9.868 0 0 1 4.994-4.507c.24-.096.63-.236.637-.229a.859.859 0 0 1-.071.132c-.633 1.046-1.176 3.203-1.275 5.059l-.018.353-.115.162a6.324 6.324 0 0 0-1.094 2.865 9.018 9.018 0 0 0 0 1.521 6.257 6.257 0 0 0 1.208 3.02c.836 1.112 2.034 1.88 3.332 2.14.426.086.53.095 1.082.094.445 0 .547-.005.751-.038a5.349 5.349 0 0 0 2.003-.723c.116-.07.23-.14.252-.158l.041-.031-.092-.039a15.055 15.055 0 0 1-1.08-.556 9.864 9.864 0 0 1-3.215-3.084 9.796 9.796 0 0 1-.613-9.633c.095-.196.236-.466.313-.6.152-.265.535-.852.586-.896.078-.07 1.26-.095 1.865-.041a9.844 9.844 0 0 1 8.65 7.201c.254.942.352 1.744.334 2.764a8.847 8.847 0 0 1-.301 2.261c-.715 2.785-2.654 5.138-5.278 6.405a9.795 9.795 0 0 1-3.547.946 16.36 16.36 0 0 1-1.405-.002 9.878 9.878 0 0 1-5.736-2.407zM27.92 32.69c.022-.079.065-.272.097-.43a6.412 6.412 0 0 0-.299-3.548c-.64-1.645-1.91-2.891-3.508-3.446a1.81 1.81 0 0 0-.196-.06c-.044 0-.192.682-.25 1.148-.029.237-.029 1.131 0 1.37.155 1.251.585 2.3 1.327 3.232.16.201.553.607.747.772.553.47 1.12.796 1.808 1.04.111.04.21.071.219.069a.487.487 0 0 0 .055-.147z"/><path id="e" d="M19.25 42h2.714v3.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H32.732c1.623-2.333 2.212-4.5 1.768-6.5h14.536v-3.212a.342.342 0 0 0-.339-.343h-14.79a15.663 15.663 0 0 0-1.215-2.742h16.344c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V42zm-3.79 11.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm-1.394-16.606C15 35.5 14.5 35.025 13.733 33.448c-.556-1.144-.908-2.315-1.026-3.6-.035-.377-.04-1.232-.01-1.572.127-1.427.479-2.634 1.124-3.861a9.868 9.868 0 0 1 4.994-4.507c.24-.096.63-.236.637-.229a.859.859 0 0 1-.071.132c-.633 1.046-1.176 3.203-1.275 5.059l-.018.353-.115.162a6.324 6.324 0 0 0-1.094 2.865 9.018 9.018 0 0 0 0 1.521 6.257 6.257 0 0 0 1.208 3.02c.836 1.112 2.034 1.88 3.332 2.14.426.086.53.095 1.082.094.445 0 .547-.005.751-.038a5.349 5.349 0 0 0 2.003-.723c.116-.07.23-.14.252-.158l.041-.031-.092-.039a15.055 15.055 0 0 1-1.08-.556 9.864 9.864 0 0 1-3.215-3.084 9.796 9.796 0 0 1-.613-9.633c.095-.196.236-.466.313-.6.152-.265.535-.852.586-.896.078-.07 1.26-.095 1.865-.041a9.844 9.844 0 0 1 8.65 7.201c.254.942.352 1.744.334 2.764a8.847 8.847 0 0 1-.301 2.261c-.715 2.785-2.654 5.138-5.278 6.405a9.795 9.795 0 0 1-3.547.946 16.36 16.36 0 0 1-1.405-.002 9.878 9.878 0 0 1-5.736-2.407zM27.92 30.69c.022-.079.065-.272.097-.43a6.412 6.412 0 0 0-.299-3.548c-.64-1.645-1.91-2.891-3.508-3.446a1.81 1.81 0 0 0-.196-.06c-.044 0-.192.682-.25 1.148-.029.237-.029 1.131 0 1.37.155 1.251.585 2.3 1.327 3.232.16.201.553.607.747.772.553.47 1.12.796 1.808 1.04.111.04.21.071.219.069a.487.487 0 0 0 .055-.147z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16.034 21.5 18 21.197l3.6-1.697 7.4 3.203h8.25L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_stripe/i18n/uk.po b/addons/payment_stripe/i18n/uk.po
index 1e337c910a9..480ab0f9ab7 100644
--- a/addons/payment_stripe/i18n/uk.po
+++ b/addons/payment_stripe/i18n/uk.po
@@ -3,13 +3,15 @@
 # * payment_stripe
 # 
 # Translators:
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
 # Martin Trigaux, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
 "Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -157,12 +159,12 @@ msgstr "Провайдер"
 #. module: payment_stripe
 #: selection:payment.acquirer,provider:0
 msgid "Sips"
-msgstr "Набирає"
+msgstr "Sips"
 
 #. module: payment_stripe
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_stripe
 #: model:ir.model.fields,field_description:payment_stripe.field_payment_acquirer__stripe_publishable_key
@@ -184,13 +186,13 @@ msgstr "Stripe надав нам таку інформацію про пробл
 #: code:addons/payment_stripe/models/payment.py:184
 #, python-format
 msgid "Stripe: %s orders found for reference %s"
-msgstr "Смуга: %s замовлення для довідки %s"
+msgstr "Stripe: %s замовлення для довідки %s"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:180
 #, python-format
 msgid "Stripe: no order found for reference %s"
-msgstr "Смуга: замовлення не знайдено для довідки %s"
+msgstr "Stripe: замовлення не знайдено для довідки %s"
 
 #. module: payment_stripe
 #: code:addons/payment_stripe/models/payment.py:170
diff --git a/addons/payment_stripe/static/description/icon.png b/addons/payment_stripe/static/description/icon.png
index 9029a0330db..81bb12e9ed8 100644
--- a/addons/payment_stripe/static/description/icon.png
+++ b/addons/payment_stripe/static/description/icon.png
diff --git a/addons/payment_stripe/static/description/icon.svg b/addons/payment_stripe/static/description/icon.svg
new file mode 100644
index 00000000000..70572e645e5
--- /dev/null
+++ b/addons/payment_stripe/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#94B6C8"/><stop offset="100%" stop-color="#6A9EBA"/></linearGradient><path id="d" d="M19.25 46h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V37.5H32.5c.333-3.333-.165-5.5-1.494-6.5h18.03v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V46zm-3.79 9.642h-1.037V55h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 55h1.07l.809 2.389h.01L20.075 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V55zm5.66-27.992c4.256 1.523 6.896 3.327 6.896 7.649 0 2.612-.901 4.633-2.64 6.001-1.553 1.244-3.852 1.897-6.616 1.897-3.48 0-6.834-1.057-8.635-2.084l.932-5.814c2.112 1.244 5.342 2.207 7.299 2.207 1.584 0 2.454-.59 2.454-1.616 0-1.058-.901-1.742-3.603-2.706-4.193-1.523-6.771-3.327-6.771-7.556 0-2.332.838-4.26 2.453-5.597 1.553-1.275 3.728-1.959 6.337-1.959 3.696 0 6.367 1.027 7.671 1.649l-.931 5.752c-1.647-.808-4.038-1.71-6.368-1.71-1.273 0-1.988.497-1.988 1.368 0 1.026 1.243 1.68 3.51 2.519z"/><path id="e" d="M19.25 44h2.714v1.212c0 .188.152.343.339.343h26.394a.342.342 0 0 0 .339-.343V35.5H32.5c.333-3.333-.165-5.5-1.494-6.5h18.03v-3.212a.342.342 0 0 0-.339-.343H29.765c.361-1.01.57-1.924.627-2.742h18.644c1.5 0 2.714 1.228 2.714 2.742v20.11c0 1.514-1.213 2.742-2.714 2.742H21.964c-1.5 0-2.714-1.228-2.714-2.742V44zm-3.79 9.642h-1.037V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17.422 53h1.07l.809 2.389h.01L20.075 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438h-.711V53zm5.66-27.992c4.256 1.523 6.896 3.327 6.896 7.649 0 2.612-.901 4.633-2.64 6.001-1.553 1.244-3.852 1.897-6.616 1.897-3.48 0-6.834-1.057-8.635-2.084l.932-5.814c2.112 1.244 5.342 2.207 7.299 2.207 1.584 0 2.454-.59 2.454-1.616 0-1.058-.901-1.742-3.603-2.706-4.193-1.523-6.771-3.327-6.771-7.556 0-2.332.838-4.26 2.453-5.597 1.553-1.275 3.728-1.959 6.337-1.959 3.696 0 6.367 1.027 7.671 1.649l-.931 5.752c-1.647-.808-4.038-1.71-6.368-1.71-1.273 0-1.988.497-1.988 1.368 0 1.026 1.243 1.68 3.51 2.519z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L14 17.5l13.818 5.203h9.432L48 23l3.576 1.968-.236 22.01L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/payment_transfer/i18n/uk.po b/addons/payment_transfer/i18n/uk.po
index a4d8966f212..64c31af9cce 100644
--- a/addons/payment_transfer/i18n/uk.po
+++ b/addons/payment_transfer/i18n/uk.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:22+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,7 +24,7 @@ msgstr ""
 #: code:addons/payment_transfer/models/payment.py:83
 #, python-format
 msgid "; multiple order found"
-msgstr "; знайдено декілька замовлень"
+msgstr "; знайдено кілька замовлень"
 
 #. module: payment_transfer
 #: code:addons/payment_transfer/models/payment.py:81
@@ -86,7 +87,7 @@ msgstr "Ручне налаштування"
 #. module: payment_transfer
 #: selection:payment.acquirer,provider:0
 msgid "Ogone"
-msgstr "Огон"
+msgstr "Ogone"
 
 #. module: payment_transfer
 #: selection:payment.acquirer,provider:0
@@ -116,12 +117,12 @@ msgstr "Провайдер"
 #. module: payment_transfer
 #: selection:payment.acquirer,provider:0
 msgid "Sips"
-msgstr "Набирає"
+msgstr "Sips"
 
 #. module: payment_transfer
 #: selection:payment.acquirer,provider:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: payment_transfer
 #: selection:payment.acquirer,provider:0
diff --git a/addons/phone_validation/i18n/uk.po b/addons/phone_validation/i18n/uk.po
index 717349b5f5c..dbb3b14987a 100644
--- a/addons/phone_validation/i18n/uk.po
+++ b/addons/phone_validation/i18n/uk.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
+# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: Martin Trigaux, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@ msgstr ""
 #. module: phone_validation
 #: selection:res.company,phone_international_format:0
 msgid "Add international prefix"
-msgstr "Додати міжнародний префікс"
+msgstr "Додайте міжнародний префікс"
 
 #. module: phone_validation
 #: model:ir.model.fields,help:phone_validation.field_res_company__phone_international_format
@@ -79,7 +81,7 @@ msgstr "Немає префікса"
 #. module: phone_validation
 #: model:ir.model,name:phone_validation.model_phone_validation_mixin
 msgid "Phone Validation Mixin"
-msgstr ""
+msgstr "Перевірка телефону Mixin"
 
 #. module: phone_validation
 #: code:addons/phone_validation/tools/phone_validation.py:44
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index 8f0cf82dfa2..ee26d8e9c7c 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -2168,7 +2168,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Поръчки за продажби"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2194,7 +2194,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Редове от поръчка"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index ecb952c00f0..535593b3783 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -954,7 +954,7 @@ msgstr "Virksomhed"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1310,7 +1310,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1400,6 +1400,7 @@ msgstr ""
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_open_statement
@@ -4352,7 +4353,7 @@ msgstr "Enhedspris"
 #. module: point_of_sale
 #: selection:barcode.rule,type:0
 msgid "Unit Product"
-msgstr ""
+msgstr "Stk. produkt"
 
 #. module: point_of_sale
 #: model:product.product,uom_name:point_of_sale.product_product_consumable
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 5d1a3cd4d6d..88fcac59f3b 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -2168,7 +2168,7 @@ msgstr "Análisis de Pedidos"
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Órdenes del PDV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2194,7 +2194,7 @@ msgstr "Líneas pedido del Punto de Venta"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas de venta PDV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/es_CL.po b/addons/point_of_sale/i18n/es_CL.po
index a9b6d080a7f..217274085e1 100644
--- a/addons/point_of_sale/i18n/es_CL.po
+++ b/addons/point_of_sale/i18n/es_CL.po
@@ -2163,7 +2163,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Pedidos de ventas"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2189,7 +2189,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas del pedido"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/es_CO.po b/addons/point_of_sale/i18n/es_CO.po
index b41e1745e4a..016f1042c46 100644
--- a/addons/point_of_sale/i18n/es_CO.po
+++ b/addons/point_of_sale/i18n/es_CO.po
@@ -2220,7 +2220,7 @@ msgstr "Análisis de las Órdenes"
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Órdenes PdV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2246,7 +2246,7 @@ msgstr "Líneas de órdenes PdV"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas de orden PdV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/es_CR.po b/addons/point_of_sale/i18n/es_CR.po
index e73445367e3..0febbedc7df 100644
--- a/addons/point_of_sale/i18n/es_CR.po
+++ b/addons/point_of_sale/i18n/es_CR.po
@@ -2160,7 +2160,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Ventas TPV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2186,7 +2186,7 @@ msgstr "TPV Líneas pedido"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas de venta TPV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/es_PE.po b/addons/point_of_sale/i18n/es_PE.po
index 766171443c1..d511b7618b5 100644
--- a/addons/point_of_sale/i18n/es_PE.po
+++ b/addons/point_of_sale/i18n/es_PE.po
@@ -2222,7 +2222,7 @@ msgstr "Analisis de Pedidos"
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Pedidos de PDV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2248,7 +2248,7 @@ msgstr "Líneas de Pedido de PDV"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas de Pedido de PDV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/es_VE.po b/addons/point_of_sale/i18n/es_VE.po
index 203807a1a31..bff35f5bef7 100644
--- a/addons/point_of_sale/i18n/es_VE.po
+++ b/addons/point_of_sale/i18n/es_VE.po
@@ -2163,7 +2163,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Ventas TPV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2189,7 +2189,7 @@ msgstr "TPV Líneas pedido"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Líneas de venta TPV"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/eu.po b/addons/point_of_sale/i18n/eu.po
index 4a1c1a47b3a..376e5f2b2be 100644
--- a/addons/point_of_sale/i18n/eu.po
+++ b/addons/point_of_sale/i18n/eu.po
@@ -2158,7 +2158,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Salmenta eskariak"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2184,7 +2184,7 @@ msgstr ""
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Eskari lerroak"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index e23e994ea8c..3b3c887cc5a 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -3706,7 +3706,7 @@ msgid ""
 "\"%s\" (id:%d)."
 msgstr ""
 "Nije definiran konto prihoda da izvršim plaćanje za partnera: \"%s\" "
-"(id:%id)."
+"(id:%d)."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/models/pos_order.py:835
diff --git a/addons/point_of_sale/i18n/kab.po b/addons/point_of_sale/i18n/kab.po
index 93c7f79e5b1..96b3888a646 100644
--- a/addons/point_of_sale/i18n/kab.po
+++ b/addons/point_of_sale/i18n/kab.po
@@ -2161,7 +2161,7 @@ msgstr "Tasleṭ n tludna"
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Tiludna n wagaz n uznuznu"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2187,7 +2187,7 @@ msgstr "Izirigen n tludna n wagaz n uznuznu"
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Izirigen n tladna n wagaz n uznuznu"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/mk.po b/addons/point_of_sale/i18n/mk.po
index f8431d01cde..595f6a99d56 100644
--- a/addons/point_of_sale/i18n/mk.po
+++ b/addons/point_of_sale/i18n/mk.po
@@ -2187,7 +2187,7 @@ msgstr "Анализи на налози"
 #: code:addons/point_of_sale/models/pos_config.py:180
 #, fuzzy, python-format
 msgid "POS Order %s"
-msgstr "Налози на точка за продажба"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_pos_order_line_form
@@ -2213,7 +2213,7 @@ msgstr "Ставки од налогот за точката на продажб
 #: code:addons/point_of_sale/models/pos_config.py:191
 #, fuzzy, python-format
 msgid "POS order line %s"
-msgstr "Ставки од налогот за местото на продажба"
+msgstr ""
 
 #. module: point_of_sale
 #: model_terms:ir.ui.view,arch_db:point_of_sale.view_report_pos_order_search
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index f3821a0d8f8..8a889d85d9e 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -3,16 +3,18 @@
 # * point_of_sale
 # 
 # Translators:
-# Martin Trigaux, 2018
+# Disaster Disasterov <mobarbitr@gmail.com>, 2018
 # Dmitry sky <d.v.selitsky@gmail.com>, 2018
 # Collex100, 2018
+# Martin Trigaux, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
-"PO-Revision-Date: 2018-10-08 06:48+0000\n"
-"Last-Translator: Collex100, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Martin Trigaux, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1120,7 +1122,7 @@ msgstr "Дисплей для клиента"
 #: code:addons/point_of_sale/models/pos_order.py:637
 #, python-format
 msgid "Customer Invoice"
-msgstr "Счета клиентам"
+msgstr "Счет фактура"
 
 #. module: point_of_sale
 #: model:ir.model.fields,field_description:point_of_sale.field_pos_config__customer_facing_display_html
diff --git a/addons/portal/i18n/da.po b/addons/portal/i18n/da.po
index 656949a8fef..76279699fdb 100644
--- a/addons/portal/i18n/da.po
+++ b/addons/portal/i18n/da.po
@@ -11,16 +11,17 @@
 # Jonathan Stein <cgs@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:22+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -161,12 +162,12 @@ msgstr ""
 #: model:ir.model.fields,field_description:portal.field_portal_mixin__access_warning
 #: model:ir.model.fields,field_description:portal.field_portal_share__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Adgang advarsel"
 
 #. module: portal
 #: model_terms:ir.ui.view,arch_db:portal.portal_share_wizard
 msgid "Add a note"
-msgstr ""
+msgstr "Tilføj en note"
 
 #. module: portal
 #: model_terms:ir.ui.view,arch_db:portal.portal_share_wizard
@@ -284,7 +285,7 @@ msgstr "Oprettet den"
 #. module: portal
 #: model:ir.model.fields,help:portal.field_portal_mixin__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Kundeportal URL"
 
 #. module: portal
 #: model_terms:ir.ui.view,arch_db:portal.portal_share_template
@@ -341,7 +342,7 @@ msgstr ""
 #. module: portal
 #: model:ir.model,name:portal.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: portal
 #: model_terms:ir.ui.view,arch_db:portal.portal_breadcrumbs
@@ -464,7 +465,7 @@ msgstr "Telefon"
 #. module: portal
 #: model:ir.model.fields,field_description:portal.field_portal_mixin__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portal adgangs URL"
 
 #. module: portal
 #: model:ir.model,name:portal.model_portal_mixin
diff --git a/addons/portal/static/src/js/portal_chatter.js b/addons/portal/static/src/js/portal_chatter.js
index c2f0e5fb49b..7f4ba583036 100644
--- a/addons/portal/static/src/js/portal_chatter.js
+++ b/addons/portal/static/src/js/portal_chatter.js
@@ -4,6 +4,7 @@ odoo.define('portal.chatter', function(require) {
 var base = require('web_editor.base');
 var ajax = require('web.ajax');
 var core = require('web.core');
+var dom = require('web.dom');
 var Widget = require('web.Widget');
 var rpc = require('web.rpc');
 var time = require('web.time');
@@ -21,7 +22,8 @@ var _t = core._t;
 var PortalChatter = Widget.extend({
     template: 'portal.chatter',
     events: {
-        "click .o_portal_chatter_pager_btn": '_onClickPager'
+        "click .o_portal_chatter_pager_btn": '_onClickPager',
+        'click .o_portal_chatter_composer_btn': '_onSubmitButtonClick',
     },
 
     init: function(parent, options){
@@ -43,6 +45,11 @@ var PortalChatter = Widget.extend({
         this.set('pager', {});
         this.set('domain', this.options['domain']);
         this._current_page = this.options['pager_start'];
+
+        // TODO simplify this using the 'async' keyword in the events
+        // property definition as soon as this widget is converted in
+        // frontend widget.
+        this._onSubmitButtonClick = dom.makeButtonHandler(this._onSubmitButtonClick);
     },
     willStart: function(){
         var self = this;
@@ -227,6 +234,12 @@ var PortalChatter = Widget.extend({
         var page = $(ev.currentTarget).data('page');
         this._changeCurrentPage(page);
     },
+    /**
+     * @private
+     */
+    _onSubmitButtonClick: function () {
+        return $.Deferred();
+    },
 });
 
 base.ready().then(function () {
diff --git a/addons/pos_cache/i18n/zh_CN.po b/addons/pos_cache/i18n/zh_CN.po
index 399d32f3213..e4ca5ce014d 100644
--- a/addons/pos_cache/i18n/zh_CN.po
+++ b/addons/pos_cache/i18n/zh_CN.po
@@ -115,4 +115,4 @@ msgstr "产品字段"
 #. module: pos_cache
 #: model:ir.model,name:pos_cache.model_pos_cache
 msgid "pos.cache"
-msgstr "高速缓存"
+msgstr "pos.cache"
diff --git a/addons/pos_mercury/i18n/da.po b/addons/pos_mercury/i18n/da.po
index 5f710f652b6..f6b9cb8b620 100644
--- a/addons/pos_mercury/i18n/da.po
+++ b/addons/pos_mercury/i18n/da.po
@@ -7,15 +7,16 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:04+0000\n"
-"PO-Revision-Date: 2018-10-02 10:04+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:23+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -491,7 +492,7 @@ msgstr "Type"
 #. module: pos_mercury
 #: selection:barcode.rule,type:0
 msgid "Unit Product"
-msgstr ""
+msgstr "Stk. produkt"
 
 #. module: pos_mercury
 #: model_terms:ir.ui.view,arch_db:pos_mercury.view_pos_mercury_configuration_form
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index abce2989499..d6d31f1a2c3 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -10,10 +10,10 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:23+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -491,7 +491,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: product
 #: model_terms:ir.ui.view,arch_db:product.product_template_form_view
@@ -1318,7 +1318,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:product.field_product_product__activity_type_id
 #: model:ir.model.fields,field_description:product.field_product_template__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_product_product__message_needaction_counter
@@ -1952,7 +1952,7 @@ msgstr ""
 #. module: product
 #: model_terms:ir.ui.view,arch_db:product.product_template_search_view
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: product
 #: model:ir.model.fields,field_description:product.field_res_config_settings__group_product_pricelist
@@ -2055,6 +2055,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: product
 #: model:product.attribute.value,name:product.product_attribute_value_1
diff --git a/addons/product/static/description/icon.png b/addons/product/static/description/icon.png
index d008460f838..2079879b777 100644
--- a/addons/product/static/description/icon.png
+++ b/addons/product/static/description/icon.png
diff --git a/addons/product/static/description/icon.svg b/addons/product/static/description/icon.svg
new file mode 100644
index 00000000000..2b0b6824ca2
--- /dev/null
+++ b/addons/product/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#B06161"/><stop offset="45.785%" stop-color="#984E4E"/><stop offset="100%" stop-color="#7C3838"/></linearGradient><path id="d" d="M48.466 42.033c0 .837-.277 1.548-.831 2.133L36.606 55.823c-.584.585-1.265.877-2.044.877-.793 0-1.467-.292-2.021-.877l-16.06-16.965c-.569-.585-1.051-1.382-1.448-2.393s-.595-1.935-.595-2.773v-9.857c0-.821.284-1.532.853-2.132.569-.6 1.243-.9 2.021-.9h9.344c.794 0 1.67.209 2.628.627.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156zM24.5 28.385c0-.838-.28-1.552-.842-2.145-.562-.592-1.24-.888-2.033-.888-.794 0-1.471.296-2.033.888-.561.593-.842 1.307-.842 2.145 0 .837.28 1.552.842 2.144.562.592 1.24.889 2.033.889.794 0 1.471-.297 2.033-.889.561-.592.842-1.307.842-2.144zm32.59 13.648c0 .837-.276 1.548-.83 2.133L45.23 55.823c-.584.585-1.265.877-2.044.877-.539 0-.98-.11-1.325-.332-.344-.22-.74-.576-1.19-1.066l10.557-11.136c.554-.585.83-1.296.83-2.133 0-.821-.276-1.54-.83-2.156l-16.06-16.919c-.57-.6-1.333-1.11-2.291-1.528-.958-.418-1.834-.628-2.628-.628h5.031c.794 0 1.67.21 2.628.628.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156z"/><path id="e" d="M48.466 40.033c0 .837-.277 1.548-.831 2.133L36.606 53.823c-.584.585-1.265.877-2.044.877-.793 0-1.467-.292-2.021-.877l-16.06-16.965c-.569-.585-1.051-1.382-1.448-2.393s-.595-1.935-.595-2.773v-9.857c0-.821.284-1.532.853-2.132.569-.6 1.243-.9 2.021-.9h9.344c.794 0 1.67.209 2.628.627.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156zM24.5 26.385c0-.838-.28-1.552-.842-2.145-.562-.592-1.24-.888-2.033-.888-.794 0-1.471.296-2.033.888-.561.593-.842 1.307-.842 2.145 0 .837.28 1.552.842 2.144.562.592 1.24.889 2.033.889.794 0 1.471-.297 2.033-.889.561-.592.842-1.307.842-2.144zm32.59 13.648c0 .837-.276 1.548-.83 2.133L45.23 53.823c-.584.585-1.265.877-2.044.877-.539 0-.98-.11-1.325-.332-.344-.22-.74-.576-1.19-1.066l10.557-11.136c.554-.585.83-1.296.83-2.133 0-.821-.276-1.54-.83-2.156l-16.06-16.919c-.57-.6-1.333-1.11-2.291-1.528-.958-.418-1.834-.628-2.628-.628h5.031c.794 0 1.67.21 2.628.628.959.419 1.722.928 2.291 1.528l16.06 16.919c.554.616.83 1.335.83 2.156z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L16.402 19h19.682L56.79 41 39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index eb2fadaa112..618c4d28613 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.po
@@ -11,9 +11,9 @@
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2018
 # JonathanStein <jstein@image.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:23+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -232,7 +232,7 @@ msgstr ""
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.portal_my_task
 msgid "<small class=\"text-right\">Status:</small>"
-msgstr ""
+msgstr "<small class=\"text-right\">Status:</small>"
 
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.portal_my_task
@@ -302,7 +302,7 @@ msgstr "Acceptér mails fra"
 #: model:ir.model.fields,field_description:project.field_project_project__access_warning
 #: model:ir.model.fields,field_description:project.field_project_task__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Adgang advarsel"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project__message_needaction
@@ -669,7 +669,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config
@@ -812,7 +812,7 @@ msgstr ""
 #: model:ir.model.fields,help:project.field_project_project__access_url
 #: model:ir.model.fields,help:project.field_project_task__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Kundeportal URL"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.rating_rating_action_project_report
@@ -916,7 +916,7 @@ msgstr "Udvikling"
 #. module: project
 #: model:ir.model,name:project.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: project
 #. openerp-web
@@ -947,6 +947,7 @@ msgstr "Vis navn"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.edit_project
@@ -975,7 +976,7 @@ msgstr "Udkast"
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.view_task_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.view_project_kanban
@@ -1712,7 +1713,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: project
 #: code:addons/project/models/project.py:852
@@ -1992,7 +1993,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:project.field_project_project__access_url
 #: model:ir.model.fields,field_description:project.field_project_task__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portal adgangs URL"
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_task__priority
@@ -2410,7 +2411,7 @@ msgstr "Vis projekt på dashboard"
 #. module: project
 #: model_terms:ir.ui.view,arch_db:project.view_task_search_form
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: project
 #. openerp-web
@@ -2496,6 +2497,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: project
 #: model:ir.model.fields,field_description:project.field_project_project__subtask_project_id
diff --git a/addons/project_timesheet_holidays/i18n/da.po b/addons/project_timesheet_holidays/i18n/da.po
index 393fb78fb9d..b6a2278a32e 100644
--- a/addons/project_timesheet_holidays/i18n/da.po
+++ b/addons/project_timesheet_holidays/i18n/da.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 # Martin Trigaux, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:23+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Virksomheder"
 #. module: project_timesheet_holidays
 #: model:ir.model,name:project_timesheet_holidays.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: project_timesheet_holidays
 #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id
diff --git a/addons/purchase/controllers/portal.py b/addons/purchase/controllers/portal.py
index f718a9e4c02..8e5cea717ac 100644
--- a/addons/purchase/controllers/portal.py
+++ b/addons/purchase/controllers/portal.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+import base64
 from collections import OrderedDict
-from functools import partial
 
 from odoo import http
 from odoo.exceptions import AccessError, MissingError
@@ -10,6 +10,8 @@ from odoo.http import request
 from odoo.tools import image_resize_image
 from odoo.tools.translate import _
 from odoo.addons.portal.controllers.portal import pager as portal_pager, CustomerPortal
+from odoo.addons.web.controllers.main import Binary
+
 
 
 class CustomerPortal(CustomerPortal):
@@ -22,9 +24,15 @@ class CustomerPortal(CustomerPortal):
         return values
 
     def _purchase_order_get_page_view_values(self, order, access_token, **kwargs):
+        #
+        def resize_to_48(b64source):
+            if not b64source:
+                b64source = base64.b64encode(Binary().placeholder())
+            return image_resize_image(b64source, size=(48, 48))
+
         values = {
             'order': order,
-            'resize_to_48': partial(image_resize_image, size=(48, 48)),
+            'resize_to_48': resize_to_48,
         }
         return self._get_page_view_values(order, access_token, values, 'my_purchases_history', True, **kwargs)
 
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index 58bf4fe880a..c86afdabbad 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -12,9 +12,9 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -22,7 +22,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2018-08-24 09:23+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,7 +242,7 @@ msgstr "En advarsel kan sættes på et produkt eller en kunde (Indkøb)"
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Adgang advarsel"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order__message_needaction
@@ -454,7 +454,7 @@ msgstr "Opret e-mail"
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config
@@ -545,7 +545,7 @@ msgstr "Valuta"
 #. module: purchase
 #: model:ir.model.fields,help:purchase.field_purchase_order__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Kundeportal URL"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__date
@@ -981,7 +981,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: purchase
 #: selection:purchase.order,invoice_status:0
@@ -1140,7 +1140,7 @@ msgstr "Planlagt"
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portal adgangs URL"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_product_category__property_account_creditor_price_difference_categ
@@ -1659,7 +1659,7 @@ msgstr "Del"
 #. module: purchase
 #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__reference
@@ -1687,6 +1687,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: purchase
 #: model:ir.model.fields,field_description:purchase.field_purchase_order_line__price_subtotal
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index cf9b6c6d100..7457300f695 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -3,24 +3,25 @@
 # * purchase
 # 
 # Translators:
+# 前園義博 <yoshihiro.maezono@pro-spire.co.jp>, 2018
+# Takuya Sawada <takuya@tuntunkun.com>, 2018
+# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018
 # SHIMIZU Taku <shimizu.taku@gmail.com>, 2018
 # Martin Trigaux, 2018
-# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018
 # Manami Hashi <manami@roomsfor.hk>, 2018
 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018
 # kent_ocean <ke.tanabe@gmail.com>, 2018
 # Takahiro MURAKAMI <murakami@date-yakkyoku.com>, 2018
 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018
-# 前園義博 <yoshihiro.maezono@pro-spire.co.jp>, 2018
-# Takuya Sawada <takuya@tuntunkun.com>, 2018
-# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018
+# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:23+0000\n"
+"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n"
 "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -153,7 +154,7 @@ msgstr "<strong>説明</strong>"
 #. module: purchase
 #: model_terms:ir.ui.view,arch_db:purchase.report_purchasequotation_document
 msgid "<strong>Expected Date</strong>"
-msgstr ""
+msgstr "<strong>納入予定日</strong>"
 
 #. module: purchase
 #: model_terms:ir.ui.view,arch_db:purchase.report_purchaseorder_document
diff --git a/addons/purchase_requisition/i18n/uk.po b/addons/purchase_requisition/i18n/uk.po
index 02fc4dd6971..d1f95b46255 100644
--- a/addons/purchase_requisition/i18n/uk.po
+++ b/addons/purchase_requisition/i18n/uk.po
@@ -721,7 +721,7 @@ msgstr "Складське переміщення "
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: purchase_requisition
 #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__supplier_info_ids
diff --git a/addons/purchase_stock/i18n/da.po b/addons/purchase_stock/i18n/da.po
index b50d2a2c9d4..8fefa0e7138 100644
--- a/addons/purchase_stock/i18n/da.po
+++ b/addons/purchase_stock/i18n/da.po
@@ -6,16 +6,17 @@
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
-"PO-Revision-Date: 2018-10-24 09:34+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgstr ""
 #. module: purchase_stock
 #: model:ir.model,name:purchase_stock.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: purchase_stock
 #: model:ir.model.fields,field_description:purchase_stock.field_stock_move__created_purchase_line_id
diff --git a/addons/purchase_stock/i18n/uk.po b/addons/purchase_stock/i18n/uk.po
index 4c9bedc90ae..edb0c507e18 100644
--- a/addons/purchase_stock/i18n/uk.po
+++ b/addons/purchase_stock/i18n/uk.po
@@ -5,12 +5,13 @@
 # Translators:
 # Martin Trigaux, 2018
 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
-"PO-Revision-Date: 2018-10-24 09:34+0000\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -299,7 +300,7 @@ msgstr "Переміщення запасів"
 #. module: purchase_stock
 #: model:ir.model,name:purchase_stock.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: purchase_stock
 #: model:ir.model,name:purchase_stock.model_report_stock_report_stock_rule
diff --git a/addons/purchase_stock/views/stock_production_lot_views.xml b/addons/purchase_stock/views/stock_production_lot_views.xml
index 23ae5678bd3..fad70b0271c 100644
--- a/addons/purchase_stock/views/stock_production_lot_views.xml
+++ b/addons/purchase_stock/views/stock_production_lot_views.xml
@@ -25,7 +25,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group[@name='main_group']" position="after">
                 <group>
-                    <field name="purchase_order_ids" widget="many2many" readonly="True">
+                    <field name="purchase_order_ids" widget="many2many" readonly="True" attrs="{'invisible': [('purchase_order_ids', '=', [])]}">
                         <tree>
                             <field name="name"/>
                             <field name="partner_id"/>
diff --git a/addons/repair/i18n/da.po b/addons/repair/i18n/da.po
index f4e2ae14fbf..e75b3762182 100644
--- a/addons/repair/i18n/da.po
+++ b/addons/repair/i18n/da.po
@@ -8,9 +8,9 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
 "PO-Revision-Date: 2018-08-24 09:24+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -592,7 +592,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: repair
 #: model:ir.model.fields,field_description:repair.field_repair_order__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: repair
 #: selection:repair.order,invoice_method:0
@@ -931,7 +931,7 @@ msgstr "Sæt til kladde"
 #. module: repair
 #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: repair
 #: model:ir.model.fields,field_description:repair.field_repair_line__location_id
@@ -958,6 +958,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: repair
 #: model:ir.model,name:repair.model_stock_move
diff --git a/addons/repair/i18n/es.po b/addons/repair/i18n/es.po
index 599ad596df4..258ce195a59 100644
--- a/addons/repair/i18n/es.po
+++ b/addons/repair/i18n/es.po
@@ -3,16 +3,18 @@
 # * repair
 # 
 # Translators:
+# nle_odoo, 2018
 # Martin Trigaux, 2018
-# Cristopher Cravioto <ccr@odoo.com>, 2018
 # Miquel Torner <miq@odoo.com>, 2018
+# Cristopher Cravioto <ccr@odoo.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: Miquel Torner <miq@odoo.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
+"Last-Translator: Cristopher Cravioto <ccr@odoo.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,8 +31,8 @@ msgstr "${(object.name or '').replace('/','_')}"
 #: model:mail.template,subject:repair.mail_template_repair_quotation
 msgid "${object.partner_id.name} Repair Orders (Ref ${object.name or 'n/a' })"
 msgstr ""
-"${object.partner_id.name} Pedidos de reparación (Ref ${object.name o \"n/d\""
-" })"
+"${object.partner_id.name} Pedidos de reparación (Ref ${object.name or "
+"\"n/d\" })"
 
 #. module: repair
 #: model_terms:ir.ui.view,arch_db:repair.report_repairorder
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 030aed51180..5ef7f295d73 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -123,6 +123,30 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"    <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"        % set doc_name = 'pressupost' if object.state in ('draft', 'sent') else 'comanda'\n"
+"        Apreciat ${object.partner_id.name}\n"
+"        % if object.partner_id.parent_id:\n"
+"            (${object.partner_id.parent_id.name})\n"
+"        % endif\n"
+"        <br/><br/>\n"
+"        Aquí trobarà\n"
+"        % if ctx.get('proforma')\n"
+"            en el document adjunt la factura proforma\n"
+"        % else\n"
+"            el document de ${doc_name} <strong>${object.name}</strong>\n"
+"        % endif\n"
+"        % if object.origin:\n"
+"            (amb referència: ${object.origin} )\n"
+"        % endif\n"
+"        amb un import de <strong>${format_amount(object.amount_total, object.pricelist_id.currency_id)}</strong>\n"
+"        de ${object.company_id.name}.\n"
+"        <br/><br/>\n"
+"        No dubti en contactar amb nosaltres si té qualsevol dubte.\n"
+"    </p>\n"
+"</div>\n"
+"            "
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 965693e09d0..079b8c0cbe9 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -466,7 +466,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Adgang advarsel"
 
 #. module: sale
 #: model:ir.model.fields,help:sale.field_sale_order_line__qty_delivered_method
@@ -517,7 +517,7 @@ msgstr "Tilføj"
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.view_order_form
 msgid "Add a note"
-msgstr ""
+msgstr "Tilføj en note"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.view_order_form
@@ -853,7 +853,7 @@ msgstr "Beregn fragtomkostninger på ordrer"
 #. module: sale
 #: model:ir.model,name:sale.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_sale_config
@@ -1006,7 +1006,7 @@ msgstr "Kunde"
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_res_config_settings__auth_signup_uninvited
 msgid "Customer Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_res_config_settings__group_sale_delivery_address
@@ -1027,7 +1027,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model.fields,help:sale.field_sale_order__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Kundeportal URL"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order__client_order_ref
@@ -2004,7 +2004,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: sale
 #: selection:product.template,expense_policy:0
@@ -2467,7 +2467,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portal adgangs URL"
 
 #. module: sale
 #: selection:sale.report,state:0
@@ -3276,7 +3276,7 @@ msgstr "Leveringsinformation"
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_filter
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form
@@ -3380,6 +3380,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: sale
 #: model:product.template.attribute.value,name:sale.product_template_attribute_value_3
@@ -3729,6 +3733,9 @@ msgid ""
 "list view and click on 'Portal Access Management' option in the dropdown "
 "menu *Action*."
 msgstr ""
+"Hvis du vil sende invitationer i B2B-tilstand, skal du åbne en kontakt eller"
+" vælge flere i listevisning og klikke på 'Portal Access Management' i "
+"rullemenuen *Handling*."
 
 #. module: sale
 #: selection:sale.order,activity_state:0
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 9f311ba8cef..d1da427b596 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -53,8 +53,6 @@ msgid ""
 "${(object.name or '').replace('/','_')}${object.state == 'draft' and "
 "'_draft' or ''}"
 msgstr ""
-"${(object.name or '').ersetzen('/','_')}${object.state == 'draft' and "
-"'_draft' or ''}"
 
 #. module: sale
 #: model:mail.template,subject:sale.email_template_edi_sale
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 84e90d873de..6c9146fc10e 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -29,6 +29,7 @@
 # Lucas Weigandt <lucasweigandt@gmail.com>, 2018
 # Cris Martin <cristina.marrod@gmail.com>, 2018
 # Pilar Marín <pilar@odooperu.pe>, 2018
+# Omar Torres <otorresgi18@gmail.com>, 2018
 # 
 msgid ""
 msgstr ""
@@ -36,7 +37,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:24+0000\n"
-"Last-Translator: Pilar Marín <pilar@odooperu.pe>, 2018\n"
+"Last-Translator: Omar Torres <otorresgi18@gmail.com>, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -170,7 +171,7 @@ msgstr ""
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
 msgid "<i class=\"fa fa-check\"/> Accept &amp; Sign"
-msgstr ""
+msgstr "<i class=\"fa fa-check\"/> Aceptar y Firmar"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
@@ -291,7 +292,7 @@ msgstr ""
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
 msgid "<span>Accepted on the behalf of:</span>"
-msgstr ""
+msgstr "<span>Aceptado en nombre de:</span>"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
@@ -302,6 +303,7 @@ msgstr ""
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
 msgid "<span>By signing this proposal, I agree to the following terms:</span>"
 msgstr ""
+"<span>Al firmar esta propuesta, acepto los siguientes términos:</span>"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document
@@ -316,7 +318,7 @@ msgstr ""
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
 msgid "<span>For an amount of:</span>"
-msgstr ""
+msgstr "<span>Por la cantidad de:</span>"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document
@@ -499,7 +501,7 @@ msgstr ""
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template
 msgid "Accept &amp; Pay"
-msgstr ""
+msgstr "Aceptar y Pagar"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_order__access_warning
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index eb7e6442c80..740a35aa8d9 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -12,7 +12,7 @@
 # Simone Bernini <simone@aperturelabs.it>, 2018
 # Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018
 # Cécile Collart <cco@odoo.com>, 2018
-# SebastianoPistore <SebastianoPistore.info@protonmail.ch>, 2018
+# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018
 # pfaodoo <pfa@odoo.com>, 2018
 # Alberto Vincenzi <alberto.vincenzi@gmail.com>, 2018
 # Paolo Caruccio <paolo.caruccio66@gmail.com>, 2018
@@ -457,13 +457,13 @@ msgstr "<strong>Il tuo Riferimento:</strong>"
 #: code:addons/sale/models/sale.py:811
 #, python-format
 msgid "A journal must be specified of the acquirer %s."
-msgstr ""
+msgstr "Deve essere specificato un registro per il servizio %s."
 
 #. module: sale
 #: code:addons/sale/models/sale.py:804
 #, python-format
 msgid "A payment acquirer is required to create a transaction."
-msgstr ""
+msgstr "Per creare una transazione è necessario un servizio di pagamento."
 
 #. module: sale
 #: selection:res.config.settings,sale_pricelist_setting:0
@@ -1638,7 +1638,7 @@ msgstr "Ordine invalido"
 #: code:addons/sale/models/sale.py:794
 #, python-format
 msgid "Invalid token found! Token acquirer %s != %s"
-msgstr ""
+msgstr "Rilevato token non valido. Token del servizio %s != %s"
 
 #. module: sale
 #: code:addons/sale/models/sale.py:797
@@ -3352,7 +3352,7 @@ msgstr "Stabilisci diversi prezzi per un prodotto, sconti automatici, ecc. "
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.sale_onboarding_order_confirmation_step
 msgid "Set payments"
-msgstr "Salda i pagamenti"
+msgstr "Imposta pagamenti"
 
 #. module: sale
 #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index dbedd7249e8..8735b2eed58 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -3,23 +3,25 @@
 # * sale
 # 
 # Translators:
-# Martin Trigaux, 2018
-# Collex100, 2018
 # Max Belyanin <maxbelyanin@gmail.com>, 2018
-# Viktor Pogrebniak <vp@aifil.ru>, 2018
-# Артур Чеботарь <artcha.chebotar@gmail.com>, 2018
 # Максим Дронь <dronmax@gmail.com>, 2018
+# Артур Чеботарь <artcha.chebotar@gmail.com>, 2018
 # Алексей <noosvet@gmail.com>, 2018
+# Viktor Pogrebniak <vp@aifil.ru>, 2018
 # sergeiruzkiicode <sergei.ruzki@icode.by>, 2018
+# Collex100, 2018
+# Martin Trigaux, 2018
 # Sergey Vilizhanin, 2018
 # Dmitry sky <d.v.selitsky@gmail.com>, 2018
+# Disaster Disasterov <mobarbitr@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: Dmitry sky <d.v.selitsky@gmail.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
+"Last-Translator: Disaster Disasterov <mobarbitr@gmail.com>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +37,7 @@ msgstr "кол-во строк"
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_payment_transaction__sale_order_ids_nbr
 msgid "# of Sales Orders"
-msgstr ""
+msgstr "кол-во ордеров"
 
 #. module: sale
 #: model:mail.template,report_name:sale.email_template_edi_sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index 589459ca1fb..e34c2472156 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -3411,7 +3411,7 @@ msgstr "Переміщення запасів"
 #. module: sale
 #: selection:res.company,sale_onboarding_payment_method:0
 msgid "Stripe"
-msgstr "Смуга"
+msgstr "Stripe"
 
 #. module: sale
 #: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__stripe_publishable_key
diff --git a/addons/sale/models/sales_team.py b/addons/sale/models/sales_team.py
index 3dd93e94b6f..bb0686c50c9 100644
--- a/addons/sale/models/sales_team.py
+++ b/addons/sale/models/sales_team.py
@@ -39,13 +39,28 @@ class CrmTeam(models.Model):
     def _compute_quotations_to_invoice(self):
         non_website_teams = self.filtered(lambda team: team.team_type != 'website')
         if non_website_teams:
-            quotation_data = self.env['sale.report'].read_group([
+            query = self.env['sale.order']._where_calc([
                 ('team_id', 'in', non_website_teams.ids),
                 ('state', 'in', ['draft', 'sent']),
-            ], ['price_total', 'team_id', 'name'], ['team_id', 'name'], lazy=False)
+            ])
+            self.env['sale.order']._apply_ir_rules(query, 'read')
+            _, where_clause, where_clause_args = query.get_sql()
+            select_query = """
+                SELECT team_id, count(*), sum(amount_total /
+                    CASE COALESCE(currency_rate, 0)
+                    WHEN 0 THEN 1.0
+                    ELSE currency_rate
+                    END
+                ) as amount_total
+                FROM sale_order
+                WHERE %s
+                GROUP BY team_id
+            """ % where_clause
+            self.env.cr.execute(select_query, where_clause_args)
+            quotation_data = self.env.cr.dictfetchall()
             for datum in quotation_data:
-                self.browse(datum['team_id'][0]).quotations_amount += datum['price_total']
-                self.browse(datum['team_id'][0]).quotations_count += 1
+                self.browse(datum['team_id']).quotations_amount = datum['amount_total']
+                self.browse(datum['team_id']).quotations_count = datum['count']
 
     @api.multi
     def _compute_sales_to_invoice(self):
diff --git a/addons/sale/static/src/js/sale.js b/addons/sale/static/src/js/sale.js
index 374508f721b..9d2d9313bac 100644
--- a/addons/sale/static/src/js/sale.js
+++ b/addons/sale/static/src/js/sale.js
@@ -19,30 +19,40 @@ KanbanRecord.include({
      */
     _onSalesTeamTargetClick: function (ev) {
         ev.preventDefault();
+        var self = this;
 
         this.$target_input = $('<input>');
         this.$('.o_kanban_primary_bottom:last').html(this.$target_input);
         this.$('.o_kanban_primary_bottom:last').prepend(_t("Set an invoicing target: "));
         this.$target_input.focus();
 
+        this.$target_input.on({
+            blur: this._onSalesTeamTargetSet.bind(this),
+            keydown: function (ev) {
+                if (ev.keyCode === $.ui.keyCode.ENTER) {
+                    self._onSalesTeamTargetSet();
+                }
+            },
+        });
+    },
+    /**
+     * Mostly a handler for what happens to the input "this.$target_input"
+     *
+     * @private
+     * @param {JqueryEvent} ev
+     *
+     */
+    _onSalesTeamTargetSet: function () {
         var self = this;
-        this.$target_input.blur(function() {
-            var value = Number(self.$target_input.val());
-            if (isNaN(value)) {
-                self.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid."));
-            } else {
-                self._rpc({
-                        model: 'crm.team',
-                        method: 'write',
-                        args: [[self.id], { 'invoiced_target': value }],
-                    })
-                    .done(function() {
-                        self.trigger_up('kanban_record_update', {id: self.id});
-                    });
+        var value = Number(this.$target_input.val());
+        if (isNaN(value)) {
+            this.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid."));
+        } else {
+            this.trigger_up('kanban_record_update', {invoiced_target: value});
+            this.trigger_up('reload');
                 // TODO: previous lines can be refactored as follows (in master)
                 // self.trigger_up('kanban_record_update', {invoiced_target: value});
-            }
-        });
+        }
     },
 });
 
diff --git a/addons/sale/static/tests/sales_team_dashboard_tests.js b/addons/sale/static/tests/sales_team_dashboard_tests.js
index fca880dcc73..5a79c1ff4d4 100644
--- a/addons/sale/static/tests/sales_team_dashboard_tests.js
+++ b/addons/sale/static/tests/sales_team_dashboard_tests.js
@@ -23,7 +23,7 @@ QUnit.module('Sales Team Dashboard', {
 });
 
 QUnit.test('edit target with several o_kanban_primary_bottom divs [REQUIRE FOCUS]', function (assert) {
-    assert.expect(4);
+    assert.expect(6);
 
     var kanban = createView({
         View: KanbanView,
@@ -33,6 +33,7 @@ QUnit.test('edit target with several o_kanban_primary_bottom divs [REQUIRE FOCUS
                 '<templates>' +
                     '<t t-name="kanban-box">' +
                         '<div class="container o_kanban_card_content">' +
+                            '<field name="invoiced_target" />' +
                             '<a href="#" class="sales_team_target_definition o_inline_link">' +
                                 'Click to define a target</a>' +
                             '<div class="col-12 o_kanban_primary_bottom"/>' +
@@ -46,6 +47,10 @@ QUnit.test('edit target with several o_kanban_primary_bottom divs [REQUIRE FOCUS
                 assert.strictEqual(args.args[1].invoiced_target, 123,
                     "new value is correctly saved");
             }
+            if (args.method === 'read') { // Read happens after the write
+                assert.deepEqual(args.args[1], ['invoiced_target', 'display_name'],
+                    'the read (after write) should ask for invoiced_target');
+            }
             return this._super.apply(this, arguments);
         },
     });
@@ -63,6 +68,54 @@ QUnit.test('edit target with several o_kanban_primary_bottom divs [REQUIRE FOCUS
     kanban.$('.o_kanban_primary_bottom:last input').val('123');
     kanban.$('.o_kanban_primary_bottom:last input').blur();
 
+    assert.strictEqual(kanban.$('.o_kanban_record').text(), "123Click to define a target",
+        'The kanban record should display the updated target value');
+
+    kanban.destroy();
+});
+
+QUnit.test('edit target supports push Enter', function (assert) {
+    assert.expect(3);
+
+    var kanban = createView({
+        View: KanbanView,
+        model: 'crm.team',
+        data: this.data,
+        arch: '<kanban>' +
+                '<templates>' +
+                    '<t t-name="kanban-box">' +
+                        '<div class="container o_kanban_card_content">' +
+                            '<field name="invoiced_target" />' +
+                            '<a href="#" class="sales_team_target_definition o_inline_link">' +
+                                'Click to define a target</a>' +
+                            '<div class="col-12 o_kanban_primary_bottom"/>' +
+                            '<div class="col-12 o_kanban_primary_bottom bottom_block"/>' +
+                        '</div>' +
+                    '</t>' +
+                '</templates>' +
+              '</kanban>',
+        mockRPC: function (route, args) {
+            if (args.method === 'write') {
+                assert.strictEqual(args.args[1].invoiced_target, 123,
+                    "new value is correctly saved");
+            }
+            if (args.method === 'read') { // Read happens after the write
+                assert.deepEqual(args.args[1], ['invoiced_target', 'display_name'],
+                    'the read (after write) should ask for invoiced_target');
+            }
+            return this._super.apply(this, arguments);
+        },
+    });
+
+    kanban.$('a.sales_team_target_definition').click();
+
+    kanban.$('.o_kanban_primary_bottom:last input').focus();
+    kanban.$('.o_kanban_primary_bottom:last input').val('123');
+    kanban.$('.o_kanban_primary_bottom:last input').trigger($.Event('keydown', {which: $.ui.keyCode.ENTER, keyCode: $.ui.keyCode.ENTER}));
+
+    assert.strictEqual(kanban.$('.o_kanban_record').text(), "123Click to define a target",
+        'The kanban record should display the updated target value');
+
     kanban.destroy();
 });
 
diff --git a/addons/sale_crm/i18n/da.po b/addons/sale_crm/i18n/da.po
index 267f9f5e911..ce276c562d7 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.po
@@ -5,16 +5,17 @@
 # Translators:
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -148,6 +149,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Dette er et navn, der hjælper dig med at holde styr på dine forskellige "
+"kampagneindsatser"
 
 #. module: sale_crm
 #: model:ir.model.fields,help:sale_crm.field_account_invoice__medium_id
diff --git a/addons/sale_management/i18n/da.po b/addons/sale_management/i18n/da.po
index b50fbdd6f34..a921a23144d 100644
--- a/addons/sale_management/i18n/da.po
+++ b/addons/sale_management/i18n/da.po
@@ -64,7 +64,7 @@ msgstr "Aktiv"
 #. module: sale_management
 #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
 msgid "Add a note"
-msgstr ""
+msgstr "Tilføj en note"
 
 #. module: sale_management
 #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_form_quote
@@ -115,7 +115,7 @@ msgstr "Egenskaber"
 #. module: sale_management
 #: model:ir.model,name:sale_management.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: sale_management
 #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form
@@ -180,7 +180,7 @@ msgstr ""
 #. module: sale_management
 #: model:ir.model,name:sale_management.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: sale_management
 #: model:ir.model.fields,field_description:sale_management.field_sale_order_option__discount
@@ -207,6 +207,7 @@ msgstr "Vis type"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: sale_management
 #: sql_constraint:sale.order.template.line:0
diff --git a/addons/sale_quotation_builder/i18n/da.po b/addons/sale_quotation_builder/i18n/da.po
index 700f46e4865..7c6494bbe62 100644
--- a/addons/sale_quotation_builder/i18n/da.po
+++ b/addons/sale_quotation_builder/i18n/da.po
@@ -8,13 +8,15 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:24+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -77,7 +79,7 @@ msgstr "Luk"
 #. module: sale_quotation_builder
 #: model:ir.model,name:sale_quotation_builder.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: sale_quotation_builder
 #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.sale_order_template_view_form_inherit_sale_quotation_builder
diff --git a/addons/sale_stock/i18n/da.po b/addons/sale_stock/i18n/da.po
index 1f637a162f3..a87b382b966 100644
--- a/addons/sale_stock/i18n/da.po
+++ b/addons/sale_stock/i18n/da.po
@@ -3,19 +3,20 @@
 # * sale_stock
 # 
 # Translators:
-# Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Martin Trigaux, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
-"PO-Revision-Date: 2018-10-24 09:34+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:25+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -141,7 +142,7 @@ msgstr ""
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
diff --git a/addons/sale_stock/i18n/es_CO.po b/addons/sale_stock/i18n/es_CO.po
index fbd7e39186a..997a7323c8e 100644
--- a/addons/sale_stock/i18n/es_CO.po
+++ b/addons/sale_stock/i18n/es_CO.po
@@ -296,7 +296,7 @@ msgstr "Movimiento de Existencias"
 #: code:addons/sale_stock/sale_stock.py:213
 #, fuzzy, python-format
 msgid "This product is packaged by %s %s. You should sell %s %s."
-msgstr "Este producto es empacado por %d. Usted debería vender %d."
+msgstr "Este producto es empacado por %s %s. Usted debería vender %s %s."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_picking
diff --git a/addons/sale_stock/i18n/es_EC.po b/addons/sale_stock/i18n/es_EC.po
index f9c77f9270b..5b8215207b4 100644
--- a/addons/sale_stock/i18n/es_EC.po
+++ b/addons/sale_stock/i18n/es_EC.po
@@ -298,7 +298,7 @@ msgstr "Movimiento de existencias"
 #: code:addons/sale_stock/sale_stock.py:213
 #, fuzzy, python-format
 msgid "This product is packaged by %s %s. You should sell %s %s."
-msgstr "Este producto es empaquetado por %d . Debería vender %d ."
+msgstr "Este producto es empaquetado por %s %s. Debería vender %s %s."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_picking
diff --git a/addons/sale_stock/i18n/uk.po b/addons/sale_stock/i18n/uk.po
index e17ac72edef..79eebcd01b0 100644
--- a/addons/sale_stock/i18n/uk.po
+++ b/addons/sale_stock/i18n/uk.po
@@ -6,12 +6,13 @@
 # Martin Trigaux, 2018
 # Bohdan Lisnenko, 2018
 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
-"PO-Revision-Date: 2018-10-24 09:34+0000\n"
+"PO-Revision-Date: 2018-08-24 09:25+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -487,7 +488,7 @@ msgstr "Переміщення запасів"
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_stock_rules_report
diff --git a/addons/sale_stock/views/stock_production_lot_views.xml b/addons/sale_stock/views/stock_production_lot_views.xml
index 82b5ac9fb69..eb0484eb38c 100644
--- a/addons/sale_stock/views/stock_production_lot_views.xml
+++ b/addons/sale_stock/views/stock_production_lot_views.xml
@@ -25,7 +25,7 @@
         <field name="arch" type="xml">
             <xpath expr="//group[@name='main_group']" position="after">
                 <group>
-                    <field name="sale_order_ids" widget="many2many" readonly="True">
+                    <field name="sale_order_ids" widget="many2many" readonly="True" attrs="{'invisible': [('sale_order_ids', '=', [])]}">
                         <tree>
                             <field name="name"/>
                             <field name="partner_id"/>
diff --git a/addons/sale_timesheet/models/product.py b/addons/sale_timesheet/models/product.py
index 4057b628ae7..3f014013720 100644
--- a/addons/sale_timesheet/models/product.py
+++ b/addons/sale_timesheet/models/product.py
@@ -94,3 +94,17 @@ class ProductTemplate(models.Model):
             self.service_type = 'timesheet'
         elif self.type == 'consu' and self.service_policy == 'ordered_timesheet':
             self.invoice_policy = 'order'
+
+
+class ProductProduct(models.Model):
+    _inherit = 'product.product'
+
+    @api.onchange('service_tracking')
+    def _onchange_service_tracking(self):
+        if self.service_tracking == 'no':
+            self.project_id = False
+            self.project_template_id = False
+        elif self.service_tracking == 'task_global_project':
+            self.project_template_id = False
+        elif self.service_tracking in ['task_new_project', 'project_only']:
+            self.project_id = False
diff --git a/addons/sales_team/i18n/da.po b/addons/sales_team/i18n/da.po
index df0065c1ca8..7211d490c78 100644
--- a/addons/sales_team/i18n/da.po
+++ b/addons/sales_team/i18n/da.po
@@ -11,6 +11,7 @@
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -18,7 +19,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:25+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -451,7 +452,7 @@ msgstr "Team medlemmer"
 #. module: sales_team
 #: model:ir.actions.act_window,name:sales_team.crm_team_salesteams_act
 msgid "Team Pipelines"
-msgstr ""
+msgstr "Team pipeline"
 
 #. module: sales_team
 #: model:ir.model.fields,field_description:sales_team.field_crm_team__team_type
diff --git a/addons/snailmail/i18n/da.po b/addons/snailmail/i18n/da.po
index e65db09fc73..97ba246c5c6 100644
--- a/addons/snailmail/i18n/da.po
+++ b/addons/snailmail/i18n/da.po
@@ -9,8 +9,8 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-30 12:25+0000\n"
 "PO-Revision-Date: 2018-08-24 09:25+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,7 +92,7 @@ msgstr "Virksomhed"
 #. module: snailmail
 #: model:ir.model,name:snailmail.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: snailmail
 #: model:ir.model,name:snailmail.model_res_partner
diff --git a/addons/snailmail_account/i18n/da.po b/addons/snailmail_account/i18n/da.po
index 591adaa0520..e1ee70e100d 100644
--- a/addons/snailmail_account/i18n/da.po
+++ b/addons/snailmail_account/i18n/da.po
@@ -5,6 +5,7 @@
 # Translators:
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-05 09:29+0000\n"
 "PO-Revision-Date: 2018-08-24 09:25+0000\n"
-"Last-Translator: Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,7 +46,7 @@ msgstr "Virksomheder"
 #. module: snailmail_account
 #: model:ir.model,name:snailmail_account.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: snailmail_account
 #: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__currency_id
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index 8aa84dea159..f0c9b3d0104 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -9,11 +9,11 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Jarnhold Nattestad <nattestads@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
 "PO-Revision-Date: 2018-08-24 09:25+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -988,7 +988,7 @@ msgstr "Betingelser"
 #. module: stock
 #: model:ir.model,name:stock.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_config_settings
@@ -3310,7 +3310,7 @@ msgstr "Oversigt over næste aktivitet"
 #: model:ir.model.fields,field_description:stock.field_stock_picking__activity_type_id
 #: model:ir.model.fields,field_description:stock.field_stock_production_lot__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: stock
 #: model_terms:ir.ui.view,arch_db:stock.exception_on_picking
@@ -5178,7 +5178,7 @@ msgstr ""
 #. module: stock
 #: model_terms:ir.ui.view,arch_db:stock.view_picking_internal_search
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: stock
 #: model:ir.model.fields,help:stock.field_stock_rules_report__warehouse_ids
@@ -5298,6 +5298,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: stock
 #: code:addons/stock/models/stock_warehouse.py:443
@@ -6103,7 +6107,7 @@ msgstr "Enhedspris"
 #. module: stock
 #: selection:barcode.rule,type:0
 msgid "Unit Product"
-msgstr ""
+msgstr "Stk. produkt"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_stock_move__product_uom
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 8c81f7b2578..f588468bc90 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -3,23 +3,25 @@
 # * stock
 # 
 # Translators:
-# Максим Дронь <dronmax@gmail.com>, 2018
+# Denis Trepalin <zekarious@gmail.com>, 2018
+# Max Belyanin <maxbelyanin@gmail.com>, 2018
+# dzord dzord <ekenpad@gmail.com>, 2018
+# Andrey Samorukov <andrey.samorukov@me.com>, 2018
 # Gennady Marchenko <gennadym@gmail.com>, 2018
-# Martin Trigaux, 2018
-# Collex100, 2018
 # Sergey Vilizhanin, 2018
-# Max Belyanin <maxbelyanin@gmail.com>, 2018
-# Denis Trepalin <zekarious@gmail.com>, 2018
 # Viktor Pogrebniak <vp@aifil.ru>, 2018
-# Andrey Samorukov <andrey.samorukov@me.com>, 2018
-# dzord dzord <ekenpad@gmail.com>, 2018
+# Максим Дронь <dronmax@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Collex100, 2018
+# Victor Safronovich <vsafronovich@suvit.ru>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-24 09:34+0000\n"
-"PO-Revision-Date: 2018-10-24 09:34+0000\n"
-"Last-Translator: dzord dzord <ekenpad@gmail.com>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:25+0000\n"
+"Last-Translator: Victor Safronovich <vsafronovich@suvit.ru>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/odoo/teams/41243/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2536,7 +2538,7 @@ msgstr "Позиция инвентаризации"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_line_tree
 msgid "Inventory Lines"
-msgstr ""
+msgstr "Позиции инвентаризации"
 
 #. module: stock
 #: model:ir.model.fields,field_description:stock.field_product_template__property_stock_inventory
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index acc1073ade7..34978d97881 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -5536,7 +5536,7 @@ msgstr "Історія складської кількості"
 #: model:ir.model,name:stock.model_stock_rule
 #: model:ir.model.fields,field_description:stock.field_stock_move__rule_id
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_rules_report
diff --git a/addons/stock_account/i18n/da.po b/addons/stock_account/i18n/da.po
index cb6464ea797..49cfdc23fbf 100644
--- a/addons/stock_account/i18n/da.po
+++ b/addons/stock_account/i18n/da.po
@@ -7,16 +7,17 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:25+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -151,7 +152,7 @@ msgstr "Vælg dato"
 #. module: stock_account
 #: model:ir.model,name:stock_account.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: stock_account
 #: code:addons/stock_account/models/stock.py:587
diff --git a/addons/stock_account/models/stock.py b/addons/stock_account/models/stock.py
index 37c69251c19..fc10fb468b9 100644
--- a/addons/stock_account/models/stock.py
+++ b/addons/stock_account/models/stock.py
@@ -269,7 +269,8 @@ class StockMove(models.Model):
 
         # Update the standard price with the price of the last used candidate, if any.
         if new_standard_price and move.product_id.cost_method == 'fifo':
-            move.product_id.sudo().standard_price = new_standard_price
+            move.product_id.sudo().with_context(force_company=move.company_id.id) \
+                .standard_price = new_standard_price
 
         # If there's still quantity to value but we're out of candidates, we fall in the
         # negative stock use case. We chose to value the out move at the price of the
diff --git a/addons/stock_dropshipping/i18n/uk.po b/addons/stock_dropshipping/i18n/uk.po
index d80856078e1..3f3049faefa 100644
--- a/addons/stock_dropshipping/i18n/uk.po
+++ b/addons/stock_dropshipping/i18n/uk.po
@@ -5,12 +5,13 @@
 # Translators:
 # Martin Trigaux, 2018
 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
-"PO-Revision-Date: 2018-09-18 09:49+0000\n"
+"PO-Revision-Date: 2018-08-24 09:25+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -50,7 +51,7 @@ msgstr "Рядок замовлення"
 #. module: stock_dropshipping
 #: model:ir.model,name:stock_dropshipping.model_stock_rule
 msgid "Stock Rule"
-msgstr ""
+msgstr "Складське правило"
 
 #. module: stock_dropshipping
 #: model:stock.rule,name:stock_dropshipping.stock_rule_drop_shipping
diff --git a/addons/survey/i18n/da.po b/addons/survey/i18n/da.po
index f7d5bed7093..a0463d7c80b 100644
--- a/addons/survey/i18n/da.po
+++ b/addons/survey/i18n/da.po
@@ -12,8 +12,8 @@
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:25+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -738,7 +738,7 @@ msgstr "Udkast"
 #. module: survey
 #: model_terms:ir.ui.view,arch_db:survey.survey_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_user_input__email
@@ -1132,7 +1132,7 @@ msgstr "Forsinkede aktiviteter"
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__layout
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. module: survey
 #: selection:survey.user_input,type:0
@@ -1369,7 +1369,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_survey__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: survey
 #: model_terms:ir.ui.view,arch_db:survey.page
@@ -1921,7 +1921,7 @@ msgstr "Vis kommentar felt"
 #. module: survey
 #: model_terms:ir.ui.view,arch_db:survey.survey_survey_view_search
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1989,6 +1989,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: survey
 #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__subject
diff --git a/addons/test_mail/tests/test_odoobot.py b/addons/test_mail/tests/test_odoobot.py
index 50170f91604..07cdfaa0d3a 100644
--- a/addons/test_mail/tests/test_odoobot.py
+++ b/addons/test_mail/tests/test_odoobot.py
@@ -25,6 +25,14 @@ class TestOdoobot(BaseFunctionalTest, MockEmails, TestRecipients):
         self.test_record_employe = self.test_record.sudo(self.user_employee)
 
     @mute_logger('odoo.addons.mail.models.mail_mail')
+    def test_fetch_listener(self):
+        channel = self.env['mail.channel'].sudo(self.user_employee).init_odoobot()
+        partners = self.env['mail.channel'].channel_fetch_listeners(channel.uuid)
+        odoobot = self.env.ref("base.partner_root")
+        odoobot_in_fetch_listeners = [partner for partner in partners if partner['id'] == odoobot.id]
+        self.assertEqual(len(odoobot_in_fetch_listeners), 1, 'odoobot should appear only once in channel_fetch_listeners')
+
+    @mute_logger('odoo.addons.mail.models.mail_mail')
     def test_odoobot_ping(self):
         kwargs = self.message_post_default_kwargs.copy()
         kwargs.update({'body': self.odoobot_ping_body, 'partner_ids': [self.odoobot.id, self.user_admin.partner_id.id]})
diff --git a/addons/test_mail/tests/test_ui.py b/addons/test_mail/tests/test_ui.py
new file mode 100644
index 00000000000..f3f38d8a8c4
--- /dev/null
+++ b/addons/test_mail/tests/test_ui.py
@@ -0,0 +1,10 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import odoo.tests
+
+
+@odoo.tests.tagged('post_install', '-at_install')
+class TestUi(odoo.tests.HttpCase):
+
+    def test_01_project_tour(self):
+        self.phantom_js("/web", "odoo.__DEBUG__.services['web_tour.tour'].run('mail_tour')", "odoo.__DEBUG__.services['web_tour.tour'].tours.mail_tour.ready", login="admin")
diff --git a/addons/transifex/static/description/icon.png b/addons/transifex/static/description/icon.png
index 9da4be521b0..9e6c9556004 100644
--- a/addons/transifex/static/description/icon.png
+++ b/addons/transifex/static/description/icon.png
diff --git a/addons/transifex/static/description/icon.svg b/addons/transifex/static/description/icon.svg
new file mode 100644
index 00000000000..a1c957930b5
--- /dev/null
+++ b/addons/transifex/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="98.616%"><stop offset="0%" stop-color="#797C79"/><stop offset="100%" stop-color="#545554"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V36.095L18.936 13l5.025 8H30.5L41 28l7.5-7-5.564 10.127L55.577 49 36 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><path fill="#000" fill-rule="nonzero" d="M19.077 15h5.5v8h4v5h-4v18h4v5H23.54c-3.026 0-4.513-1.667-4.462-5V28h-4.452v-5h4.452v-8zm11.5 36l9-14-9.5-14h7l5.5 9 6-9h7l-9.5 14 9.5 14h-7l-5.5-8.445-5.5 8.445h-7zm-15.54 2.642H14V53h2.833v.642h-1.037v2.832h-.76v-2.832zM17 53h1.07l.809 2.389h.01L19.652 53h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H17V53z" opacity=".3"/><path fill="#FFF" fill-rule="nonzero" d="M19.077 13h5.5v8h4v5h-4v18h4v5H23.54c-3.026 0-4.513-1.667-4.462-5V26h-4.452v-5h4.452v-8zm11.5 36l9-14-9.5-14h7l5.5 9 6-9h7l-9.5 14 9.5 14h-7l-5.5-8.445-5.5 8.445h-7zm-15.54 2.642H14V51h2.833v.642h-1.037v2.832h-.76v-2.832zM17 51h1.07l.809 2.389h.01L19.652 51h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H17V51z"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/utm/i18n/da.po b/addons/utm/i18n/da.po
index 0ee4969231c..9fe1834ef32 100644
--- a/addons/utm/i18n/da.po
+++ b/addons/utm/i18n/da.po
@@ -7,16 +7,17 @@
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -108,7 +109,7 @@ msgstr "Facebook"
 #. module: utm
 #: model:ir.model,name:utm.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: utm
 #: model:ir.model.fields,field_description:utm.field_utm_campaign__id
@@ -197,6 +198,8 @@ msgid ""
 "This is a name that helps you keep track of your different campaign efforts,"
 " e.g. Fall_Drive, Christmas_Special"
 msgstr ""
+"Dette er et navn, der hjælper dig med at holde styr på dine forskellige "
+"kampagneindsatser"
 
 #. module: utm
 #: model:ir.model.fields,help:utm.field_utm_mixin__medium_id
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index d0059a25a95..64cf2ca9ac5 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -525,7 +525,7 @@ class Home(http.Controller):
             request.env['res.users']._invalidate_session_cache()
             request.session.session_token = security.compute_session_token(request.session, request.env)
 
-        return http.redirect_with_hash(self._login_redirect(uid))
+        return http.local_redirect(self._login_redirect(uid), keep_hash=True)
 
 class WebClient(http.Controller):
 
diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po
index 5c4b7f55073..bb16198224c 100644
--- a/addons/web/i18n/da.po
+++ b/addons/web/i18n/da.po
@@ -3,27 +3,28 @@
 # * web
 # 
 # Translators:
+# Kenneth Hansen <kenneth@vkdata.dk>, 2018
+# Jesper Carstensen <jc@danodoo.dk>, 2018
+# peso <peer.sommerlund@gmail.com>, 2018
+# Visti Kristensen <visti@vkdata.dk>, 2018
+# Jonathan Stein <cgs@image.dk>, 2018
 # Martin Trigaux, 2018
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
-# Kenneth Hansen <kenneth@vkdata.dk>, 2018
+# jonas jensen <j.jensen@tcomp.dk>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Jesper Carstensen <jc@danodoo.dk>, 2018
 # Jarnhold Nattestad <nattestads@gmail.com>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
-# peso <peer.sommerlund@gmail.com>, 2018
-# jonas jensen <j.jensen@tcomp.dk>, 2018
-# Visti Kristensen <visti@vkdata.dk>, 2018
-# Jonathan Stein <cgs@image.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
-"PO-Revision-Date: 2018-10-08 06:49+0000\n"
-"Last-Translator: Jonathan Stein <cgs@image.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1247,7 +1248,7 @@ msgstr "Download xls"
 #: code:addons/web/static/src/xml/base.xml:1556
 #, python-format
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: web
 #. openerp-web
@@ -1641,7 +1642,7 @@ msgstr "Sortér efter: %s"
 #. module: web
 #: model:ir.model,name:web.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po
index d10e0618f04..c9419478555 100644
--- a/addons/web/i18n/en_GB.po
+++ b/addons/web/i18n/en_GB.po
@@ -1520,13 +1520,6 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:329
-#, fuzzy, python-format
-msgid "No value found for the field %s for value %s"
-msgstr "No value found for the field  for value  %s"
-
-#. module: web
-#. openerp-web
 #: code:addons/web/static/src/js/framework/utils.js:144
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
diff --git a/addons/web/i18n/es_AR.po b/addons/web/i18n/es_AR.po
index 4e28ef7be45..fbab2c0e3da 100644
--- a/addons/web/i18n/es_AR.po
+++ b/addons/web/i18n/es_AR.po
@@ -1533,13 +1533,6 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:329
-#, fuzzy, python-format
-msgid "No value found for the field %s for value %s"
-msgstr "No se ha encontrado ningún valor para el valor del campo "
-
-#. module: web
-#. openerp-web
 #: code:addons/web/static/src/js/framework/utils.js:144
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po
index d38d22b3403..c96276dc87a 100644
--- a/addons/web/i18n/es_EC.po
+++ b/addons/web/i18n/es_EC.po
@@ -1531,13 +1531,6 @@ msgstr "Sin registro seleccionado"
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:329
-#, fuzzy, python-format
-msgid "No value found for the field %s for value %s"
-msgstr "No se encuentran valores para el campo"
-
-#. module: web
-#. openerp-web
 #: code:addons/web/static/src/js/framework/utils.js:144
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po
index ef7ea2d7fe5..c246d4285d4 100644
--- a/addons/web/i18n/it.po
+++ b/addons/web/i18n/it.po
@@ -3,11 +3,9 @@
 # * web
 # 
 # Translators:
-# Cécile Collart <cco@odoo.com>, 2018
 # Cesare Cugnasco <cesare.cugnasco@gmail.com>, 2018
 # Luca Tralli, 2018
 # Pietro Della Notte <pdellanotte@gmail.com>, 2018
-# efraimbiffi <eab@odoo.com>, 2018
 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018
 # Luigi Di Naro <gigidn@gmail.com>, 2018
 # Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018
@@ -180,7 +178,7 @@ msgstr "'%s' non è un intero corretto"
 #: code:addons/web/static/src/js/fields/field_utils.js:548
 #, python-format
 msgid "'%s' is not a correct monetary field"
-msgstr ""
+msgstr "\"%s\" non è un campo monetario corretto"
 
 #. module: web
 #. openerp-web
@@ -230,7 +228,7 @@ msgstr "(senza etichetta)"
 #: code:addons/web/static/src/js/fields/field_utils.js:283
 #, python-format
 msgid "1 record"
-msgstr ""
+msgstr "1 record"
 
 #. module: web
 #. openerp-web
@@ -344,7 +342,7 @@ msgstr ""
 #: code:addons/web/static/src/xml/base.xml:1126
 #, python-format
 msgid "Add Custom Filter"
-msgstr "Aggiungi filtro"
+msgstr "Aggiungi filtro personalizzato"
 
 #. module: web
 #. openerp-web
@@ -358,14 +356,14 @@ msgstr "Aggiungi gruppo personalizzato"
 #: code:addons/web/static/src/xml/kanban.xml:49
 #, python-format
 msgid "Add a Column"
-msgstr ""
+msgstr "Aggiungi una colonna"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1130
 #, python-format
 msgid "Add a condition"
-msgstr "Aggiungi un filtro"
+msgstr "Aggiungi una condizione"
 
 #. module: web
 #. openerp-web
@@ -660,6 +658,8 @@ msgid ""
 "Binary fields can not be exported to Excel unless their content is "
 "base64-encoded. That does not seem to be the case for %s."
 msgstr ""
+"Impossibile esportare %s. I campi binari devono avere il contenuto "
+"codificato in base64 per essere esportati in Excel."
 
 #. module: web
 #. openerp-web
@@ -1167,7 +1167,7 @@ msgstr "Descrizione"
 #: code:addons/web/static/src/xml/report.xml:18
 #, python-format
 msgid "Discard"
-msgstr "Annulla"
+msgstr "Abbandona"
 
 #. module: web
 #. openerp-web
@@ -1349,7 +1349,7 @@ msgstr "Errore, password non modificata."
 #: code:addons/web/static/src/xml/kanban.xml:62
 #, python-format
 msgid "Esc to discard"
-msgstr ""
+msgstr "Esc per abbandonare"
 
 #. module: web
 #. openerp-web
@@ -1391,14 +1391,14 @@ msgstr ""
 #: code:addons/web/static/src/js/views/list/list_controller.js:149
 #, python-format
 msgid "Export"
-msgstr "Esportazione"
+msgstr "Esporta"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/data_export.js:209
 #, python-format
 msgid "Export Data"
-msgstr "Esporta dati"
+msgstr "Esportazione dati"
 
 #. module: web
 #. openerp-web
@@ -1671,28 +1671,28 @@ msgstr "Premere INVIO per"
 #: code:addons/web/static/src/xml/base.xml:431
 #, python-format
 msgid "Hit ENTER to CREATE"
-msgstr "Premere INVIO per CREA"
+msgstr "Premere INVIO per CREARE"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:423
 #, python-format
 msgid "Hit ENTER to SAVE"
-msgstr "Premere INVIO per SALVA"
+msgstr "Premere INVIO per SALVARE"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:424
 #, python-format
 msgid "Hit ESCAPE to DISCARD"
-msgstr ""
+msgstr "Premere ESCAPE per ABBANDONARE"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/colorpicker.xml:41
 #, python-format
 msgid "Hue"
-msgstr ""
+msgstr "Tonalità"
 
 #. module: web
 #. openerp-web
@@ -1772,7 +1772,7 @@ msgstr ""
 #: code:addons/web/static/src/js/tools/debug_manager.js:209
 #, python-format
 msgid "JS Mobile Tests"
-msgstr ""
+msgstr "Test JS per cellulare"
 
 #. module: web
 #. openerp-web
@@ -1900,7 +1900,7 @@ msgstr "Blu chiaro"
 #: code:addons/web/static/src/xml/colorpicker.xml:49
 #, python-format
 msgid "Lightness %"
-msgstr ""
+msgstr "Luminosità %"
 
 #. module: web
 #. openerp-web
@@ -2134,14 +2134,14 @@ msgstr "Altro"
 #: code:addons/web/static/src/xml/base.xml:1415
 #, python-format
 msgid "Move Down"
-msgstr "Muovi Giù"
+msgstr "Sposta in basso"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1414
 #, python-format
 msgid "Move Up"
-msgstr "Muovi Su"
+msgstr "Sposta in alto"
 
 #. module: web
 #. openerp-web
@@ -2403,7 +2403,7 @@ msgstr "Solo tu"
 #: code:addons/web/static/src/xml/colorpicker.xml:55
 #, python-format
 msgid "Opacity %"
-msgstr ""
+msgstr "Opacità %"
 
 #. module: web
 #. openerp-web
@@ -2550,14 +2550,14 @@ msgstr "pivot"
 #: code:addons/web/static/src/js/views/list/list_renderer.js:352
 #, python-format
 msgid "Please click on the \"save\" button first."
-msgstr ""
+msgstr "Prima fare clic sul pulsante \"Salva\"."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/data_export.js:177
 #, python-format
 msgid "Please enter save field list name"
-msgstr "Inserire il nome per l'elenco salvato"
+msgstr "Inserire il nome dell'elenco campi da salvare"
 
 #. module: web
 #. openerp-web
@@ -2571,7 +2571,7 @@ msgstr "Selezionare i campi da esportare..."
 #: code:addons/web/static/src/js/widgets/data_export.js:464
 #, python-format
 msgid "Please select fields to save export list..."
-msgstr "Selezionare l'elenco dei campi da esportare..."
+msgstr "Selezionare i campi da salvare nell'elenco di esportazione..."
 
 #. module: web
 #. openerp-web
@@ -2793,21 +2793,21 @@ msgstr "Ripristina"
 #: code:addons/web/static/src/xml/base.xml:240
 #, python-format
 msgid "Run Click Everywhere Test"
-msgstr "Esegui prova \"Fare clic ovunque\""
+msgstr "Esegui test \"Fare clic ovunque\""
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:239
 #, python-format
 msgid "Run JS Mobile Tests"
-msgstr "Esegui prove JS per dispositivo mobile"
+msgstr "Esegui test JS per dispositivo mobile"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:238
 #, python-format
 msgid "Run JS Tests"
-msgstr "Esegui prove JS"
+msgstr "Esegui test JS"
 
 #. module: web
 #. openerp-web
@@ -2877,14 +2877,14 @@ msgstr "Salva un record"
 #: code:addons/web/static/src/xml/base.xml:1443
 #, python-format
 msgid "Save as:"
-msgstr "Salva come:"
+msgstr "Salvare come: "
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/xml/base.xml:1358
 #, python-format
 msgid "Save current search"
-msgstr "Salvare la ricerca corrente"
+msgstr "Salva la ricerca corrente"
 
 #. module: web
 #. openerp-web
@@ -2898,7 +2898,7 @@ msgstr "Salva predefinito"
 #: code:addons/web/static/src/xml/base.xml:1419
 #, python-format
 msgid "Save fields list"
-msgstr "Salva l'elenco dei campi"
+msgstr "Salva elenco campi"
 
 #. module: web
 #. openerp-web
@@ -2942,7 +2942,7 @@ msgstr "Cerca ancora..."
 #: code:addons/web/static/src/xml/base.xml:1231
 #, python-format
 msgid "Search..."
-msgstr "Cerca..."
+msgstr "Ricerca..."
 
 #. module: web
 #. openerp-web
@@ -3113,7 +3113,7 @@ msgstr "Accendi"
 #: code:addons/web/static/src/js/widgets/domain_selector.js:583
 #, python-format
 msgid "Syntax error"
-msgstr ""
+msgstr "Errore di sintassi"
 
 #. module: web
 #. openerp-web
@@ -3206,7 +3206,8 @@ msgid ""
 "The record has been modified, your changes will be discarded. Do you want to"
 " proceed?"
 msgstr ""
-"Il documento è stato modificato, le modifiche verranno eliminate. Procedere?"
+"Il documento è stato modificato, verranno abbandonate le modifiche. "
+"Procedere?"
 
 #. module: web
 #. openerp-web
@@ -3233,6 +3234,8 @@ msgid ""
 "There are too many rows (%s rows, limit: 65535) to export as Excel 97-2003 "
 "(.xls) format. Consider splitting the export."
 msgstr ""
+"Impossibile esportare nel formato Excel 97-2003 (.xls) (%s righe, limite: "
+"65535). Valutare di suddividere l'esportazione."
 
 #. module: web
 #. openerp-web
@@ -3482,7 +3485,7 @@ msgstr "Senza titolo"
 #: code:addons/web/static/src/xml/base.xml:1393
 #, python-format
 msgid "Update data (import-compatible export)"
-msgstr ""
+msgstr "Aggiornare i dati (compatibile con l'importazione)"
 
 #. module: web
 #. openerp-web
@@ -3496,7 +3499,7 @@ msgstr "Aggiorna adesso"
 #: code:addons/web/static/src/xml/base.xml:1577
 #, python-format
 msgid "Upgrade to enterprise"
-msgstr ""
+msgstr "Avanza a Enterprise"
 
 #. module: web
 #. openerp-web
@@ -3542,7 +3545,7 @@ msgstr "Utilizzare come predefinita"
 #: code:addons/web/static/src/xml/base.xml:1387
 #, python-format
 msgid "Use data in a spreadsheet (export all data)"
-msgstr ""
+msgstr "Usare i dati in un foglio di calcolo (esportare tutti i dati)"
 
 #. module: web
 #. openerp-web
@@ -3584,14 +3587,14 @@ msgstr "Visualizza metadati"
 #: code:addons/web/static/src/xml/base.xml:606
 #, python-format
 msgid "Warning"
-msgstr "Avviso"
+msgstr "Attenzione"
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/widgets/attach_document.js:87
 #, python-format
 msgid "Warning : You have to save first before attaching a file."
-msgstr ""
+msgstr "Attenzione: prima di allegare un file è necessario salvare."
 
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.benchmark_suite
@@ -3601,12 +3604,12 @@ msgstr ""
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.qunit_mobile_suite
 msgid "Web Mobile Tests"
-msgstr ""
+msgstr "Test web per dispositivo mobile"
 
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.qunit_suite
 msgid "Web Tests"
-msgstr ""
+msgstr "Test web"
 
 #. module: web
 #: model_terms:ir.ui.view,arch_db:web.external_layout_boxed
@@ -3634,7 +3637,7 @@ msgstr "Ben fatto!"
 #: code:addons/web/static/src/xml/base.xml:1383
 #, python-format
 msgid "What do you want to do?"
-msgstr "Cosa vuoi fare?"
+msgstr "Cosa si intende fare?"
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po
index 6fe04cbc033..6f55d6b2662 100644
--- a/addons/web/i18n/mk.po
+++ b/addons/web/i18n/mk.po
@@ -1532,13 +1532,6 @@ msgstr ""
 
 #. module: web
 #. openerp-web
-#: code:addons/web/static/src/js/views/form_relational_widgets.js:329
-#, fuzzy, python-format
-msgid "No value found for the field %s for value %s"
-msgstr "Вредноста не е пронајдена во полето за вредност"
-
-#. module: web
-#. openerp-web
 #: code:addons/web/static/src/js/framework/utils.js:144
 #, python-format
 msgid "Node [%s] is not a JSONified XML node"
diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po
index 484e8fd15a1..c1aa4a4d92c 100644
--- a/addons/web/i18n/zh_CN.po
+++ b/addons/web/i18n/zh_CN.po
@@ -1241,7 +1241,7 @@ msgstr "域名"
 #: code:addons/web/static/src/js/core/misc.js:16
 #, python-format
 msgid "Don't leave yet,<br />it's still loading..."
-msgstr "请不要离开，<br />它还在加载中..."
+msgstr "请不要离开，<br />它仍在加载..."
 
 #. module: web
 #. openerp-web
@@ -3068,14 +3068,14 @@ msgstr "特殊："
 #: code:addons/web/static/src/js/core/misc.js:14
 #, python-format
 msgid "Still loading..."
-msgstr "大菜烹饪中..."
+msgstr "仍在加载..."
 
 #. module: web
 #. openerp-web
 #: code:addons/web/static/src/js/core/misc.js:15
 #, python-format
 msgid "Still loading...<br />Please be patient."
-msgstr "大菜烹饪中...<br />稍安勿躁。"
+msgstr "仍在加载...<br />请耐心等待。"
 
 #. module: web
 #. openerp-web
@@ -3117,7 +3117,7 @@ msgstr "语法错误"
 #: code:addons/web/static/src/js/core/misc.js:18
 #, python-format
 msgid "Take a minute to get a coffee,<br />because it's loading..."
-msgstr "稍安勿躁,<br />大菜烹饪中..."
+msgstr "花一分钟去喝杯咖啡,<br />因为它在加载..."
 
 #. module: web
 #. openerp-web
@@ -3725,7 +3725,7 @@ msgstr "你不能让任何密码为空。"
 #, python-format
 msgid ""
 "You may not believe it,<br />but the application is actually loading..."
-msgstr "稍安勿躁，<br />大菜烹饪中...."
+msgstr "也许你不相信，<br />但是这个应用真的还在加载...."
 
 #. module: web
 #. openerp-web
diff --git a/addons/web/static/lib/tempusdominus/tempusdominus.js b/addons/web/static/lib/tempusdominus/tempusdominus.js
index 63daabbd6f7..a5dac48ac3a 100644
--- a/addons/web/static/lib/tempusdominus/tempusdominus.js
+++ b/addons/web/static/lib/tempusdominus/tempusdominus.js
@@ -563,10 +563,10 @@ var DateTimePicker = function ($, moment) {
         DateTimePicker.prototype._notifyEvent = function _notifyEvent(e) {
             // /!\ ODOO FIX: these next conditions have been modified by odoo
             // FIXME should write a test about the tricky case this handles
-            if (!e.date && !e.oldDate) {
-                return;
-            }
             if (e.type === DateTimePicker.Event.CHANGE) {
+                if (!e.date && !e.oldDate) {
+                    return;
+                }
                 // check _isUTC flag to ensure that we are not comparing apples and oranges
                 var bothUTC = e.date && e.oldDate && e.date._isUTC === e.oldDate._isUTC;
                 if (bothUTC && e.date.isSame(e.oldDate)) {
diff --git a/addons/web/static/src/js/core/dom.js b/addons/web/static/src/js/core/dom.js
index 2a961596862..848e406c4b2 100644
--- a/addons/web/static/src/js/core/dom.js
+++ b/addons/web/static/src/js/core/dom.js
@@ -20,6 +20,7 @@ odoo.define('web.dom', function (require) {
  * something happens in the DOM.
  */
 
+var concurrency = require('web.concurrency');
 var config = require('web.config');
 var core = require('web.core');
 var _t = core._t;
@@ -40,7 +41,9 @@ function _notify(content, callbacks) {
     core.bus.trigger('DOM_updated', content);
 }
 
-return {
+var dom = {
+    DEBOUNCE: 400,
+
     /**
      * Appends content in a jQuery object and optionnally triggers an event
      *
@@ -209,6 +212,91 @@ return {
         return position;
     },
     /**
+     * Protects a function which is to be used as a handler by preventing its
+     * execution for the duration of a previous call to it (including async
+     * parts of that call).
+     *
+     * Limitation: as the handler is ignored during async actions,
+     * the 'preventDefault' or 'stopPropagation' calls it may want to do
+     * will be ignored too. Using the 'preventDefault' and 'stopPropagation'
+     * arguments solves that problem.
+     *
+     * @param {function} fct
+     *      The function which is to be used as a handler. If a promise
+     *      is returned, it is used to determine when the handler's action is
+     *      finished. Otherwise, the return is used as jQuery uses it.
+     * @param {function|boolean} preventDefault
+     * @param {function|boolean} stopPropagation
+     */
+    makeAsyncHandler: function (fct, preventDefault, stopPropagation) {
+        // Create a deferred indicating if a previous call to this handler is
+        // still pending.
+        var def = $.when();
+
+        return function (ev) {
+            if (preventDefault === true || preventDefault && preventDefault()) {
+                ev.preventDefault();
+            }
+            if (stopPropagation === true || stopPropagation && stopPropagation()) {
+                ev.stopPropagation();
+            }
+
+            if (def.state() === 'pending') {
+                // If a previous call to this handler is still pending, ignore
+                // the new call.
+                return;
+            }
+            var result = fct.apply(this, arguments);
+            def = $.when(result);
+            return result;
+        };
+    },
+    /**
+     * Creates a debounced version of a function to be used as a button click
+     * handler. Also improves the handler to disable the button for the time of
+     * the debounce and/or the time of the async actions it performs.
+     *
+     * Limitation: if two handlers are put on the same button, the button will
+     * become enabled again once any handler's action finishes (multiple click
+     * handlers should however not be binded to the same button).
+     *
+     * @param {function} fct
+     *      The function which is to be used as a button click handler. If a
+     *      promise is returned, it is used to determine when the button can be
+     *      re-enabled. Otherwise, the return is used as jQuery uses it.
+     */
+    makeButtonHandler: function (fct) {
+        // Fallback: if the final handler is not binded to a button, at least
+        // make it an async handler (also handles the case where some events
+        // might ignore the disabled state of the button).
+        fct = dom.makeAsyncHandler(fct);
+
+        return function (ev) {
+            var result = fct.apply(this, arguments);
+
+            var $button = $(ev.target).closest('.btn');
+            if (!$button.length) {
+                return result;
+            }
+
+            // Disable the button for the duration of the handler's action
+            // or at least for the duration of the click debounce. This makes
+            // a 'real' debounce creation useless. Also, during the debouncing
+            // part, the button is disabled without any visual effect.
+            $button.addClass('o_debounce_disabled');
+            $.when(dom.DEBOUNCE && concurrency.delay(dom.DEBOUNCE)).then(function () {
+                $button.addClass('disabled').prop('disabled', true);
+                $button.removeClass('o_debounce_disabled');
+
+                return $.when(result).always(function () {
+                    $button.removeClass('disabled').prop('disabled', false);
+                });
+            });
+
+            return result;
+        };
+    },
+    /**
      * Prepends content in a jQuery object and optionnally triggers an event
      *
      * @param {jQuery} [$target] the node where content will be prepended
@@ -460,4 +548,5 @@ return {
         }
     },
 };
+return dom;
 });
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index 53fbf99a8cd..aac91081c3c 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -2409,6 +2409,18 @@ var FieldProgressBar = AbstractField.extend({
             this.$('.o_progressbar_value').focus().select();
         }
     },
+    /**
+     * The progress bar has more than one field/value to deal with
+     * i.e. max_value
+     *
+     * @override
+     * @private
+     */
+    _reset: function () {
+        this._super.apply(this, arguments);
+        var new_max_value = this.recordData[this.nodeOptions.max_value];
+        this.max_value =  new_max_value !== undefined ? new_max_value : this.max_value;
+    },
     isSet: function () {
         return true;
     },
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index d9e15dab302..60b0275c8c8 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -564,6 +564,7 @@ var FieldMany2One = AbstractField.extend({
             initial_ids: ids ? _.map(ids, function (x) { return x[0]; }) : undefined,
             initial_view: view,
             disable_multiple_selection: true,
+            no_create: !self.can_create,
             on_selected: function (records) {
                 self.reinitialize(records[0]);
                 self.activate();
diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index 8f9f167c69f..024216b5619 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -181,6 +181,7 @@ var AbstractView = Class.extend({
             modelName: params.modelName,
             res_id: params.currentId,
             res_ids: params.ids,
+            orderedBy: params.context ? params.context.orderedBy : [],
         };
         if (params.modelName) {
             this.loadParams.modelName = params.modelName;
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 345b76856b6..53aa2e56c5a 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -3674,7 +3674,7 @@ var BasicModel = AbstractModel.extend({
             model: params.modelName,
             offset: params.offset || (type === 'record' ? _.indexOf(res_ids, res_id) : 0),
             openGroupByDefault: params.openGroupByDefault,
-            orderedBy: params.orderedBy || (params.context && params.context.orderedBy) || [],
+            orderedBy: params.orderedBy || [],
             orderedResIDs: params.orderedResIDs,
             parentID: params.parentID,
             rawContext: params.rawContext,
@@ -4608,7 +4608,7 @@ var BasicModel = AbstractModel.extend({
                 if (orderData1 > orderData2) {
                     return order.asc ? 1 : -1;
                 }
-                return compareRecords(record1ID, record2ID, level + 1);
+                return compareRecords(resId1, resId2, level + 1);
             };
             utils.stableSort(list.res_ids, compareRecords);
         }
diff --git a/addons/web/static/src/js/widgets/date_picker.js b/addons/web/static/src/js/widgets/date_picker.js
index 7ba3010a3b5..b677abe377a 100644
--- a/addons/web/static/src/js/widgets/date_picker.js
+++ b/addons/web/static/src/js/widgets/date_picker.js
@@ -15,6 +15,7 @@ var DateWidget = Widget.extend({
         'change.datetimepicker': 'changeDatetime',
         'change .o_datepicker_input': 'changeDatetime',
         'input input': '_onInput',
+        'show.datetimepicker': '_onDateTimePickerShow',
     },
     /**
      * @override
@@ -226,6 +227,18 @@ var DateWidget = Widget.extend({
     //--------------------------------------------------------------------------
 
     /**
+     * Reacts to the datetimepicker being shown
+     * Could set/verify our widget value
+     * And subsequently update the datetimepicker
+     *
+     * @private
+     */
+    _onDateTimePickerShow: function () {
+        if (this.$input.val().length !== 0 && this.isValid()) {
+            this.$input.select();
+        }
+    },
+    /**
      * Prevents 'input' events triggered by the library to bubble up, as they
      * might have unwanted effects (like triggering 'field_changed' events in
      * the context of field widgets)
diff --git a/addons/web/static/src/js/widgets/dropdown_menu.js b/addons/web/static/src/js/widgets/dropdown_menu.js
index fdab9b82ebf..e92c714d838 100644
--- a/addons/web/static/src/js/widgets/dropdown_menu.js
+++ b/addons/web/static/src/js/widgets/dropdown_menu.js
@@ -15,6 +15,7 @@ var DropdownMenu = Widget.extend({
         'click .o_item_option': '_onOptionClick',
         'click span.o_trash_button': '_onTrashClick',
         'hidden.bs.dropdown': '_onBootstrapClose',
+        'click .dropdown-item-text': '_onDropDownItemTextClick',
     },
 
     /**
@@ -200,6 +201,15 @@ var DropdownMenu = Widget.extend({
         this._renderMenuItems();
     },
     /**
+     * Reacts to click on bootstrap's dropdown-item-text
+     * Protects against Bootstrap dropdown close from inside click
+     *
+     * @private
+     */
+    _onDropDownItemTextClick: function (ev) {
+        ev.stopPropagation();
+    },
+    /**
      * @private
      * @param {MouseEvent} event
      */
diff --git a/addons/web/static/src/scss/ui.scss b/addons/web/static/src/scss/ui.scss
index 46995aa9ba1..44d639805be 100644
--- a/addons/web/static/src/scss/ui.scss
+++ b/addons/web/static/src/scss/ui.scss
@@ -78,3 +78,8 @@
         outline: 20px solid fade-out($o-brand-primary, 1.0);
     }
 }
+
+// Declare a similar class as 'disabled' but with no visual effect
+.o_debounce_disabled {
+    pointer-events: none;
+}
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 807b2ebadca..f176b4e0ab9 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -2933,6 +2933,38 @@ QUnit.module('basic_fields', {
         form.destroy();
     });
 
+    QUnit.test('field date should select its content onclick when there is one', function (assert) {
+        assert.expect(2);
+        var done = assert.async();
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch:'<form string="Partners">' +
+                    '<field name="display_name" /> ' + // Do not focus on the date field right away
+                    '<field name="date" />' +
+                '</form>',
+            res_id: 1,
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        form.$el.on({
+            'show.datetimepicker': function () {
+                assert.ok($('.bootstrap-datetimepicker-widget').is(':visible'),
+                    'bootstrap-datetimepicker is visible');
+                assert.strictEqual(window.getSelection().toString(), "02/03/2017",
+                    'The whole input of the date field should have been selected');
+                done();
+            }
+        });
+        form.$('.o_input[name="date"]').mouseenter().trigger('focus');
+
+        form.destroy();
+    });
+
     QUnit.module('FieldDatetime');
 
     QUnit.test('datetime field in form view', function (assert) {
@@ -5379,6 +5411,48 @@ QUnit.module('basic_fields', {
 
         form.destroy();
     });
+
+    QUnit.module('FieldProgressBar');
+
+    QUnit.test('Field ProgressBar: max_value should update', function (assert) {
+        assert.expect(2);
+
+        this.data.partner.records = this.data.partner.records.slice(0,1);
+        this.data.partner.records[0].qux = 2;
+
+        this.data.partner.onchanges = {
+            display_name: function (obj) {
+                obj.int_field = 999;
+                obj.qux = 5;
+            }
+        };
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                    '<field name="display_name" />' +
+                    '<field name="qux" invisible="1" />' +
+                    '<field name="int_field" widget="progressbar" options="{\'current_value\': \'int_field\', \'max_value\': \'qux\'}" />' +
+                '</form>',
+            res_id: 1,
+            viewOptions: {
+                mode: 'edit',
+            },
+        });
+
+        assert.strictEqual(form.$('.o_progressbar_value').text(), '10 / 2',
+            'The initial value of the progress bar should be correct');
+
+        // trigger the onchange
+        form.$('.o_input[name=display_name]').val('new name').trigger('input');
+
+        assert.strictEqual(form.$('.o_progressbar_value').text(), '999 / 5',
+            'The value of the progress bar should be correct after the update');
+
+        form.destroy();
+    });
 });
 });
 });
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index 49af80784c9..8d23dafe4f4 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -150,6 +150,83 @@ QUnit.module('relational_fields', {
     }
 }, function () {
 
+    QUnit.test('x2many default_order multiple fields', function (assert) {
+        assert.expect(7);
+
+        this.data.partner.records = [
+            {int_field: 10, id: 1, display_name: "record1"},
+            {int_field: 12, id: 2, display_name: "record2"},
+            {int_field: 11, id: 3, display_name: "record3"},
+            {int_field: 12, id: 4, display_name: "record4"},
+            {int_field: 10, id: 5, display_name: "record5"},
+            {int_field: 10, id: 6, display_name: "record6"},
+            {int_field: 11, id: 7, display_name: "record7"},
+        ];
+
+        this.data.partner.records[0].p = [1, 7, 4, 5, 2, 6, 3];
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                        '<field name="p" >' +
+                            '<tree default_order="int_field,id">' +
+                                '<field name="id"/>' +
+                                '<field name="int_field"/>' +
+                            '</tree>' +
+                        '</field>' +
+                '</form>',
+            res_id: 1,
+        });
+
+        var $recordList = form.$('.o_field_x2many_list .o_data_row');
+        var expectedOrderId = ['1', '5', '6', '3', '7', '2', '4'];
+
+        _.each($recordList, function(record, index) {
+            var $record = $(record);
+            assert.strictEqual($record.find('.o_data_cell').eq(0).text(), expectedOrderId[index],
+                'The record should be the right place. Index: ' + index);
+        });
+
+        form.destroy();
+    });
+
+
+        form.destroy();
+    });
+
+    QUnit.test('one2many from a model that has been sorted', function (assert) {
+        assert.expect(1);
+
+        /* On a standard list view, sort your records by a field
+         * Click on a record which contains a x2m with multiple records in it
+         * The x2m shouldn't take the orderedBy of the parent record (the one on the form)
+         */
+
+        this.data.partner.records[0].turtles = [3, 2];
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch:'<form string="Partners">' +
+                    '<field name="turtles">' +
+                        '<tree>' +
+                            '<field name="turtle_foo"/>' +
+                        '</tree>' +
+                    '</field>' +
+                '</form>',
+            res_id: 1,
+            context: {
+                orderedBy: [{
+                    name: 'foo',
+                    asc: false,
+                }]
+            },
+        });
+
+        assert.strictEqual(form.$('.o_field_one2many[name=turtles] tbody').text().trim(), "kawablip",
+            'The o2m should not have been sorted.');
     QUnit.test('onchange on unloaded record clearing posterious change', function (assert) {
         // when we got onchange result for fields of record that were not
         // already available because they were in a inline view not already
diff --git a/addons/web/static/tests/helpers/test_utils_mock.js b/addons/web/static/tests/helpers/test_utils_mock.js
index 769c179472a..3eaaae0a46f 100644
--- a/addons/web/static/tests/helpers/test_utils_mock.js
+++ b/addons/web/static/tests/helpers/test_utils_mock.js
@@ -13,6 +13,7 @@ odoo.define('web.test_utils_mock', function (require) {
 var basic_fields = require('web.basic_fields');
 var config = require('web.config');
 var core = require('web.core');
+var dom = require('web.dom');
 var MockServer = require('web.MockServer');
 var session = require('web.session');
 
@@ -154,6 +155,8 @@ function addMockEnvironment(widget, params) {
     // make sure the debounce value for input fields is set to 0
     var initialDebounceValue = DebouncedField.prototype.DEBOUNCE;
     DebouncedField.prototype.DEBOUNCE = params.fieldDebounce || 0;
+    var initialDOMDebounceValue = dom.DEBOUNCE;
+    dom.DEBOUNCE = 0;
     var initialSession, initialConfig, initialParameters, initialDebounce, initialThrottle;
     initialSession = _.extend({}, session);
     session.getTZOffset = function () {
@@ -196,6 +199,7 @@ function addMockEnvironment(widget, params) {
         core.bus.trigger('clear_cache');
 
         DebouncedField.prototype.DEBOUNCE = initialDebounceValue;
+        dom.DEBOUNCE = initialDOMDebounceValue;
         if (params.debounce === false) {
             _.debounce = initialDebounce;
         }
diff --git a/addons/web/static/tests/views/form_benchmarks.js b/addons/web/static/tests/views/form_benchmarks.js
index c6127f847ec..efd12741d66 100644
--- a/addons/web/static/tests/views/form_benchmarks.js
+++ b/addons/web/static/tests/views/form_benchmarks.js
@@ -1,4 +1,4 @@
-odoo.define('web.list_benchmarks', function (require) {
+odoo.define('web.form_benchmarks', function (require) {
 "use strict";
 
 var FormView = require('web.FormView');
@@ -38,7 +38,6 @@ QUnit.module('Form View', {
         this.run = function (assert, done, cb) {
             var data = this.data;
             var arch = this.arch;
-            var viewOptions = this.viewOptions;
             new Benchmark.Suite({})
                 .add('form', function () {
                     var list = createView({
@@ -76,13 +75,13 @@ QUnit.module('Form View', {
             this.data.foo.records[0].many2many.push(i);
         }
         this.arch =
-                '<form string="Partners">'
-                    '<field name="many2many">'
-                        '<tree editable="top" limit="250">'
-                            '<field name="char"/>'
-                            '<field name="many2many" widget="many2many_tags" attrs="{\'readonly\': [(\'char\', \'==\', \'toto\')]}"/>'
-                        '</tree>'
-                    '</field>'
+                '<form string="Partners">' +
+                    '<field name="many2many">' +
+                        '<tree editable="top" limit="250">' +
+                            '<field name="char"/>' +
+                            '<field name="many2many" widget="many2many_tags" attrs="{\'readonly\': [(\'char\', \'==\', \'toto\')]}"/>' +
+                        '</tree>' +
+                    '</field>' +
                 '</form>';
         this.run(assert, done, function (form) {
             testUtils.form.clickEdit(form);
diff --git a/addons/web/static/tests/views/search_view_tests.js b/addons/web/static/tests/views/search_view_tests.js
index e64ae72a9f4..0dbddbe1fae 100644
--- a/addons/web/static/tests/views/search_view_tests.js
+++ b/addons/web/static/tests/views/search_view_tests.js
@@ -975,5 +975,66 @@ QUnit.module('Search View', {
         form.destroy();
     });
 
+    QUnit.test('Customizing filter does not close the filter dropdown', function (assert) {
+        assert.expect(4);
+        var self = this;
+
+        _.each(this.data.partner.records.slice(), function (rec) {
+            var copy = _.defaults({}, rec, {id: rec.id + 10 });
+            self.data.partner.records.push(copy);
+        });
+
+        this.data.partner.fields.date_field.searchable = true;
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form string="Partners">' +
+                    '<field name="bar"/>' +
+                '</form>',
+            viewOptions: {
+                mode: 'edit',
+            },
+            archs: {
+                'partner,false,list': '<tree><field name="display_name"/></tree>',
+                'partner,false,search': '<search><field name="date_field"/></search>',
+            },
+            res_id: 1,
+        });
+
+        form.$('.o_input').click();
+        $('.ui-autocomplete .ui-menu-item:contains(Search More)').mouseenter().click();
+
+        var $modal = $('.modal-dialog.modal-lg');
+        assert.strictEqual($modal.length, 1, 'Modal Opened');
+
+        $modal.find('.o_search_options button:contains(Filters)').click();
+
+        var $filterDropDown = $modal.find('.o_dropdown_menu.show');
+
+        $filterDropDown.find('button:contains(Add Custom Filter)').click();
+
+        assert.ok($filterDropDown.find('button:contains(Add Custom Filter)').hasClass('o_open_menu'),
+            'The right dropdown is open');
+
+        var $filterInputs = $filterDropDown.find('.o_input');
+
+        assert.strictEqual($filterInputs.length, 3,
+            'The custom filter builder has 3 elements');
+
+        // We really are interested in the click event
+        // We do it twice on each input to make sure
+        // the parent dropdown doesn't react to any of it
+        _.each($filterInputs, function (input) {
+            var $input = $(input);
+            $input.click();
+            $input.click();
+        });
+
+        assert.ok($filterDropDown.is(':visible'));
+
+        form.destroy();
+    });
+
 });
 });
diff --git a/addons/web/static/tests/views/view_dialogs_tests.js b/addons/web/static/tests/views/view_dialogs_tests.js
index 8898e520618..023a977ad56 100644
--- a/addons/web/static/tests/views/view_dialogs_tests.js
+++ b/addons/web/static/tests/views/view_dialogs_tests.js
@@ -478,6 +478,66 @@ QUnit.module('Views', {
         testUtils.mock.unpatch(ListController);
         parent.destroy();
     });
+
+    QUnit.test('propagate can_create onto the search popup o2m', function (assert) {
+        assert.expect(3);
+
+        this.data.instrument.records = [
+            {id: 1, name: 'Tromblon1'},
+            {id: 2, name: 'Tromblon2'},
+            {id: 3, name: 'Tromblon3'},
+            {id: 4, name: 'Tromblon4'},
+            {id: 5, name: 'Tromblon5'},
+            {id: 6, name: 'Tromblon6'},
+            {id: 7, name: 'Tromblon7'},
+            {id: 8, name: 'Tromblon8'},
+        ];
+
+        var form = createView({
+            View: FormView,
+            model: 'partner',
+            data: this.data,
+            arch: '<form>' +
+                     '<field name="name"/>' +
+                     '<field name="instrument" can_create="false"/>' +
+                  '</form>',
+            res_id: 1,
+            archs: {
+                'instrument,false,list': '<tree>'+
+                                                '<field name="name"/>'+
+                                            '</tree>',
+                'instrument,false,search': '<search>'+
+                                                '<field name="name"/>'+
+                                            '</search>',
+            },
+            viewOptions: {
+                mode: 'edit',
+            },
+
+            mockRPC: function(route, args) {
+                if (args.method === 'get_formview_id') {
+                    return $.when(false);
+                }
+                return this._super(route, args);
+            },
+        });
+
+        form.$('.o_field_widget[name="instrument"] .o_input').click();
+
+        assert.notOk($('.ui-autocomplete a:contains(Create and Edit)').length,
+            'Create and edit not present in dropdown');
+
+        $('.ui-autocomplete a:contains(Search More)').trigger('mouseenter').trigger('click');
+
+        var $modal = $('.modal-dialog.modal-lg');
+
+        assert.strictEqual($modal.length, 1, 'Modal present');
+
+        assert.strictEqual($modal.find('.modal-footer button').text(), "Cancel",
+            'Only the cancel button is present in modal');
+
+        form.destroy();
+    });
 });
 
 });
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 1ce0a83f63b..10d887fe8e1 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -687,6 +687,16 @@
                         display: inherit;
                     }
                 </style>
+
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_create.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_dom.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_fields.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_form.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_graph.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_kanban.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_mock.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_modal.js"></script>
+                <script type="text/javascript" src="/web/static/tests/helpers/test_utils_pivot.js"></script>
                 <script type="text/javascript" src="/web/static/tests/helpers/test_utils.js"></script>
                 <script type="text/javascript" src="/web/static/tests/helpers/mock_server.js"></script>
 
diff --git a/addons/web_editor/i18n/da.po b/addons/web_editor/i18n/da.po
index b7855c04a8c..17dca2d6a08 100644
--- a/addons/web_editor/i18n/da.po
+++ b/addons/web_editor/i18n/da.po
@@ -3,25 +3,26 @@
 # * web_editor
 # 
 # Translators:
-# Martin Trigaux, 2018
 # Hans Henrik Gabelgaard <hhg@gabelgaard.org>, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
-# Per Rasmussen <perhgrasmussen@gmail.com>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jonathan Stein <cgs@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Jarnhold Nattestad <nattestads@gmail.com>, 2018
+# Martin Trigaux, 2018
+# Per Rasmussen <perhgrasmussen@gmail.com>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
-# lhmflexerp <lhm@flexerp.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
+# lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:06+0000\n"
-"PO-Revision-Date: 2018-10-02 10:06+0000\n"
-"Last-Translator: Ejner Sønniksen <ejner@vkdata.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -594,7 +595,7 @@ msgstr ""
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py
index 23bf488ed47..f0c295787a2 100644
--- a/addons/web_editor/models/ir_ui_view.py
+++ b/addons/web_editor/models/ir_ui_view.py
@@ -201,7 +201,7 @@ class IrUiView(models.Model):
     @api.model
     def _view_obj(self, view_id):
         if isinstance(view_id, str):
-            return self.search([('key', '=', view_id)]) or self.env.ref(view_id)
+            return self.search([('key', '=', view_id)], limit=1) or self.env.ref(view_id)
         elif isinstance(view_id, int):
             return self.browse(view_id)
         # assume it's already a view object (WTF?)
diff --git a/addons/web_editor/static/src/js/editor/rte.summernote.js b/addons/web_editor/static/src/js/editor/rte.summernote.js
index 9f13a9237d1..62586a53b5c 100644
--- a/addons/web_editor/static/src/js/editor/rte.summernote.js
+++ b/addons/web_editor/static/src/js/editor/rte.summernote.js
@@ -455,6 +455,7 @@ eventHandler.modules.imageDialog.showImageDialog = function ($editable) {
         options: {
             lastFilters: ['background'],
             onUpload: $editable.data('callbacks').onUpload,
+            noVideos: $editable.data('oe-model') === "mail.compose.message",
         },
     });
     return new $.Deferred().reject();
diff --git a/addons/web_settings_dashboard/i18n/it.po b/addons/web_settings_dashboard/i18n/it.po
index 2291937fb4c..3888c10d0ec 100644
--- a/addons/web_settings_dashboard/i18n/it.po
+++ b/addons/web_settings_dashboard/i18n/it.po
@@ -80,7 +80,7 @@ msgstr "Utenti attivi"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:40
 #, python-format
 msgid "App store"
-msgstr "App store"
+msgstr "Negozio app"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -151,7 +151,8 @@ msgstr "Accedi a funzionalità aggiuntive con la versione Enterprise!"
 #, python-format
 msgid "Help us spread the word: Share Odoo's awesomeness with your friends!"
 msgstr ""
-"Aiutaci a diffondere Odoo: condividi la tua esperienza con i tuoi amici!"
+"Aiutaci a diffondere Odoo. Condividi questa fantastica esperienza con gli "
+"amici!"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -179,7 +180,7 @@ msgstr "Invita"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:73
 #, python-format
 msgid "Invite new users:"
-msgstr "Invito per nuovi utenti:"
+msgstr "Invito per i nuovi utenti:"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -207,7 +208,7 @@ msgstr "Caricare dati dimostrativi"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:69
 #, python-format
 msgid "Manage access rights"
-msgstr "Gestisci diritti di accesso"
+msgstr "Gestisci i diritti di accesso"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -273,7 +274,7 @@ msgstr "Imposta"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:172
 #, python-format
 msgid "Set up your company information"
-msgstr "Impostare le informazioni aziendali"
+msgstr "Imposta le informazioni aziendali"
 
 #. module: web_settings_dashboard
 #. openerp-web
@@ -337,7 +338,7 @@ msgstr "Aggiorna adesso"
 #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:141
 #, python-format
 msgid "Upgrade to enterprise"
-msgstr ""
+msgstr "Avanza a Enterprise"
 
 #. module: web_settings_dashboard
 #. openerp-web
diff --git a/addons/web_tour/i18n/da.po b/addons/web_tour/i18n/da.po
index 3ac5687388b..f35052cc69c 100644
--- a/addons/web_tour/i18n/da.po
+++ b/addons/web_tour/i18n/da.po
@@ -7,15 +7,16 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +51,7 @@ msgstr "Vis navn"
 #. module: web_tour
 #: model:ir.model,name:web_tour.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: web_tour
 #: model:ir.model.fields,field_description:web_tour.field_web_tour_tour__id
diff --git a/addons/web_unsplash/__manifest__.py b/addons/web_unsplash/__manifest__.py
index 3ad4b1334b3..a139e64743b 100644
--- a/addons/web_unsplash/__manifest__.py
+++ b/addons/web_unsplash/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Unsplash Image Library',
     'category': 'Web',
     'summary': 'Find free high-resolution images from Unsplash',
-    'version': '1.0',
+    'version': '1.1',
     'description': """Explore the free high-resolution image library of Unsplash.com and find images to use in Odoo. An Unsplash search bar is added to the image library modal.""",
     'depends': ['base_setup', 'web_editor'],
     'data': [
diff --git a/addons/web_unsplash/controllers/main.py b/addons/web_unsplash/controllers/main.py
index c53c03ba5bf..219342d1c39 100644
--- a/addons/web_unsplash/controllers/main.py
+++ b/addons/web_unsplash/controllers/main.py
@@ -9,12 +9,34 @@ import werkzeug.utils
 from PIL import Image
 from odoo import http, tools, _
 from odoo.http import request
+from werkzeug.urls import url_encode
 
 logger = logging.getLogger(__name__)
 
 
 class Web_Unsplash(http.Controller):
 
+    def _get_access_key(self):
+        if request.env.user._has_unsplash_key_rights():
+            return request.env['ir.config_parameter'].sudo().get_param('unsplash.access_key')
+        raise werkzeug.exceptions.NotFound()
+
+    def _notify_download(self, url):
+        ''' Notifies Unsplash from an image download. (API requirement)
+            :param url: the download_url of the image to be notified
+
+            This method won't return anything. This endpoint should just be
+            pinged with a simple GET request for Unsplash to increment the image
+            view counter.
+        '''
+        try:
+            if not url.startswith('https://api.unsplash.com/photos/'):
+                raise Exception(_("ERROR: Unknown Unsplash notify URL!"))
+            access_key = self._get_access_key()
+            requests.get(url, params=url_encode({'client_id': access_key}))
+        except Exception as e:
+            logger.exception("Unsplash download notification failed: " + str(e))
+
     # ------------------------------------------------------
     # add unsplash image url
     # ------------------------------------------------------
@@ -22,17 +44,34 @@ class Web_Unsplash(http.Controller):
     def save_unsplash_url(self, unsplashurls=None, **kwargs):
         """
             unsplashurls = {
-                image_id1: image_url1,
-                image_id2: image_url2,
+                image_id1: {
+                    url: image_url,
+                    download_url: download_url,
+                },
+                image_id2: {
+                    url: image_url,
+                    download_url: download_url,
+                },
                 .....
             }
         """
+        def slugify(s):
+            ''' Keeps only alphanumeric characters, hyphens and spaces from a string.
+                The string will also be truncated to 1024 characters max.
+                :param s: the string to be filtered
+                :return: the sanitized string
+            '''
+            return "".join([c for c in s if c.isalnum() or c in list("- ")])[:1024]
+
         if not unsplashurls:
             return []
 
         uploads = []
         Attachments = request.env['ir.attachment']
 
+        query = kwargs.get('query', '')
+        query = slugify(query)
+
         res_model = kwargs.get('res_model', 'ir.ui.view')
         if res_model != 'ir.ui.view' and kwargs.get('res_id'):
             res_id = int(kwargs['res_id'])
@@ -59,20 +98,21 @@ class Web_Unsplash(http.Controller):
                 logger.exception("Timeout: " + str(e))
                 continue
 
-            name = key
-
             # optimized image before save
             if mimetype in ('image/jpeg', 'image/png'):
                 image = Image.open(io.BytesIO(datas))
                 if image.format in ('PNG', 'JPEG'):
                     datas = tools.image_save_for_web(image)
                     # append image extension in name
-                    name += '.' + image.format
+                    query += '.' + str.lower(image.format)
+
+            # /unsplash/5gR788gfd/lion
+            url_frags = ['unsplash', key, query]
 
             attachment = Attachments.create({
-                'name': name,
-                'url': '/unsplash/' + name,
-                'datas_fname': name,
+                'name': query,
+                'url': '/' + '/'.join(url_frags),
+                'datas_fname': '_'.join(url_frags),
                 'mimetype': mimetype,
                 'datas': base64.b64encode(datas),
                 'public': res_model == 'ir.ui.view',
@@ -82,13 +122,23 @@ class Web_Unsplash(http.Controller):
             attachment.generate_access_token()
             uploads.extend(attachment.read(['name', 'mimetype', 'checksum', 'res_id', 'res_model', 'access_token', 'url']))
 
+            # Notifies Unsplash from an image download. (API requirement)
+            self._notify_download(value.get('download_url'))
+
         return uploads
 
-    @http.route("/web_unsplash/get_client_id", type='json', auth="user")
-    def get_unsplash_client_id(self, **post):
-        if request.env.user._has_unsplash_key_rights():
-            return request.env['ir.config_parameter'].sudo().get_param('unsplash.access_key')
-        raise werkzeug.exceptions.NotFound()
+    @http.route("/web_unsplash/fetch_images", type='json', auth="user")
+    def fetch_unsplash_images(self, **post):
+        access_key = self._get_access_key()
+        app_id = self.get_unsplash_app_id()
+        if not access_key or not app_id:
+            return {'error': 'key_not_found'}
+        post['client_id'] = access_key
+        response = requests.get('https://api.unsplash.com/search/photos/', params=url_encode(post))
+        if response.status_code == requests.codes.ok:
+            return response.json()
+        else:
+            return {'error': response.status_code}
 
     @http.route("/web_unsplash/get_app_id", type='json', auth="public")
     def get_unsplash_app_id(self, **post):
diff --git a/addons/web_unsplash/i18n/da.po b/addons/web_unsplash/i18n/da.po
index 5371ad8c37a..452c1db45df 100644
--- a/addons/web_unsplash/i18n/da.po
+++ b/addons/web_unsplash/i18n/da.po
@@ -5,13 +5,15 @@
 # Translators:
 # Martin Trigaux, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: jonas jensen <j.jensen@tcomp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +55,7 @@ msgstr "Anvend"
 #. module: web_unsplash
 #: model:ir.model,name:web_unsplash.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: web_unsplash
 #. openerp-web
diff --git a/addons/web_unsplash/static/description/icon.png b/addons/web_unsplash/static/description/icon.png
index 49ab112cb6b..54f5c717396 100644
--- a/addons/web_unsplash/static/description/icon.png
+++ b/addons/web_unsplash/static/description/icon.png
diff --git a/addons/web_unsplash/static/description/icon.svg b/addons/web_unsplash/static/description/icon.svg
new file mode 100644
index 00000000000..09999b47674
--- /dev/null
+++ b/addons/web_unsplash/static/description/icon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="70" height="70"><defs><path id="a" d="M4 0h61c4 0 5 1 5 5v60c0 4-1 5-5 5H4c-3 0-4-1-4-5V5c0-4 1-5 4-5z"/><linearGradient id="c" x1="100%" x2="0%" y1="0%" y2="100%"><stop offset="0%" stop-color="#7CC098"/><stop offset="100%" stop-color="#5F8A71"/></linearGradient><path id="d" d="M35 24c1.653 0 3.066.538 4.24 1.614C40.413 26.69 41 27.985 41 29.5c0 1.515-.587 2.81-1.76 3.886C38.066 34.462 36.653 35 35 35s-3.066-.538-4.24-1.614C29.587 32.31 29 31.015 29 29.5c0-1.515.587-2.81 1.76-3.886C31.934 24.538 33.347 24 35 24zm11.733-5.154c1.178 0 2.184.376 3.017 1.127.833.751 1.25 1.658 1.25 2.72v13.46c0 1.063-.417 1.969-1.25 2.72-.833.751-1.839 1.127-3.017 1.127H23.267c-1.178 0-2.184-.376-3.017-1.127-.833-.751-1.25-1.657-1.25-2.72v-13.46c0-1.062.417-1.969 1.25-2.72.833-.751 1.839-1.127 3.017-1.127H27l.85-2.043c.211-.49.597-.914 1.158-1.27.561-.355 1.136-.533 1.725-.533h8.534c.589 0 1.164.178 1.725.533.56.356.947.78 1.158 1.27l.85 2.043h3.733zM35 37c2.202 0 4.086-.734 5.652-2.201C42.217 33.33 43 31.565 43 29.5c0-2.065-.783-3.83-2.348-5.299C39.086 22.734 37.202 22 35 22s-4.086.734-5.652 2.201C27.783 25.67 27 27.435 27 29.5c0 2.065.783 3.83 2.348 5.299C30.914 36.266 32.798 37 35 37zM19.699 50.884c0 1.063-.297 1.853-.891 2.37-.594.518-1.415.776-2.464.776-1.063 0-1.886-.257-2.47-.77-.583-.513-.874-1.305-.874-2.376V46h1.727v4.884c0 .213.018.422.055.627.037.205.114.387.231.544.117.158.28.286.49.386.209.099.489.148.841.148.616 0 1.041-.137 1.276-.413.235-.275.352-.705.352-1.292V46h1.727v4.884zm.956-2.717h1.485v.792h.033c.198-.33.454-.57.77-.72.315-.15.638-.226.968-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.074-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.426 0-.734.126-.924.38-.191.253-.286.669-.286 1.248v2.981h-1.562v-5.687zm7.368 3.839a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.156-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.5-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.417.324.567.555.15.232.24.523.27.875h-1.486c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.449.114.665.187.216.073.409.17.577.291.17.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zm7.204.825c.257 0 .471-.051.644-.154.172-.103.311-.236.418-.401.106-.166.181-.358.225-.578.044-.22.066-.444.066-.671a3.16 3.16 0 0 0-.071-.671 1.786 1.786 0 0 0-.237-.589 1.317 1.317 0 0 0-.423-.418 1.183 1.183 0 0 0-.633-.159c-.257 0-.471.053-.643.16a1.284 1.284 0 0 0-.418.412 1.712 1.712 0 0 0-.226.583 3.47 3.47 0 0 0-.066.682c0 .227.024.451.072.671.047.22.124.412.23.578.107.165.248.298.424.401.176.103.389.154.638.154zm-2.87-4.664h1.484v.726h.022c.19-.308.433-.532.726-.671.293-.14.616-.209.968-.209.447 0 .832.084 1.155.253.323.169.59.392.803.671.213.279.37.603.473.974.103.37.154.757.154 1.16 0 .381-.051.748-.154 1.1a2.8 2.8 0 0 1-.467.935c-.21.271-.47.488-.781.649-.312.161-.677.242-1.095.242-.352 0-.676-.071-.973-.215a1.843 1.843 0 0 1-.732-.632h-.022v2.695h-1.562v-7.678zm6.4-2.167h1.562v7.854h-1.562V46zm2.364 3.916c.022-.367.113-.671.275-.913.16-.242.366-.436.616-.583.249-.147.53-.251.841-.314.312-.062.625-.093.94-.093.287 0 .576.02.87.06.293.04.56.12.803.237.242.117.44.28.594.49.154.209.23.485.23.83v2.959c0 .257.015.502.045.737.029.235.08.41.154.528h-1.584a2.241 2.241 0 0 1-.11-.55c-.25.257-.543.436-.88.539a3.532 3.532 0 0 1-1.034.154c-.272 0-.525-.033-.76-.099a1.738 1.738 0 0 1-.615-.308 1.434 1.434 0 0 1-.413-.528 1.785 1.785 0 0 1-.148-.759c0-.323.056-.588.17-.797.114-.21.26-.376.44-.501s.385-.218.616-.28c.231-.063.464-.112.699-.149.234-.037.465-.066.693-.088.227-.022.429-.055.605-.099.176-.044.315-.108.418-.193.102-.084.15-.207.143-.368a.829.829 0 0 0-.083-.402.607.607 0 0 0-.22-.23.865.865 0 0 0-.319-.11 2.61 2.61 0 0 0-.39-.028c-.308 0-.55.066-.726.198-.176.132-.28.352-.308.66H41.12zm3.608 1.155a.7.7 0 0 1-.248.138c-.099.033-.205.06-.319.082-.114.022-.233.04-.357.055-.125.015-.25.033-.374.055a2.82 2.82 0 0 0-.347.088 1.024 1.024 0 0 0-.297.149.706.706 0 0 0-.203.236.76.76 0 0 0-.077.363c0 .14.025.257.077.352a.59.59 0 0 0 .209.226c.088.055.19.093.308.115.117.022.238.033.363.033.308 0 .546-.051.715-.154a1.03 1.03 0 0 0 .374-.368c.08-.144.13-.288.148-.435.018-.147.028-.264.028-.352v-.583zm3.617.935a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.157-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.499-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.416.324.567.555.15.232.24.523.27.875H50.49c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.448.114.665.187.216.073.409.17.577.291.169.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zM52.68 46h1.562v2.959h.033c.198-.33.451-.57.759-.72.308-.15.609-.226.902-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.073-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.425 0-.733.126-.924.38-.19.253-.286.669-.286 1.248v2.981h-1.562V46zM14.036 57.642H13V57h2.833v.642h-1.037v2.832h-.76v-2.832zM16 57h1.07l.809 2.389h.01L18.652 57h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H16V57z"/><path id="e" d="M35 22c1.653 0 3.066.538 4.24 1.614C40.413 24.69 41 25.985 41 27.5c0 1.515-.587 2.81-1.76 3.886C38.066 32.462 36.653 33 35 33s-3.066-.538-4.24-1.614C29.587 30.31 29 29.015 29 27.5c0-1.515.587-2.81 1.76-3.886C31.934 22.538 33.347 22 35 22zm11.733-5.154c1.178 0 2.184.376 3.017 1.127.833.751 1.25 1.658 1.25 2.72v13.46c0 1.063-.417 1.969-1.25 2.72-.833.751-1.839 1.127-3.017 1.127H23.267c-1.178 0-2.184-.376-3.017-1.127-.833-.751-1.25-1.657-1.25-2.72v-13.46c0-1.062.417-1.969 1.25-2.72.833-.751 1.839-1.127 3.017-1.127H27l.85-2.043c.211-.49.597-.914 1.158-1.27.561-.355 1.136-.533 1.725-.533h8.534c.589 0 1.164.178 1.725.533.56.356.947.78 1.158 1.27l.85 2.043h3.733zM35 35c2.202 0 4.086-.734 5.652-2.201C42.217 31.33 43 29.565 43 27.5c0-2.065-.783-3.83-2.348-5.299C39.086 20.734 37.202 20 35 20s-4.086.734-5.652 2.201C27.783 23.67 27 25.435 27 27.5c0 2.065.783 3.83 2.348 5.299C30.914 34.266 32.798 35 35 35zM19.699 48.884c0 1.063-.297 1.853-.891 2.37-.594.518-1.415.776-2.464.776-1.063 0-1.886-.257-2.47-.77-.583-.513-.874-1.305-.874-2.376V44h1.727v4.884c0 .213.018.422.055.627.037.205.114.387.231.544.117.158.28.286.49.386.209.099.489.148.841.148.616 0 1.041-.137 1.276-.413.235-.275.352-.705.352-1.292V44h1.727v4.884zm.956-2.717h1.485v.792h.033c.198-.33.454-.57.77-.72.315-.15.638-.226.968-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.074-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.426 0-.734.126-.924.38-.191.253-.286.669-.286 1.248v2.981h-1.562v-5.687zm7.368 3.839a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.156-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.5-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.417.324.567.555.15.232.24.523.27.875h-1.486c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.449.114.665.187.216.073.409.17.577.291.17.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zm7.204.825c.257 0 .471-.051.644-.154.172-.103.311-.236.418-.401.106-.166.181-.358.225-.578.044-.22.066-.444.066-.671a3.16 3.16 0 0 0-.071-.671 1.786 1.786 0 0 0-.237-.589 1.317 1.317 0 0 0-.423-.418 1.183 1.183 0 0 0-.633-.159c-.257 0-.471.053-.643.16a1.284 1.284 0 0 0-.418.412 1.712 1.712 0 0 0-.226.583 3.47 3.47 0 0 0-.066.682c0 .227.024.451.072.671.047.22.124.412.23.578.107.165.248.298.424.401.176.103.389.154.638.154zm-2.87-4.664h1.484v.726h.022c.19-.308.433-.532.726-.671.293-.14.616-.209.968-.209.447 0 .832.084 1.155.253.323.169.59.392.803.671.213.279.37.603.473.974.103.37.154.757.154 1.16 0 .381-.051.748-.154 1.1a2.8 2.8 0 0 1-.467.935c-.21.271-.47.488-.781.649-.312.161-.677.242-1.095.242-.352 0-.676-.071-.973-.215a1.843 1.843 0 0 1-.732-.632h-.022v2.695h-1.562v-7.678zm6.4-2.167h1.562v7.854h-1.562V44zm2.364 3.916c.022-.367.113-.671.275-.913.16-.242.366-.436.616-.583.249-.147.53-.251.841-.314.312-.062.625-.093.94-.093.287 0 .576.02.87.06.293.04.56.12.803.237.242.117.44.28.594.49.154.209.23.485.23.83v2.959c0 .257.015.502.045.737.029.235.08.41.154.528h-1.584a2.241 2.241 0 0 1-.11-.55c-.25.257-.543.436-.88.539a3.532 3.532 0 0 1-1.034.154c-.272 0-.525-.033-.76-.099a1.738 1.738 0 0 1-.615-.308 1.434 1.434 0 0 1-.413-.528 1.785 1.785 0 0 1-.148-.759c0-.323.056-.588.17-.797.114-.21.26-.376.44-.501s.385-.218.616-.28c.231-.063.464-.112.699-.149.234-.037.465-.066.693-.088.227-.022.429-.055.605-.099.176-.044.315-.108.418-.193.102-.084.15-.207.143-.368a.829.829 0 0 0-.083-.402.607.607 0 0 0-.22-.23.865.865 0 0 0-.319-.11 2.61 2.61 0 0 0-.39-.028c-.308 0-.55.066-.726.198-.176.132-.28.352-.308.66H41.12zm3.608 1.155a.7.7 0 0 1-.248.138c-.099.033-.205.06-.319.082-.114.022-.233.04-.357.055-.125.015-.25.033-.374.055a2.82 2.82 0 0 0-.347.088 1.024 1.024 0 0 0-.297.149.706.706 0 0 0-.203.236.76.76 0 0 0-.077.363c0 .14.025.257.077.352a.59.59 0 0 0 .209.226c.088.055.19.093.308.115.117.022.238.033.363.033.308 0 .546-.051.715-.154a1.03 1.03 0 0 0 .374-.368c.08-.144.13-.288.148-.435.018-.147.028-.264.028-.352v-.583zm3.617.935a.857.857 0 0 0 .374.731c.11.078.237.134.38.171a1.67 1.67 0 0 0 .792.017c.12-.026.23-.066.33-.122a.75.75 0 0 0 .247-.22.578.578 0 0 0 .1-.346c0-.235-.157-.41-.468-.528a9.336 9.336 0 0 0-1.304-.352 7.71 7.71 0 0 1-.665-.181 2.274 2.274 0 0 1-.578-.276 1.337 1.337 0 0 1-.407-.428 1.216 1.216 0 0 1-.154-.633c0-.367.072-.667.215-.902.143-.235.332-.42.566-.555.235-.136.499-.231.792-.286.294-.056.594-.083.902-.083.308 0 .607.03.897.088.29.059.548.158.775.297.228.14.416.324.567.555.15.232.24.523.27.875H50.49c-.022-.3-.135-.504-.34-.61a1.559 1.559 0 0 0-.727-.16c-.088 0-.183.005-.286.017a.955.955 0 0 0-.28.071.578.578 0 0 0-.215.16.421.421 0 0 0-.088.28c0 .14.052.253.154.341.103.088.237.16.402.215.165.055.354.104.566.148.213.044.43.092.65.143.227.051.448.114.665.187.216.073.409.17.577.291.169.122.305.272.407.451.103.18.154.402.154.666 0 .374-.075.687-.225.94-.15.254-.347.457-.589.611a2.412 2.412 0 0 1-.83.325 4.84 4.84 0 0 1-1.92-.006 2.555 2.555 0 0 1-.841-.33 1.887 1.887 0 0 1-.605-.61c-.158-.254-.244-.57-.259-.952h1.485zM52.68 44h1.562v2.959h.033c.198-.33.451-.57.759-.72.308-.15.609-.226.902-.226.418 0 .76.057 1.028.17.268.114.479.272.633.474.154.201.262.447.324.737.063.29.094.61.094.962v3.498h-1.562v-3.212c0-.47-.073-.82-.22-1.05-.147-.232-.407-.347-.781-.347-.425 0-.733.126-.924.38-.19.253-.286.669-.286 1.248v2.981h-1.562V44zM14.036 55.642H13V55h2.833v.642h-1.037v2.832h-.76v-2.832zM16 55h1.07l.809 2.389h.01L18.652 55h1.07v3.474h-.711v-2.462h-.01l-.847 2.462h-.586l-.848-2.438h-.01v2.438H16V55z"/></defs><g fill="none" fill-rule="evenodd"><mask id="b" fill="#fff"><use xlink:href="#a"/></mask><g mask="url(#b)"><path fill="url(#c)" d="M0 0H70V70H0z"/><path fill="#FFF" fill-opacity=".383" d="M4 1h61c2.667 0 4.333.667 5 2V0H0v3c.667-1.333 2-2 4-2z"/><path fill="#393939" d="M4 69c-2 0-4-1-4-4V33.916L25 18l11.4-3 11.016 3.802 3.209 19.927L46.5 47.19l1.345-.833h2.78l2.135-2.198L54 47.19l3-.19 1.014 4.854L39.224 69H4z" opacity=".324"/><path fill="#000" fill-opacity=".383" d="M4 69h61c2.667 0 4.333-1 5-3v4H0v-4c.667 2 2 3 4 3z"/><use fill="#000" fill-rule="nonzero" opacity=".3" xlink:href="#d"/><use fill="#FFF" fill-rule="nonzero" xlink:href="#e"/></g></g></svg>
+\ No newline at end of file
diff --git a/addons/web_unsplash/static/src/js/unsplash_beacon.js b/addons/web_unsplash/static/src/js/unsplash_beacon.js
index f8e74a3b759..179d566cee3 100644
--- a/addons/web_unsplash/static/src/js/unsplash_beacon.js
+++ b/addons/web_unsplash/static/src/js/unsplash_beacon.js
@@ -7,8 +7,8 @@ var ajax = require('web.ajax');
 base.ready().then(function () {
     var unsplash_images = [];
     _.each($('img[src*="/unsplash/"]'), function (img, index) {
-        // get image id from URL (`/unsplash/xYdf5feoI.jpg` -> `xYdf5feoI`)
-        unsplash_images.push(img.src.split('/unsplash/')[1].split('.')[0]);
+        // get image id from URL (`http://www.domain.com:1234/unsplash/xYdf5feoI/lion.jpg` -> `xYdf5feoI`)
+        unsplash_images.push(img.src.split('/unsplash/')[1].split('/')[0]);
     });
     if (unsplash_images.length) {
         ajax.jsonRpc('/web_unsplash/get_app_id', 'call').then(function (appID) {
diff --git a/addons/web_unsplash/static/src/js/unsplash_image_widget.js b/addons/web_unsplash/static/src/js/unsplash_image_widget.js
index d353694ddea..6eb393d3798 100644
--- a/addons/web_unsplash/static/src/js/unsplash_image_widget.js
+++ b/addons/web_unsplash/static/src/js/unsplash_image_widget.js
@@ -86,12 +86,9 @@ ImageWidget.include({
                 unsplashurls: self._unsplash.selectedImages,
                 res_model : self.options.res_model,
                 res_id: self.options.res_id,
+                query: self._unsplash.query,
             }
         }).then(function (images) {
-            for (var img in self._unsplash.selectedImages) {
-                self.unsplashAPI.notifyDownload(self._unsplash.selectedImages[img].download_url);
-            }
-
             _.each(images, function (image) {
                 image.src = image.url;
                 image.isDocument = !(/gif|jpe|jpg|png/.test(image.mimetype));
@@ -140,7 +137,7 @@ ImageWidget.include({
             self.$('.unsplash_img_container').html(QWeb.render('web_unsplash.dialog.image.content', { rows: rows }));
             self._highlightSelectedImages();
         }).fail(function (err) {
-            self.$('.unsplash_img_container').html(QWeb.render('web_unsplash.dialog.error.content', err));
+            self.$('.unsplash_img_container').html(QWeb.render('web_unsplash.dialog.error.content', { status: err }));
         }).always(function () {
             self._toggleAttachmentContaines(false);
         });
diff --git a/addons/web_unsplash/static/src/js/unsplashapi.js b/addons/web_unsplash/static/src/js/unsplashapi.js
index 0ceb2b8f8a7..a6ec5b75324 100644
--- a/addons/web_unsplash/static/src/js/unsplashapi.js
+++ b/addons/web_unsplash/static/src/js/unsplashapi.js
@@ -38,46 +38,16 @@ var UnsplashCore = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         if (cachedData && (cachedData.images.length >= to || (cachedData.totalImages !== 0 && cachedData.totalImages < to))) {
             return $.when({ images: cachedData.images.slice(from, to), isMaxed: to > cachedData.totalImages });
         }
-        return this._getAPIKey().then(function (clientID) {
-            if (!clientID) {
-                return $.Deferred().reject({ key_not_found: true });
-            }
-            return self._fetchImages(query).then(function (cachedData) {
-                return { images: cachedData.images.slice(from, to), isMaxed: to > cachedData.totalImages };
-            });
+        return self._fetchImages(query).then(function (cachedData) {
+            return { images: cachedData.images.slice(from, to), isMaxed: to > cachedData.totalImages };
         });
     },
-    /**
-     * Notifies Unsplash from an image download. (API requirement)
-     *
-     * @param {String} url url of the image to notify
-     */
-    notifyDownload: function (url) {
-        $.get(url, { client_id: this.clientId });
-    },
 
     //--------------------------------------------------------------------------
     // Private
     //--------------------------------------------------------------------------
 
     /**
-     * Checks and retrieves the unsplash API key
-     *
-     * @private
-     */
-    _getAPIKey: function () {
-        var self = this;
-        if (this.clientId) {
-            return $.Deferred().resolve(self.clientId);
-        }
-        return this._rpc({
-            route: '/web_unsplash/get_client_id',
-        }).then(function (res) {
-            self.clientId = res;
-            return res;
-        });
-    },
-    /**
      * Fetches images from unsplash and stores it in cache
      *
      * @param {String} query search terms
@@ -96,10 +66,15 @@ var UnsplashCore = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         var payload = {
             query: query,
             page: cachedData.pageCached + 1,
-            client_id: this.clientId,
             per_page: 30, // max size from unsplash API
         };
-        return $.get('https://api.unsplash.com/search/photos/', payload).then(function (result) {
+        return this._rpc({
+            route: '/web_unsplash/fetch_images',
+            params: payload,
+        }).then(function (result) {
+            if (result.error) {
+                return $.Deferred().reject(result.error);
+            }
             cachedData.pageCached++;
             cachedData.images.push.apply(cachedData.images, result.results);
             cachedData.maxPages = result.total_pages;
diff --git a/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml b/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
index 409c435884b..05202e073b2 100644
--- a/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
+++ b/addons/web_unsplash/static/src/xml/unsplash_image_widget.xml
@@ -50,7 +50,7 @@
 <t t-name="web_unsplash.dialog.error.content">
     <div class="row mt16 text-muted unsplash_error">
         <div class="m-auto text-center">
-            <t t-if="key_not_found">
+            <t t-if="status == 'key_not_found'">
                 <t t-call="web_unsplash.dialog.error.credentials">
                     <t t-set="title">
                         Unsplash requires an access key and an application ID
diff --git a/addons/website/i18n/da.po b/addons/website/i18n/da.po
index 4e3527edd8b..b4d7af83667 100644
--- a/addons/website/i18n/da.po
+++ b/addons/website/i18n/da.po
@@ -14,9 +14,9 @@
 # Jonathan Stein <cgs@image.dk>, 2018
 # JonathanStein <jstein@image.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:48+0000\n"
 "PO-Revision-Date: 2018-08-24 09:33+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -737,6 +737,11 @@ msgid ""
 "field as True to allow users to run this action. If it is set to False the "
 "action cannot be run through the website."
 msgstr ""
+"En kode server handling kan udføres fra hjemmesiden, ved hjælp af en "
+"dedikeret controller. Adressen er <base>/website/action/<website_path>. "
+"Angiv dette felt som True for at give brugerne mulighed for at køre denne "
+"handling. Hvis den er sat til False, kan handlingen ikke køres gennem "
+"hjemmesiden."
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_text_block
@@ -1232,7 +1237,7 @@ msgstr "Komponenter"
 #. module: website
 #: model:ir.model,name:website.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website
 #: model:ir.ui.menu,name:website.menu_website_global_configuration
@@ -1357,7 +1362,7 @@ msgstr "Tilpasset"
 #: model:ir.model.fields,field_description:website.field_res_config_settings__auth_signup_uninvited
 #: model:ir.model.fields,field_description:website.field_website__auth_signup_uninvited
 msgid "Customer Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.user_navbar
@@ -1647,7 +1652,7 @@ msgstr ""
 #: code:addons/website/static/src/xml/website.contentMenu.xml:7
 #, python-format
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_features_grid
@@ -2107,7 +2112,7 @@ msgstr ""
 #. module: website
 #: model:ir.model,name:website.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view
@@ -2529,7 +2534,7 @@ msgstr "Sidste år"
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.theme_customize
 msgid "Layout"
-msgstr ""
+msgstr "Layout"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_text_image
@@ -3196,7 +3201,7 @@ msgstr ""
 #. module: website
 #: model:ir.model.fields,help:website.field_website__partner_id
 msgid "Partner-related data of the user"
-msgstr ""
+msgstr "Partner-relaterede data fra brugeren"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view
@@ -3850,6 +3855,7 @@ msgstr "Den fulde URL for at få adgang til dokumentet via hjemmesiden."
 #: model:ir.model.fields,help:website.field_ir_actions_server__website_url
 msgid "The full URL to access the server action through the website."
 msgstr ""
+"Den fulde URL for at få adgang til serverens handling via hjemmesiden."
 
 #. module: website
 #. openerp-web
@@ -4004,6 +4010,9 @@ msgid ""
 "list view and click on 'Portal Access Management' option in the dropdown "
 "menu *Action*."
 msgstr ""
+"Hvis du vil sende invitationer i B2B-tilstand, skal du åbne en kontakt eller"
+" vælge flere i listevisning og klikke på 'Portal Access Management' i "
+"rullemenuen *Handling*."
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view
diff --git a/addons/website/i18n/es_CO.po b/addons/website/i18n/es_CO.po
index 9f9bf653cd6..6a046f88993 100644
--- a/addons/website/i18n/es_CO.po
+++ b/addons/website/i18n/es_CO.po
@@ -287,9 +287,9 @@ msgid ""
 "                    several cups of coffee to go through. But don't worry, "
 "you can return to this tool at any time.</i>"
 msgstr ""
-"<I> Todo el proceso puede tardar un par de horas, algunas discusiones con "
+"<i> Todo el proceso puede tardar un par de horas, algunas discusiones con "
 "sus colegas y varias tazas de café. Pero no se preocupe, puede volver a esta "
-"herramienta en cualquier momento. </ I>"
+"herramienta en cualquier momento. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
@@ -325,14 +325,14 @@ msgid ""
 "<i>Congratulations on taking the leap and deciding to build your own website!"
 "</i>"
 msgstr ""
-"<I>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
-"</ I>"
+"<i>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
+"</i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
 msgstr ""
-"<I>Configuración instantánea, quedará satisfecho o será reembolsado. </ I>"
+"<i>Configuración instantánea, quedará satisfecho o será reembolsado. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
diff --git a/addons/website/i18n/es_DO.po b/addons/website/i18n/es_DO.po
index 40e758276f4..eb066ff4728 100644
--- a/addons/website/i18n/es_DO.po
+++ b/addons/website/i18n/es_DO.po
@@ -282,9 +282,9 @@ msgid ""
 "                    several cups of coffee to go through. But don't worry, "
 "you can return to this tool at any time.</i>"
 msgstr ""
-"<I> Todo el proceso puede tardar un par de horas, algunas discusiones con "
+"<i> Todo el proceso puede tardar un par de horas, algunas discusiones con "
 "sus colegas y varias tazas de café. Pero no se preocupe, puede volver a esta "
-"herramienta en cualquier momento. </ I>"
+"herramienta en cualquier momento. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
@@ -320,14 +320,14 @@ msgid ""
 "<i>Congratulations on taking the leap and deciding to build your own website!"
 "</i>"
 msgstr ""
-"<I>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
-"</ I>"
+"<i>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
+"</i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
 msgstr ""
-"<I>Configuración instantánea, quedará satisfecho o será reembolsado. </ I>"
+"<i>Configuración instantánea, quedará satisfecho o será reembolsado. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
diff --git a/addons/website/i18n/es_EC.po b/addons/website/i18n/es_EC.po
index dc38226df97..dd4f439b271 100644
--- a/addons/website/i18n/es_EC.po
+++ b/addons/website/i18n/es_EC.po
@@ -292,9 +292,9 @@ msgid ""
 "                    several cups of coffee to go through. But don't worry, "
 "you can return to this tool at any time.</i>"
 msgstr ""
-"<I> Todo el proceso puede tardar un par de horas, algunas discusiones con "
+"<i> Todo el proceso puede tardar un par de horas, algunas discusiones con "
 "sus colegas y varias tazas de café. Pero no se preocupe, puede volver a esta "
-"herramienta en cualquier momento. </ I>"
+"herramienta en cualquier momento. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
@@ -330,14 +330,14 @@ msgid ""
 "<i>Congratulations on taking the leap and deciding to build your own website!"
 "</i>"
 msgstr ""
-"<I>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
-"</ I>"
+"<i>¡Felicitaciones por dar el salto y decidir construir su propio sitio web! "
+"</i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.s_comparisons
 msgid "<i>Instant setup, satisfied or reimbursed.</i>"
 msgstr ""
-"<I>Configuración instantánea, quedará satisfecho o será reembolsado. </ I>"
+"<i>Configuración instantánea, quedará satisfecho o será reembolsado. </i>"
 
 #. module: website
 #: model_terms:ir.ui.view,arch_db:website.website_planner
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 593c1b721d7..0a99b8ef8eb 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -1099,7 +1099,7 @@ class Menu(models.Model):
         if vals.get('url') == '/default-main-menu':
             return super(Menu, self).create(vals)
 
-        if vals.get('website_id'):
+        if 'website_id' in vals:
             return super(Menu, self).create(vals)
         elif self._context.get('website_id'):
             vals['website_id'] = self._context.get('website_id')
diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js
index a0b25c75b01..a6737fe7b24 100644
--- a/addons/website/static/src/js/content/snippets.animation.js
+++ b/addons/website/static/src/js/content/snippets.animation.js
@@ -7,6 +7,7 @@ odoo.define('website.content.snippets.animation', function (require) {
 
 var Class = require('web.Class');
 var core = require('web.core');
+var dom = require('web.dom');
 var mixins = require('web.mixins');
 var utils = require('web.utils');
 var Widget = require('web.Widget');
@@ -256,6 +257,29 @@ var Animation = Widget.extend({
      */
     selector: false,
     /**
+     * Extension of @see Widget.events
+     *
+     * A description of the event handlers to bind/delegate once the widget
+     * has been rendered.
+     *
+     * 'click .hello .world': 'async _onHelloWorldClick',
+     *   _^_      _^_           _^_        _^_
+     *    |        |             |          |
+     *    |  (Optional) jQuery   |  Handler method name
+     *    |  delegate selector   |
+     *    |                      |_ (Optional) space separated options
+     *    |                          * async: use the automatic system
+     *    |_ Event name with           making handlers promise-ready (see
+     *       potential jQuery          makeButtonHandler, makeAsyncHandler)
+     *       namespaces
+     *
+     * Note: the values may be replaced by a function declaration. This is
+     * however a deprecated behavior.
+     *
+     * @type {Object}
+     */
+    events: {},
+    /**
      * Acts as @see Widget.events except that the events are only binded if the
      * Animation instance is instanciated in edit mode.
      */
@@ -372,6 +396,54 @@ var Animation = Widget.extend({
     //--------------------------------------------------------------------------
 
     /**
+     * @see this.events
+     * @override
+     */
+    _delegateEvents: function () {
+        var self = this;
+        var originalEvents = this.events;
+
+        var events = {};
+        _.each(this.events, function (method, event) {
+            // If the method is a function, use the default Widget system
+            if (typeof method !== 'string') {
+                events[event] = method;
+                return;
+            }
+            // If the method is only a function name without options, use the
+            // default Widget system
+            var methodOptions = method.split(' ');
+            if (methodOptions.length <= 1) {
+                events[event] = method;
+                return;
+            }
+            // If the method has no meaningful options, use the default Widget
+            // system
+            var isAsync = _.contains(methodOptions, 'async');
+            if (!isAsync) {
+                events[event] = method;
+                return;
+            }
+
+            method = self.proxy(methodOptions[methodOptions.length - 1]);
+            if (_.str.startsWith(event, 'click')) {
+                // Protect click handler to be called multiple times by
+                // mistake by the user and add a visual disabling effect
+                // for buttons.
+                method = dom.makeButtonHandler(method);
+            } else {
+                // Protect all handlers to be recalled while the previous
+                // async handler call is not finished.
+                method = dom.makeAsyncHandler(method);
+            }
+            events[event] = method;
+        });
+
+        this.events = events;
+        this._super.apply(this, arguments);
+        this.events = originalEvents;
+    },
+    /**
      * Registers `AnimationEffect` instances.
      *
      * This can be done by extending this method and calling the @see _addEffect
diff --git a/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss
index 82beeec2cbf..4f93429aa58 100644
--- a/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss
+++ b/addons/website/static/src/scss/compatibility/bs3_for_12_0.scss
@@ -142,12 +142,18 @@ $-compat-gray-map: (
     @extend .card-body;
 }
 
-// Adapt grid (push-pull, xs ?)
-@each $breakpoint in map-keys($grid-breakpoints) {
-    $infix: breakpoint-infix($breakpoint, $grid-breakpoints);
+// Adapt grid (push-pull ?)
+$-compat-breakpoints: (
+  xs: map-get($grid-breakpoints, 'xs'),
+  sm: map-get($grid-breakpoints, 'md'),
+  md: map-get($grid-breakpoints, 'lg'),
+  lg: map-get($grid-breakpoints, 'xl'),
+);
+@each $breakpoint in map-keys($-compat-breakpoints) {
+    $infix: breakpoint-infix($breakpoint, $-compat-breakpoints);
     $infix: if($infix != "", $infix, "-xs");
 
-    @include media-breakpoint-up($breakpoint, $grid-breakpoints) {
+    @include media-breakpoint-up($breakpoint, $-compat-breakpoints) {
         // `$grid-columns - 1` because offsetting by the width of an entire row isn't possible
         @for $i from 0 through ($grid-columns - 1) {
             .col#{$infix}-offset-#{$i} {
@@ -196,105 +202,148 @@ $-compat-gray-map: (
 .btn-default {
     @include button-variant(theme-color('secondary'), theme-color('secondary'));
 }
+.btn-xs {
+    @extend .btn-sm;
+}
 
 // Adapt display classes
-.hidden, .hide {
+.hide {
     display: none !important;
 }
+.show {
+    display: block !important;
+}
 .hidden {
+    display: none !important;
+}
+.visible {
+    &-xs, &-sm, &-md, &-lg {
+        &, &-block, &-inline, &-inline-block {
+            display: none !important;
+        }
+    }
     &-xs {
-        @include media-breakpoint-down(sm) {
-            display: none;
+        &, &-block {
+            @include media-breakpoint-down(sm) {
+                display: block !important;
+            }
+        }
+        &-inline {
+            @include media-breakpoint-down(sm) {
+                display: inline !important;
+            }
+        }
+        &-inline-block {
+            @include media-breakpoint-down(sm) {
+                display: inline-block !important;
+            }
         }
     }
     &-sm {
-        @include media-breakpoint-only(md) {
-            display: none;
+        &, &-block {
+            @include media-breakpoint-only(md) {
+                display: block !important;
+            }
+        }
+        &-inline {
+            @include media-breakpoint-only(md) {
+                display: inline !important;
+            }
+        }
+        &-inline-block {
+            @include media-breakpoint-only(md) {
+                display: inline-block !important;
+            }
         }
     }
     &-md {
-        @include media-breakpoint-only(lg) {
-            display: none;
+        &, &-block {
+            @include media-breakpoint-only(lg) {
+                display: block !important;
+            }
+        }
+        &-inline {
+            @include media-breakpoint-only(lg) {
+                display: inline !important;
+            }
+        }
+        &-inline-block {
+            @include media-breakpoint-only(lg) {
+                display: inline-block !important;
+            }
         }
     }
     &-lg {
-        @include media-breakpoint-only(xl) {
-            display: none;
+        &, &-block {
+            @include media-breakpoint-up(xl) {
+                display: block !important;
+            }
         }
-    }
-    &-print {
-        @media print {
-            display: none;
+        &-inline {
+            @include media-breakpoint-up(xl) {
+                display: inline !important;
+            }
+        }
+        &-inline-block {
+            @include media-breakpoint-up(xl) {
+                display: inline-block !important;
+            }
         }
     }
 }
-.show {
-    display: block !important;
-}
-.visible {
+.hidden {
     &-xs {
-        &-block, &-inline-block {
-            display: none;
-        }
         @include media-breakpoint-down(sm) {
-            &-block {
-                display: block;
-            }
-            &-inline-block {
-                display: inline-block;
-            }
+            display: none !important;
         }
     }
     &-sm {
-        &-block, &-inline-block {
-            display: none;
-        }
         @include media-breakpoint-only(md) {
-            &-block {
-                display: block;
-            }
-            &-inline-block {
-                display: inline-block;
-            }
+            display: none !important;
         }
     }
     &-md {
-        &-block, &-inline-block {
-            display: none;
-        }
         @include media-breakpoint-only(lg) {
-            &-block {
-                display: block;
-            }
-            &-inline-block {
-                display: inline-block;
-            }
+            display: none !important;
         }
     }
     &-lg {
-        &-block, &-inline-block {
-            display: none;
+        @include media-breakpoint-up(xl) {
+            display: none !important;
         }
-        @include media-breakpoint-only(xl) {
-            &-block {
-                display: block;
-            }
-            &-inline-block {
-                display: inline-block;
-            }
+    }
+}
+.visible-print {
+    display: none !important;
+
+    @media print {
+        display: block !important;
+    }
+
+    &-block {
+        display: none !important;
+
+        @media print {
+            display: block !important;
         }
     }
-    &-print {
-        &-block, &-inline-block {
-            display: none;
+    &-inline {
+        display: none !important;
+
+        @media print {
+            display: inline !important;
         }
+    }
+    &-inline-block {
+        display: none !important;
+
         @media print {
-            &-block {
-                display: block;
-            }
-            &-inline-block {
-                display: inline-block;
-            }
+            display: inline-block !important;
         }
     }
 }
+.hidden-print {
+    @media print {
+        display: none !important;
+    }
+}
diff --git a/addons/website_crm/i18n/da.po b/addons/website_crm/i18n/da.po
index d82d74f0075..65cc0795f05 100644
--- a/addons/website_crm/i18n/da.po
+++ b/addons/website_crm/i18n/da.po
@@ -8,16 +8,17 @@
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
-"PO-Revision-Date: 2018-09-21 13:17+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:33+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,7 +45,7 @@ msgstr "Kommunikation"
 #. module: website_crm
 #: model:ir.model,name:website_crm.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_crm
 #: model_terms:ir.ui.view,arch_db:website_crm.res_config_settings_view_form
diff --git a/addons/website_crm_partner_assign/i18n/it.po b/addons/website_crm_partner_assign/i18n/it.po
index 85aae01c27f..c1f570006e2 100644
--- a/addons/website_crm_partner_assign/i18n/it.po
+++ b/addons/website_crm_partner_assign/i18n/it.po
@@ -15,6 +15,7 @@
 # Luigi Di Naro <gigidn@gmail.com>, 2018
 # Paolo Valier, 2018
 # Cécile Collart <cco@odoo.com>, 2018
+# nle_odoo, 2018
 # Petra <bop@odoo.com>, 2018
 # Martin Trigaux, 2018
 # Léonie Bouchat <lbo@odoo.com>, 2018
@@ -285,18 +286,18 @@ msgstr ""
 "                            Siamo stati contattati da potenziali clienti che si trovano nella Sua regione. I seguenti lead sono quindi stati assegnati a ${ctx['partner_id'].name}:<br/>\n"
 "                            <ol>\n"
 "                                % for lead in ctx['partner_leads']:\n"
-"                                    <li><a href=\"${lead.lead_link}\">${lead.lead_id.name o \"Soggetto non definito\"}</a>, ${lead.lead_id.partner_name o lead.lead_id.contact_name o \"Nome del contatto non definito\"}, ${lead.lead_id.country_id e lead.lead_id.country_id.name o \"Paese non definito\" }, ${lead.lead_id.email_from o \"Email non definito\"}, ${lead.lead_id.phone o ''} </li><br/>\n"
+"                                    <li><a href=\"${lead.lead_link}\">${lead.lead_id.name or \"Soggetto non definito\"}</a>, ${lead.lead_id.partner_name o lead.lead_id.contact_name or \"Nome del contatto non definito\"}, ${lead.lead_id.country_id and lead.lead_id.country_id.name or \"Paese non definito\" }, ${lead.lead_id.email_from or \"Email non definito\"}, ${lead.lead_id.phone or ''} </li><br/>\n"
 "                                % endfor\n"
 "                            </ol>\n"
 "                            % if ctx.get('partner_in_portal'):\n"
 "                                Si connetta al Suo<a href=\"${object.get_portal_url()}\">Portale di partner</a> per più dettagli. Per ogni lead ci sono due pulsanti nell'angolo in alto a sinistra da premere dopo aver contattato il lead: \"Sono interessato\" &amp; \"Non sono interessato\".<br/>\n"
 "                            % else:\n"
 "                                Lei non ha ancora un accesso al nostro database. Contatti\n"
-"                                ${ctx['partner_id'].user_id e ctx['partner_id'].user_id.email e \"il tuo account manager %s (%s)\" % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) o \"noi\"}.<br/>\n"
+"                                ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.email and \"il tuo account manager %s (%s)\" % (ctx['partner_id'].user_id.name,ctx['partner_id'].user_id.email) or \"noi\"}.<br/>\n"
 "                            % endif\n"
 "                            Il lead sarà inviato ad un altro partner se non lo contatti entro 20 giorni.<br/><br/>\n"
 "                            Grazie,<br/>\n"
-"                            ${ctx['partner_id'].user_id e ctx['partner_id'].user_id.signature | safe o ''}\n"
+"                            ${ctx['partner_id'].user_id and ctx['partner_id'].user_id.signature | safe or ''}\n"
 "                            <br/>\n"
 "                            % if not ctx['partner_id'].user_id:\n"
 "                                PS: Sembra che Lei non ha un account manager assegnato, contattici..\n"
@@ -321,13 +322,13 @@ msgstr ""
 "                </td></tr>\n"
 "                <tr><td valign=\"middle\" align=\"left\" style=\"opacity: 0.7;\">\n"
 "                    ${user.company_id.phone}\n"
-"                    % if user.company_id.phone e (user.company_id.email o user.company_id.website)\n"
+"                    % if user.company_id.phone and (user.company_id.email or user.company_id.website)\n"
 "                    |\n"
 "                    % endif\n"
 "                    % if user.company_id.email\n"
 "                    <a href=\"'mailto:%s' % ${user.company_id.email}\" style=\"text-decoration:none; color: #454748;\">${user.company_id.email}</a>\n"
 "                    % endif\n"
-"                    % if user.company_id.email e user.company_id.website\n"
+"                    % if user.company_id.email and user.company_id.website\n"
 "                    |\n"
 "                    % endif\n"
 "                    % if user.company_id.website\n"
diff --git a/addons/website_event/views/event_views.xml b/addons/website_event/views/event_views.xml
index 566a391772a..7e4df97c36a 100644
--- a/addons/website_event/views/event_views.xml
+++ b/addons/website_event/views/event_views.xml
@@ -31,7 +31,7 @@
         <field name="inherit_id" ref="event.view_event_form"/>
         <field name="arch" type="xml">
             <field name="organizer_id" position="before">
-                <field name="website_id" options="{'no_create': True}"  attrs="{'required': [('website_menu','=',True)]}" groups="website.group_multi_website"/>
+                <field name="website_id" options="{'no_create': True}" groups="website.group_multi_website"/>
             </field>
             <button name="toggle_active" position="before">
                 <field name="website_url" invisible="1"/>
diff --git a/addons/website_event_sale/i18n/sv.po b/addons/website_event_sale/i18n/sv.po
index 77469332dcf..f2410ca75d5 100644
--- a/addons/website_event_sale/i18n/sv.po
+++ b/addons/website_event_sale/i18n/sv.po
@@ -76,7 +76,7 @@ msgstr "Utsålt"
 #: code:addons/website_event_sale/models/sale_order.py:71
 #, python-format
 msgid "Sorry, The %(ticket)s tickets for the %(event)s event are sold out."
-msgstr "Tyvärr, alla %(ticket) biljetter för %(event) är utsålda."
+msgstr "Tyvärr, alla %(ticket)s biljetter för %(event)s är utsålda."
 
 #. module: website_event_sale
 #: code:addons/website_event_sale/models/sale_order.py:77
diff --git a/addons/website_event_track/i18n/da.po b/addons/website_event_track/i18n/da.po
index 5625d185f83..b21b5290ab1 100644
--- a/addons/website_event_track/i18n/da.po
+++ b/addons/website_event_track/i18n/da.po
@@ -8,11 +8,11 @@
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # Martin Trigaux, 2018
 # jonas jensen <j.jensen@tcomp.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:34+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -355,7 +355,7 @@ msgstr "Dokumenter"
 #. module: website_event_track
 #: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_kanban
 msgid "Dropdown menu"
-msgstr ""
+msgstr "Dropdown menu"
 
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track__duration
@@ -801,7 +801,7 @@ msgstr "Oversigt over næste aktivitet"
 #. module: website_event_track
 #: model:ir.model.fields,field_description:website_event_track.field_event_track__activity_type_id
 msgid "Next Activity Type"
-msgstr ""
+msgstr "Næste aktivitetstype"
 
 #. module: website_event_track
 #: model_terms:ir.ui.view,arch_db:website_event_track.tracks
@@ -948,7 +948,7 @@ msgstr "Rækkefølge"
 #. module: website_event_track
 #: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_search
 msgid "Show all records which has next action date is before today"
-msgstr ""
+msgstr "Vis alle poster, hvor den næste handlingsdato er før i dag"
 
 #. module: website_event_track
 #: model:event.sponsor.type,name:website_event_track.event_sponsor_type2
@@ -1055,6 +1055,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Status baseret på aktiviteter\n"
+"Forfaldne: Forfaldsdato er allerede overskredet\n"
+"I dag: Aktivitetsdato er i dag\n"
+"Planlagt: Fremtidige aktiviteter."
 
 #. module: website_event_track
 #: model_terms:ir.ui.view,arch_db:website_event_track.event_track_proposal
diff --git a/addons/website_event_track/i18n/it.po b/addons/website_event_track/i18n/it.po
index 5971de0056b..329f93715f2 100644
--- a/addons/website_event_track/i18n/it.po
+++ b/addons/website_event_track/i18n/it.po
@@ -18,6 +18,7 @@
 # Martin Trigaux, 2018
 # Giovanni Perteghella <giovanni@perteghella.org>, 2018
 # David Minneci <david@numeko.it>, 2018
+# nle_odoo, 2018
 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018
 # Léonie Bouchat <lbo@odoo.com>, 2018
 # 
@@ -56,7 +57,7 @@ msgid ""
 msgstr ""
 "<?xml version=\"1.0\"?>\n"
 "<div>\n"
-"    Gentile ${object.partner_name o ''}<br/>\n"
+"    Gentile ${object.partner_name or ''}<br/>\n"
 "    Siamo lieti di communicarLa che la Sua proposta ${object.name} è stata accettata e confermata per l'evento ${object.event_id.name}.\n"
 "    <br/>\n"
 "    Trovera maggiori dettagli qui:\n"
diff --git a/addons/website_form/i18n/da.po b/addons/website_form/i18n/da.po
index 19613e3d00e..621b49d5b43 100644
--- a/addons/website_form/i18n/da.po
+++ b/addons/website_form/i18n/da.po
@@ -6,12 +6,13 @@
 # Martin Trigaux, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
 # Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
+"PO-Revision-Date: 2018-08-24 09:34+0000\n"
 "Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
@@ -65,7 +66,7 @@ msgstr "Blacklist i webformularer"
 #. module: website_form
 #: model:ir.model,name:website_form.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_form
 #: code:addons/website_form/controllers/main.py:54
diff --git a/addons/website_forum/i18n/es_CO.po b/addons/website_forum/i18n/es_CO.po
index 98670d0e15b..ae35364bb4f 100644
--- a/addons/website_forum/i18n/es_CO.po
+++ b/addons/website_forum/i18n/es_CO.po
@@ -3207,9 +3207,6 @@ msgid ""
 "has been posted and require your validation. Click here to access the "
 "question :"
 msgstr ""
-"<p> Una nueva pregunta <i>%s </i> se ha realizado en el %s  y requiere su "
-"validación. <a href=\"%s/forum/%s/question/%s\"> Haga clic aquí para acceder "
-"a la pregunta. </a></p>"
 
 #. module: website_forum
 #: model_terms:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
diff --git a/addons/website_forum/i18n/es_EC.po b/addons/website_forum/i18n/es_EC.po
index f780da0bbde..c8984bd14a8 100644
--- a/addons/website_forum/i18n/es_EC.po
+++ b/addons/website_forum/i18n/es_EC.po
@@ -3222,9 +3222,6 @@ msgid ""
 "has been posted and require your validation. Click here to access the "
 "question :"
 msgstr ""
-"<P> Una nueva pregunta <i>%s </i> se ha realizado en el %s  y requiere su "
-"validación. <a href=\"%s/forum/%s/question/%s\"> Haga clic aquí para acceder "
-"a la pregunta. </a> </p>"
 
 #. module: website_forum
 #: model_terms:ir.ui.view,arch_db:website_forum.forum_post_template_new_answer
diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index a54867083c6..f5ed80b9ef0 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -2471,7 +2471,7 @@ msgstr ""
 
 #. module: website_forum
 #: model_terms:ir.ui.view,arch_db:website_forum.post_answers
-msgid "Send answer"
+msgid "Accept answer"
 msgstr ""
 
 #. module: website_forum
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 29b1f54466c..6e431f33ab9 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -925,7 +925,7 @@
                 <div t-if="question.post_type == 'question'" class="mt4">
                     <a t-attf-class="accept_answer fa fa-2x fa-check-circle no-decoration #{answer.is_correct and 'oe_answer_true' or 'oe_answer_false'} #{not answer.can_accept and 'karma_required' or ''}"
                         t-attf-data-karma="#{answer.karma_accept}"
-                        aria-label="Send answer" title="Send answer"
+                        aria-label="Send answer" title="Accept answer"
                         t-attf-data-href="/forum/#{slug(question.forum_id)}/post/#{slug(answer)}/toggle_correct"/>
                 </div>
             </t>
diff --git a/addons/website_livechat/i18n/da.po b/addons/website_livechat/i18n/da.po
index 5adf6ceda92..78f0840bd6d 100644
--- a/addons/website_livechat/i18n/da.po
+++ b/addons/website_livechat/i18n/da.po
@@ -5,15 +5,16 @@
 # Translators:
 # Martin Trigaux, 2018
 # JonathanStein <jstein@image.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-02 10:06+0000\n"
-"PO-Revision-Date: 2018-10-02 10:06+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:34+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr "Kanal"
 #. module: website_livechat
 #: model:ir.model,name:website_livechat.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_livechat
 #: model:ir.model.fields,help:website_livechat.field_im_livechat_channel__website_description
diff --git a/addons/website_mass_mailing/i18n/da.po b/addons/website_mass_mailing/i18n/da.po
index de1bc733429..fcf5de40673 100644
--- a/addons/website_mass_mailing/i18n/da.po
+++ b/addons/website_mass_mailing/i18n/da.po
@@ -5,15 +5,16 @@
 # Translators:
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:35+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +58,7 @@ msgstr "Skift nyhedsbrev"
 #. module: website_mass_mailing
 #: model:ir.model,name:website_mass_mailing.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_mass_mailing
 #: model_terms:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social
diff --git a/addons/website_membership/i18n/uk.po b/addons/website_membership/i18n/uk.po
index 1d52178e057..d04340b6cde 100644
--- a/addons/website_membership/i18n/uk.po
+++ b/addons/website_membership/i18n/uk.po
@@ -7,12 +7,13 @@
 # Martin Trigaux, 2018
 # ТАрас <tratatuta@i.ua>, 2018
 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
+"PO-Revision-Date: 2018-08-24 09:35+0000\n"
 "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n"
 "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +68,7 @@ msgstr "Учасники"
 #. module: website_membership
 #: model:ir.model,name:website_membership.model_membership_membership_line
 msgid "Membership Line"
-msgstr ""
+msgstr "Рядок членства"
 
 #. module: website_membership
 #: model_terms:ir.ui.view,arch_db:website_membership.index
diff --git a/addons/website_sale/i18n/da.po b/addons/website_sale/i18n/da.po
index 4ee29ee28bb..811aacf9ae7 100644
--- a/addons/website_sale/i18n/da.po
+++ b/addons/website_sale/i18n/da.po
@@ -837,7 +837,7 @@ msgstr "Beregn fragtomkostninger på ordrer"
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_sale
 #: model_terms:ir.ui.view,arch_db:website_sale.wizard_checkout
@@ -1000,7 +1000,7 @@ msgstr "Afgør visningsrækkefølgen i webshopmodulet"
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_digest_digest
 msgid "Digest"
-msgstr ""
+msgstr "Digest"
 
 #. module: website_sale
 #: model:ir.model.fields,field_description:website_sale.field_res_config_settings__module_website_sale_digital
@@ -1020,6 +1020,7 @@ msgstr "Vis navn"
 #, python-format
 msgid "Do not have access, skip this data for user's digest email"
 msgstr ""
+"Har ikke adgang, spring over disse data til brugerens opsummerings e-mail"
 
 #. module: website_sale
 #: selection:res.company,website_sale_onboarding_payment_acquirer_state:0
@@ -1166,7 +1167,7 @@ msgstr "HTML klasser"
 #. module: website_sale
 #: model:ir.model,name:website_sale.model_ir_http
 msgid "HTTP Routing"
-msgstr ""
+msgstr "HTTP Routing"
 
 #. module: website_sale
 #: model_terms:ir.ui.view,arch_db:website_sale.payment_sale_note
diff --git a/addons/website_sale/models/res_config_settings.py b/addons/website_sale/models/res_config_settings.py
index bceea238fa6..a3613339aed 100644
--- a/addons/website_sale/models/res_config_settings.py
+++ b/addons/website_sale/models/res_config_settings.py
@@ -16,7 +16,7 @@ class ResConfigSettings(models.TransientModel):
             return False
 
     salesperson_id = fields.Many2one('res.users', related='website_id.salesperson_id', string='Salesperson', readonly=False)
-    salesteam_id = fields.Many2one('crm.team', related='website_id.salesteam_id', string='Sales Team', domain=[('team_type', '!=', 'pos')])
+    salesteam_id = fields.Many2one('crm.team', related='website_id.salesteam_id', string='Sales Team', domain=[('team_type', '!=', 'pos')], readonly=False)
     module_website_sale_delivery = fields.Boolean("eCommerce Shipping Costs")
     # field used to have a nice radio in form view, resuming the 2 fields above
     sale_delivery_settings = fields.Selection([
diff --git a/addons/website_sale/models/res_partner.py b/addons/website_sale/models/res_partner.py
index 436f51206e8..8c5119db323 100644
--- a/addons/website_sale/models/res_partner.py
+++ b/addons/website_sale/models/res_partner.py
@@ -14,7 +14,9 @@ class ResPartner(models.Model):
     def _compute_last_website_so_id(self):
         SaleOrder = self.env['sale.order']
         for partner in self:
-            if request and hasattr(request, 'website') and not any([u._is_public() for u in partner.user_ids]):
+            is_public = any([u._is_public()
+                             for u in partner.with_context(active_test=False).user_ids])
+            if request and hasattr(request, 'website') and not is_public:
                 partner.last_website_so_id = SaleOrder.search([
                     ('partner_id', '=', partner.id),
                     ('team_id.team_type', '=', 'website'),
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 93915ad93fc..48173deecd2 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -46,7 +46,7 @@ class SaleOrder(models.Model):
         abandoned_delay = self.website_id and self.website_id.cart_abandoned_delay or 1.0
         abandoned_datetime = datetime.utcnow() - relativedelta(hours=abandoned_delay)
         for order in self:
-            domain = order.date_order <= abandoned_datetime and order.team_id.team_type == 'website' and order.state == 'draft' and order.partner_id.id != self.env.ref('base.public_partner').id and order.order_line
+            domain = order.date_order and order.date_order <= abandoned_datetime and order.team_id.team_type == 'website' and order.state == 'draft' and order.partner_id.id != self.env.ref('base.public_partner').id and order.order_line
             order.is_abandoned_cart = bool(domain)
 
     def _search_abandoned_cart(self, operator, value):
diff --git a/addons/website_sale/static/src/js/website_sale_options.js b/addons/website_sale/static/src/js/website_sale_options.js
index c671972abf6..7e1f01a6c0c 100644
--- a/addons/website_sale/static/src/js/website_sale_options.js
+++ b/addons/website_sale/static/src/js/website_sale_options.js
@@ -12,7 +12,7 @@ require('website_sale.website_sale');
 sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfiguratorMixin, {
     selector: '.oe_website_sale',
     read_events: {
-        'click #add_to_cart, #products_grid .product_price .a-submit': '_onClickAdd',
+        'click #add_to_cart, #products_grid .product_price .a-submit': 'async _onClickAdd',
     },
 
     /**
@@ -21,7 +21,6 @@ sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfig
     init: function () {
         this._super.apply(this, arguments);
 
-        this._handleAdd = _.debounce(this._handleAdd.bind(this), 200, true);
         this.isWebsite = true;
 
         delete this.events['change [data-attribute_exclusions]'];
@@ -42,7 +41,7 @@ sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfig
      */
     _onClickAdd: function (ev) {
         ev.preventDefault();
-        this._handleAdd($(ev.currentTarget).closest('form'));
+        return this._handleAdd($(ev.currentTarget).closest('form'));
     },
 
     /**
@@ -69,7 +68,7 @@ sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfig
             false
         );
 
-        productReady.done(function (productId){
+        return productReady.done(function (productId){
             $form.find(productSelector.join(', ')).val(productId);
 
             self.rootProduct = {
@@ -92,6 +91,8 @@ sAnimations.registry.WebsiteSaleOptions = sAnimations.Class.extend(ProductConfig
             self.optionalProductsModal.on('update_quantity', null, self._onOptionsUpdateQuantity.bind(self));
             self.optionalProductsModal.on('confirm', null, self._onModalConfirm.bind(self));
             self.optionalProductsModal.on('back', null, self._onModalBack.bind(self));
+
+            return self.optionalProductsModal.opened();
         });
     },
 
diff --git a/addons/website_sale_stock/i18n/da.po b/addons/website_sale_stock/i18n/da.po
index ebb3108e7bc..157f339e312 100644
--- a/addons/website_sale_stock/i18n/da.po
+++ b/addons/website_sale_stock/i18n/da.po
@@ -6,13 +6,15 @@
 # Martin Trigaux, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:35+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +54,7 @@ msgstr ""
 #. module: website_sale_stock
 #: model:ir.model,name:website_sale_stock.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_sale_stock
 #: model:ir.model.fields,field_description:website_sale_stock.field_product_product__custom_message
diff --git a/addons/website_slides/i18n/da.po b/addons/website_slides/i18n/da.po
index b88b39f8b06..d87d29fc81e 100644
--- a/addons/website_slides/i18n/da.po
+++ b/addons/website_slides/i18n/da.po
@@ -11,8 +11,8 @@
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
 # Pernille Kristensen <pernillekristensen1994@gmail.com>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-10-08 06:49+0000\n"
 "PO-Revision-Date: 2018-08-24 09:35+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -460,7 +460,7 @@ msgstr "Virksomhedskultur"
 #. module: website_slides
 #: model:ir.model,name:website_slides.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_slides
 #: model:ir.model.fields,field_description:website_slides.field_slide_slide__datas
diff --git a/addons/website_theme_install/i18n/da.po b/addons/website_theme_install/i18n/da.po
index 8fbeab7c33e..ec5004de28b 100644
--- a/addons/website_theme_install/i18n/da.po
+++ b/addons/website_theme_install/i18n/da.po
@@ -8,16 +8,17 @@
 # Per Rasmussen <perhgrasmussen@gmail.com>, 2018
 # Morten Schou <ms@msteknik.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # Ejner Sønniksen <ejner@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:35+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +90,7 @@ msgstr "Virksomheder"
 #. module: website_theme_install
 #: model:ir.model,name:website_theme_install.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_theme_install
 #: model:ir.actions.server,name:website_theme_install.theme_install_todo_action
diff --git a/addons/website_twitter/i18n/da.po b/addons/website_twitter/i18n/da.po
index 863b12d48e0..c7bc6f791a1 100644
--- a/addons/website_twitter/i18n/da.po
+++ b/addons/website_twitter/i18n/da.po
@@ -8,15 +8,16 @@
 # Morten Schou <ms@msteknik.dk>, 2018
 # JonathanStein <jstein@image.dk>, 2018
 # Jesper Carstensen <jc@danodoo.dk>, 2018
-# Sanne Kristensen <sanne@vkdata.dk>, 2018
 # lhmflexerp <lhm@flexerp.dk>, 2018
+# Sanne Kristensen <sanne@vkdata.dk>, 2018
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~11.5\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:18+0000\n"
-"PO-Revision-Date: 2018-09-21 13:18+0000\n"
-"Last-Translator: lhmflexerp <lhm@flexerp.dk>, 2018\n"
+"PO-Revision-Date: 2018-08-24 09:35+0000\n"
+"Last-Translator: Sanne Kristensen <sanne@vkdata.dk>, 2018\n"
 "Language-Team: Danish (https://www.transifex.com/odoo/teams/41243/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,7 +89,7 @@ msgstr ""
 #. module: website_twitter
 #: model:ir.model,name:website_twitter.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Konfigurer opsætning"
 
 #. module: website_twitter
 #: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
@@ -379,11 +380,6 @@ msgstr ""
 
 #. module: website_twitter
 #: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
-msgid "api_key.png"
-msgstr ""
-
-#. module: website_twitter
-#: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form
 msgid "https://apps.twitter.com/app/new"
 msgstr ""
author	Christophe Simonis <chs@odoo.com>	2018-11-29 20:06:16 +0100
committer	Christophe Simonis <chs@odoo.com>	2018-11-29 20:06:16 +0100
commit	ce4cc24621bf6430d7d3a2d469b375b59120c200 (patch)
tree	3837b5fe41ff88b24136ab53c871bc01f965cab1 /addons
parent	4d7aa97da38e497fef31a06543bfa5d2c8785708 (diff)
parent	82a1e1dcc33d7c123e50d3e1aacb5e127f57c521 (diff)