diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 6ea1c304c29..599e14ab1e7 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -3256,7 +3256,7 @@ msgstr "Configurer"
 #: code:addons/account/static/src/js/section_and_note_fields_backend.js:102
 #, python-format
 msgid "Configure a product"
-msgstr ""
+msgstr "Configurer un article"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_account_onboarding_invoice_layout
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index e2cbdea01d7..f2ca18af9c9 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -799,7 +799,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Account Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
@@ -3038,7 +3038,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Postavke"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -11935,13 +11935,6 @@ msgstr "za ovog dobavljača. Možete označiti ove račune kao plaćene."
 msgid "have been reconciled automatically."
 msgstr ""
 
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:44
-#, python-format
-msgid "o_manual_statement"
-msgstr ""
-
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "of the current month"
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 71970867f2a..60d435a6dc7 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -751,7 +751,7 @@ msgstr "Figyelmeztetés beállítható partnerenként (Könyvelés)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__access_warning
 msgid "Access warning"
-msgstr ""
+msgstr "Hozzáférési figyelmeztetés"
 
 #. module: account
 #. openerp-web
@@ -3639,7 +3639,7 @@ msgstr "Vevői befizetések"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__access_url
 msgid "Customer Portal URL"
-msgstr ""
+msgstr "Ügyfélportál URL-je"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_product_product__taxes_id
@@ -7408,7 +7408,7 @@ msgstr "Lejárt számlák, lejárt fizetési határidő"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_board_journal_1
 msgid "Overview"
-msgstr ""
+msgstr "Áttekintés"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -7897,7 +7897,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__access_url
 msgid "Portal Access URL"
-msgstr ""
+msgstr "Portálelérés URL-je"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_form
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 617fc9372fb..0491df8b8ec 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -4191,9 +4191,10 @@ msgid ""
 "used by itself, however it can still be used in a group. 'adjustment' is "
 "used to perform tax adjustment."
 msgstr ""
-"Bepaald waar de belasting selecteerbaar is. Note : 'None' betekend  dat een "
-"belasting niet gebruikt kan worden. Ze kan wel toegepast worden in een groep"
-" gebruikt. 'adjustment' is used to perform tax adjustment."
+"Bepaald waar de belasting selecteerbaar is. Opmerking: 'None' betekend  dat "
+"een belasting niet gebruikt kan worden. Ze kan wel toegepast worden in een "
+"groep gebruikt. 'aanpassing' wordt gebruikt om wijzigingen in belastingen te"
+" doen."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement__difference
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index e5c4b69b871..e26f26e9ed7 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -36,6 +36,7 @@
 # Martin Trigaux, 2019
 # Collex100, 2019
 # Sergo S, 2019
+# Vasiliy Korobatov <korobatov@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -43,7 +44,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-16 07:59+0000\n"
 "PO-Revision-Date: 2016-08-05 12:55+0000\n"
-"Last-Translator: Sergo S, 2019\n"
+"Last-Translator: Vasiliy Korobatov <korobatov@gmail.com>, 2019\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"
@@ -1004,7 +1005,7 @@ msgstr "Шаблон налогового счета"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_taxcloud
 msgid "Account TaxCloud"
-msgstr ""
+msgstr "Учет TaxCloud"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_chart_template_seacrh
@@ -1386,7 +1387,7 @@ msgstr "Корректировка налога"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__adjustment_type
 msgid "Adjustment Type"
-msgstr ""
+msgstr "Тип регулировки"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_tax_template_form
@@ -2192,7 +2193,7 @@ msgstr "Банковская выписка"
 #: code:addons/account/models/account_bank_statement.py:602
 #, python-format
 msgid "Bank Statement %s"
-msgstr ""
+msgstr "Банковская выписка %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_cashbox
@@ -11691,6 +11692,8 @@ msgid ""
 "You cannot change the currency of the company since some journal items "
 "already exist"
 msgstr ""
+"Вы не можете изменить валюту компании, так как некоторые записи журнала уже "
+"существуют"
 
 #. module: account
 #: code:addons/account/models/account.py:317
@@ -11910,7 +11913,7 @@ msgstr "Вы имеете"
 #: code:addons/account/models/account_payment.py:622
 #, python-format
 msgid "You have to define a sequence for %s in your company."
-msgstr ""
+msgstr "Вы должны определить последовательность для %s в вашей компании."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:50
@@ -12075,13 +12078,6 @@ msgstr ""
 msgid "have been reconciled automatically."
 msgstr ""
 
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:44
-#, python-format
-msgid "o_manual_statement"
-msgstr ""
-
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "of the current month"
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index ececfaa7de5..0e0adc23c2b 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,13 +13,13 @@
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2019
 # gezgin biri <gezginbiri@hotmail.com>, 2019
 # Ramiz Deniz Öner <deniz@denizoner.com>, 2019
-# Umur Akın <umura@projetgrup.com>, 2019
-# Ediz Duman <neps1192@gmail.com>, 2019
 # Martin Trigaux, 2019
 # Murat Kaplan <muratk@projetgrup.com>, 2019
 # Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2019
 # Buket Şeker <buket_skr@hotmail.com>, 2019
 # Metin Akın <aknmetin@gmail.com>, 2019
+# Umur Akın <umura@projetgrup.com>, 2019
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -27,7 +27,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-01-16 07:59+0000\n"
 "PO-Revision-Date: 2016-08-05 12:55+0000\n"
-"Last-Translator: Metin Akın <aknmetin@gmail.com>, 2019\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,7 +88,7 @@ msgstr "%s (kopya)"
 #: code:addons/account/models/account.py:695
 #, python-format
 msgid "%s Sequence"
-msgstr ""
+msgstr "%s Sıra"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
@@ -305,6 +305,11 @@ msgid ""
 "                        <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_invoice')]}\">Bill </span>\n"
 "                        <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_refund')]}\">Credit Note </span>"
 msgstr ""
+"<span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state','!=','draft'), ('type','!=','in_invoice')]}\">Taslak Fatura</span>\n"
+"                        <span class=\"o_form_label\" attrs=\"{'invisible': [('sequence_number_next_prefix','=',False)]}\">- İlk Numara:</span>\n"
+"                        <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state','!=','draft'), ('type','!=','in_refund')]}\">Taslak Alacak Notu</span>\n"
+"                        <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_invoice')]}\">Fatura </span>\n"
+"                        <span class=\"o_form_label\" attrs=\"{'invisible': ['|',('state', '=', 'draft'), ('type','!=','in_refund')]}\">Alacak Notu </span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
@@ -320,6 +325,8 @@ msgid ""
 "<span class=\"o_form_label\" attrs=\"{'invisible': [('match_amount', '!=', "
 "'between')]}\">and</span>"
 msgstr ""
+"<span class=\"o_form_label\" attrs=\"{'invisible': [('match_amount', '!=', "
+"'between')]}\">ve</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.validate_account_move_view
@@ -386,11 +393,13 @@ msgid ""
 "<span groups=\"account.group_show_line_subtotals_tax_excluded\">Amount</span>\n"
 "                                    <span groups=\"account.group_show_line_subtotals_tax_included\">Total Price</span>"
 msgstr ""
+"<span groups=\"account.group_show_line_subtotals_tax_excluded\">Tutar</span>\n"
+"                                    <span groups=\"account.group_show_line_subtotals_tax_included\">Toplam Fiyat</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span name=\"button_import_placeholder\"/> Statements"
-msgstr ""
+msgstr "<span name=\"button_import_placeholder\"/> Ekstreleri"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -400,7 +409,7 @@ msgstr "<span role=\"separator\">Yeni</span>"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span role=\"separator\">Reconciliation</span>"
-msgstr ""
+msgstr "<span role=\"separator\">Uzlaştırma</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -410,7 +419,7 @@ msgstr "<span role=\"separator\">Göster</span>"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span title=\"Balance in Odoo\">Balance in General Ledger</span>"
-msgstr ""
+msgstr "<span title=\"Balance in Odoo\">Hesap Bakiyesi</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
@@ -450,7 +459,7 @@ msgstr "<span>İnd.(%)</span>"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "<span>Import Bills</span>"
-msgstr ""
+msgstr "<span>Faturaları İçe Aktar</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document
@@ -546,7 +555,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.portal_invoice_page
 msgid "<strong class=\"text-muted\">Your Contact</strong>"
-msgstr ""
+msgstr "<strong class=\"text-muted\">İlgili Kişi</strong>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document_with_payments
@@ -797,6 +806,8 @@ msgid ""
 "Account %s (%s) does not allow reconciliation. First change the "
 "configuration of this account to allow it."
 msgstr ""
+"%s (%s)  hesap uzlaştırmaya izin vermiyor. Öncelikle izin vermek için bu "
+"hesabın yapılandırmasını değiştirin."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cash_rounding
@@ -1084,6 +1095,8 @@ msgid ""
 "Account that will be set on lines created in cash basis journal entry and "
 "used to keep track of the tax base amount."
 msgstr ""
+"Gerçekleşme esaslı yevmiye girişine oluşturulan ve vergi esaslı miktarı "
+"takip etmek için kayıtlarda kullanılacak hesap."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_fiscal_position_account__account_dest_id
@@ -1248,7 +1261,7 @@ msgstr "Bir Banka Ekle"
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_journal_form
 msgid "Add a journal"
-msgstr ""
+msgstr "Yevmiye ekle"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
@@ -1371,7 +1384,7 @@ msgstr "Yaşlandırılmış İş Ortağı Bakiyesi"
 #. module: account
 #: model:ir.model,name:account.model_report_account_report_agedpartnerbalance
 msgid "Aged Partner Balance Report"
-msgstr ""
+msgstr "Yaşlandırılmış İş Ortağı Bakiye Raporu"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__alias_id
@@ -1561,7 +1574,7 @@ msgstr "Fatura Para Birimi Tutarı"
 #: 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 "Tutar Eşleştirme"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_total_amount_param
@@ -1795,12 +1808,12 @@ msgstr "Uygulanabilirlik"
 #. module: account
 #: selection:tax.adjustments.wizard,adjustment_type:0
 msgid "Applied on credit journal item"
-msgstr ""
+msgstr "Alacak yevmiye kalemine uygulandı."
 
 #. module: account
 #: selection:tax.adjustments.wizard,adjustment_type:0
 msgid "Applied on debit journal item"
-msgstr ""
+msgstr "Borç yevmiye kalemine uygulandı"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_invoice_onboarding_invoice_layout_form
@@ -1908,6 +1921,7 @@ msgid ""
 "Attachments are linked to a document through model / res_id and to the "
 "message through this field."
 msgstr ""
+"Ekler, model / res_id üzerinden bir belgeye ve bu alandaki iletiye bağlanır."
 
 #. module: account
 #: selection:res.company,fiscalyear_last_month:0
@@ -1936,7 +1950,7 @@ msgstr "Yazanın Avatarı"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Auto-Complete"
-msgstr ""
+msgstr "Otomatik Tamamla"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__vendor_bill_id
@@ -1952,7 +1966,7 @@ msgstr "Kendiliğinden algıla"
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model__auto_reconcile
 #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__auto_reconcile
 msgid "Auto-validate"
-msgstr ""
+msgstr "Otomatik Doğrulama"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -2138,7 +2152,7 @@ msgstr "Banka Uzlaştırma Hareketi Önayarı"
 #: model:ir.model.fields,field_description:account.field_res_company__account_bank_reconciliation_start
 #: model:ir.model.fields,field_description:account.field_res_config_settings__account_bank_reconciliation_start
 msgid "Bank Reconciliation Threshold"
-msgstr ""
+msgstr "Banka Uzlaştırma Eşiği"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement
@@ -2231,7 +2245,7 @@ msgstr "Matrah Tutarı"
 #: model:ir.model.fields,field_description:account.field_account_tax__cash_basis_base_account_id
 #: model:ir.model.fields,field_description:account.field_account_tax_template__cash_basis_base_account_id
 msgid "Base Tax Received Account"
-msgstr ""
+msgstr "Temel Vergi Alınan Hesap"
 
 #. module: account
 #: code:addons/account/models/company.py:19
@@ -2270,7 +2284,7 @@ msgstr "Ödemeye Dayalı"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Batch Payments"
-msgstr ""
+msgstr "Toplu Ödeme"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__belongs_to_company
@@ -2324,7 +2338,7 @@ msgstr "Ödenecek Faturalar"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Bills to Validate"
-msgstr ""
+msgstr "Onaylanacak Faturalar"
 
 #. module: account
 #: code:addons/account/models/account_journal_dashboard.py:178
@@ -2812,7 +2826,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_reconciliation.xml:137
 #, python-format
 msgid "Choose counterpart or Create Write-off"
-msgstr ""
+msgstr "Karşı hesap seçin yada borcu silin"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice_refund__filter_refund
@@ -2848,6 +2862,8 @@ 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 ""
+"Faturanızı <b>doğrulamak için tıklayın.</b> Bu faturaya bir referans "
+"atanacak ve artık faturada değişikli yapamayacaksınız."
 
 #. module: account
 #. openerp-web
@@ -2937,7 +2953,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Common Journal Report"
-msgstr ""
+msgstr "Ortak Yevmiye Raporu"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -3256,7 +3272,7 @@ msgstr "Taslak İade/Fiyat Farkı oluşturun"
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_move_journal_line
 msgid "Create a journal entry"
-msgstr ""
+msgstr "Yevmiye girişi oluştur"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_group_tree
@@ -3287,7 +3303,7 @@ msgstr "Yeni Satınalınabilir Ürün Oluştur."
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_account_reconcile_model
 msgid "Create a new reconciliation model"
-msgstr ""
+msgstr "Yeni uzlaşma modeli oluşturun"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.product_product_action_sellable
@@ -3775,7 +3791,7 @@ msgstr "Tarihler"
 #: model:ir.model.fields,field_description:account.field_account_payment_term_line__day_of_the_month
 #: model_terms:ir.ui.view,arch_db:account.view_payment_term_line_tree
 msgid "Day of the month"
-msgstr ""
+msgstr "Ayın Günü"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment_term_line__day_of_the_month
@@ -4075,7 +4091,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
 msgid "Disc (%)"
-msgstr ""
+msgstr "İnd (%)"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_line__discount
@@ -4173,6 +4189,8 @@ msgid ""
 "Do not keep a copy of the email in the document communication history (mass "
 "mailing only)"
 msgstr ""
+"E-postanın bir kopyasını belge iletişim geçmişinde saklamayın (yalnızca "
+"toplu postalama)"
 
 #. module: account
 #: selection:res.company,account_dashboard_onboarding_state:0
@@ -4490,7 +4508,7 @@ msgstr "Gemide Masrafsız (FOB)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__starred_partner_ids
 msgid "Favorited By"
-msgstr ""
+msgstr "Favori"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_search
@@ -4684,12 +4702,12 @@ msgstr "Tekipçiler (İş ortakları)"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__inbound_payment_method_ids
 msgid "For Incoming Payments"
-msgstr ""
+msgstr "Gelen Ödemeler İçin"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_journal__outbound_payment_method_ids
 msgid "For Outgoing Payments"
-msgstr ""
+msgstr "Giden Ödemeler İçin"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment_term_line__value_amount
@@ -4874,7 +4892,7 @@ msgstr "Yapılandırma paneline git"
 #: code:addons/account/models/company.py:482
 #, python-format
 msgid "Go to the journal configuration"
-msgstr ""
+msgstr "Yevmiye yapılandırmasına git"
 
 #. module: account
 #: selection:res.partner,trust:0
@@ -5481,7 +5499,7 @@ msgstr ""
 #: model:ir.model.fields,field_description:account.field_account_account__internal_group
 #: model:ir.model.fields,field_description:account.field_account_account_type__internal_group
 msgid "Internal Group"
-msgstr ""
+msgstr "İç Grup"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move__narration
@@ -5749,7 +5767,7 @@ msgstr "Fatura borçları"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Invoices to Validate"
-msgstr ""
+msgstr "Doğrulanacak Faturalar"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_payment__reconciled_invoice_ids
@@ -6030,7 +6048,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__journal_currency_id
 msgid "Journal's Currency"
-msgstr ""
+msgstr "Yevmiye Para Birimi"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_form
@@ -6068,7 +6086,7 @@ msgstr "Haziran"
 #: selection:res.company,account_setup_coa_state:0
 #: selection:res.company,account_setup_fy_data_state:0
 msgid "Just done"
-msgstr ""
+msgstr "Yeni bitti"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard__reason
@@ -6426,7 +6444,7 @@ msgstr ""
 #. module: account
 #: selection:account.setup.bank.manual.config,create_or_link_option:0
 msgid "Link to an existing journal"
-msgstr ""
+msgstr "Mevcut bir yevmiyeyi kullan"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__move_id
@@ -6627,7 +6645,7 @@ msgstr "Toplu Postalama Kampanya"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__mass_mailing_name
 msgid "Mass Mailing Name"
-msgstr ""
+msgstr "Toplu Posta Adı"
 
 #. module: account
 #: selection:account.reconcile.model,match_label:0
@@ -6949,7 +6967,7 @@ msgstr "Sonraki Sayı"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__sequence_number_next_prefix
 msgid "Next Number Prefix"
-msgstr ""
+msgstr "Sonraki Numara Öneki"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__blocked
@@ -7142,7 +7160,7 @@ msgstr "Eylem gerektiren mesaj sayısı"
 #: model:ir.model.fields,help:account.field_account_invoice__message_has_error_counter
 #: model:ir.model.fields,help:account.field_account_payment__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr ""
+msgstr "Teslimat hatası olan mesaj sayısı"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_bank_statement__message_unread_counter
@@ -7546,7 +7564,7 @@ msgstr "İş Ortağı Şirketi"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report__country_id
 msgid "Partner Company's Country"
-msgstr ""
+msgstr "İş Ortağı Şirket Ülkesi"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_partner__contract_ids
@@ -7678,7 +7696,7 @@ msgstr "Ödeme Yöntem Türü"
 #: model_terms:ir.ui.view,arch_db:account.view_account_bank_journal_form
 #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form
 msgid "Payment Method Types"
-msgstr ""
+msgstr "Ödeme Yöntemi Türleri"
 
 #. module: account
 #. openerp-web
@@ -7710,7 +7728,7 @@ msgstr "Ödeme Makbuzu:"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__reference
 msgid "Payment Ref."
-msgstr ""
+msgstr "Ödeme Ref."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment__payment_reference
@@ -7889,7 +7907,7 @@ msgstr "Planlanan"
 #: code:addons/account/models/account_invoice.py:1187
 #, python-format
 msgid "Please add at least one invoice line."
-msgstr ""
+msgstr "Lütfen en az bir fatura satırı ekleyin."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:27
@@ -8036,7 +8054,7 @@ msgstr "Önizle"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_invoice_send_wizard_form
 msgid "Preview as a PDF"
-msgstr ""
+msgstr "PDF olarak önizle"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_form
@@ -8163,7 +8181,7 @@ msgstr "Satınalma"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form
 msgid "Purchase Representative"
-msgstr ""
+msgstr "Satınalma Temsilcisi"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -8209,7 +8227,7 @@ msgstr "Miktar:"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_value
 msgid "Rating Value"
-msgstr ""
+msgstr "Değerlendirme Puanı"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_refund__description
@@ -8244,7 +8262,7 @@ msgstr "Alacak Hesapları"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_report__account_id
 msgid "Receivable/Payable Account"
-msgstr ""
+msgstr "Alacak / Borç Hesabı"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.product_template_form_view
@@ -8273,7 +8291,7 @@ msgstr "Alıcılar"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_move_line__recompute_tax_line
 msgid "Recompute Tax Line"
-msgstr ""
+msgstr "Vergi Satırını Yeniden Hesapla"
 
 #. module: account
 #. openerp-web
@@ -8306,7 +8324,7 @@ msgstr "Uzlaştırılmış"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment__reconciled_invoice_ids
 msgid "Reconciled Invoices"
-msgstr ""
+msgstr "Uzlaştırılmış Faturalar"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_move_form
@@ -8436,7 +8454,7 @@ msgstr ""
 #: model_terms:ir.actions.act_window,help:account.action_account_payments_payable
 #: model_terms:ir.actions.act_window,help:account.action_account_payments_transfer
 msgid "Register a payment"
-msgstr ""
+msgstr "Ödeme kaydet"
 
 #. module: account
 #: selection:account.account.type,type:0
@@ -8456,7 +8474,7 @@ msgstr "İlgili Döküman Modeli"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_ids
 msgid "Related ratings"
-msgstr ""
+msgstr "İlişkili değerlendirmeler"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__residual_company_signed
@@ -8990,7 +9008,7 @@ msgstr "Eposta Gönder"
 #: code:addons/account/models/account_invoice.py:622
 #, python-format
 msgid "Send Invoice"
-msgstr ""
+msgstr "Fatura Gönder"
 
 #. module: account
 #: selection:account.abstract.payment,payment_type:0
@@ -9007,12 +9025,12 @@ msgstr "E-postayla Makbuz Gönder"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_account_onboarding_sample_invoice
 msgid "Send a sample invoice"
-msgstr ""
+msgstr "Örnek fatura gönder"
 
 #. 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 "Müşteri portalını test etmek için bir fatura gönderin."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
@@ -9395,6 +9413,10 @@ msgid ""
 "Today: Activity date is today\n"
 "Planned: Future activities."
 msgstr ""
+"Etkinliklerdeki aşamalar\n"
+"Zamanı Geçmiş: Tarihi geçmiş \n"
+"Bugün: Etkinlik günü bugün\n"
+"Planlanan: Gelecek etkinlikler."
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step
@@ -10267,7 +10289,7 @@ msgstr ""
 #: code:addons/account/models/company.py:161
 #, python-format
 msgid "The lock date for advisors is irreversible and can't be removed."
-msgstr ""
+msgstr "Müşavirler için kilit tarihleri geri alınamaz ve değiştirilemez."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_move_line__move_id
@@ -10285,6 +10307,8 @@ msgstr "Hesap hareket satırlarında kullanılacak ad"
 msgid ""
 "The new lock date for advisors must be set after the previous lock date."
 msgstr ""
+"Müşavirler için yeni kilit tarihi, önceki kilit tarihinden sonraya "
+"ayarlanmalıdır."
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_journal__refund_sequence_number_next
@@ -10995,6 +11019,8 @@ msgid ""
 "Tracked values are stored in a separate model. This field allow to "
 "reconstruct the tracking and to generate statistics on the model."
 msgstr ""
+"Takip edilen değerler ayrı modellerde depolanır. Bu alan, takip etmeyi "
+"yeniden oluşturmaya ve model üzerinde istatistik oluşturmanıza imkan verir."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice_send__tracking_value_ids
@@ -11718,6 +11744,9 @@ msgid ""
 "You cannot define stricter conditions on advisors than on users. Please make"
 " sure that the lock date on advisor is set before the lock date for users."
 msgstr ""
+"Müşavirler için, kullanıcılardan daha katı kurallar tanımlayamazsınız. "
+"Lütfen, müşavirler için tanımladığınız kilit tarihinin, kullanıcılar için "
+"tanımlanan kilit tarihinden önce olduğuna emin olun."
 
 #. module: account
 #: code:addons/account/models/account_payment.py:583
@@ -11785,6 +11814,8 @@ msgid ""
 "You cannot have a receivable/payable account that is not reconcilable. "
 "(account code: %s)"
 msgstr ""
+"Uzlaştırılamayan bir alacak / borç hesabına sahip olamazsınız. (hesap kodu: "
+"%s)"
 
 #. module: account
 #: code:addons/account/models/account.py:76
@@ -11801,6 +11832,8 @@ msgid ""
 "You cannot lock a period that is not finished yet. Please make sure that the"
 " lock date for advisors is not set after the last day of the previous month."
 msgstr ""
+"Henüz bitmemiş bir dönemi kilitleyemezsiniz. Lütfen müşavirler için kilit "
+"tarihini, önceki ayın son gününden sonraya ayarlamadığınızdan emin olun."
 
 #. module: account
 #. openerp-web
@@ -11872,6 +11905,8 @@ msgid ""
 "You cannot set a currency on this account as it already has some journal "
 "entries having a different foreign currency."
 msgstr ""
+"Farklı para biriminde yevmiye kayıtları olduğu için bu hesap üzerinde bir "
+"para birimi tanımlayamazsınız."
 
 #. module: account
 #: code:addons/account/models/account.py:301
@@ -11918,7 +11953,7 @@ msgstr "Var"
 #: code:addons/account/models/account_payment.py:622
 #, python-format
 msgid "You have to define a sequence for %s in your company."
-msgstr ""
+msgstr "Şirketiniz için %s bir dizi tanımlamanız gerekmekte."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:50
@@ -12082,13 +12117,6 @@ msgstr ""
 msgid "have been reconciled automatically."
 msgstr ""
 
-#. module: account
-#. openerp-web
-#: code:addons/account/static/src/xml/account_reconciliation.xml:44
-#, python-format
-msgid "o_manual_statement"
-msgstr ""
-
 #. module: account
 #: selection:account.payment.term.line,option:0
 msgid "of the current month"
@@ -12147,7 +12175,7 @@ msgstr "ana şirket"
 #: code:addons/account/static/src/xml/account_reconciliation.xml:55
 #, python-format
 msgid "transactions in"
-msgstr ""
+msgstr "İşlemler"
 
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__amount_by_group
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 485989d2cd2..d4cf685f529 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -42,6 +42,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 ""
+" * Статус \"Чернетка\" використовується, коли користувач кодує новий і непідтверджений рахунок.\n"
+" * Статус \"Відкрито\" використовується, коли користувач створює рахунок-фактуру, генерується номер рахунку-фактури. Він залишається у відкритому стані, поки користувач не оплатить рахунок.\n"
+" * Статус \"В оплаті\" використовується, коли платежі були зареєстровані для загального рахунку в журналі, налаштованому для розміщення записів тільки при узгодженні банківської виписки, а деякі з них ще не узгоджені з рядком банківської виписки.\n"
+" * Статус \"Оплачено\" встановлюється автоматично після оплати рахунка-фактури. Його пов'язані записи журналу можуть або не можуть бути узгоджені.\n"
+" * Статус \"Скасовано\" використовується, коли користувач скасовує рахунок-фактуру."
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits
@@ -158,6 +163,22 @@ msgid ""
 "    </p>\n"
 "</div>\n"
 msgstr ""
+"<?xml version=\"1.0\"?>\n"
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"    <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>${format_amount(object.amount, object.currency_id)}</strong> від ${object.company_id.name}.\n"
+"        <br/><br/>\n"
+"        Не соромтеся звертатися до нас, якщо у вас виникли питання.\n"
+"        <br/><br/>\n"
+"       З найкращими побажаннями,<br/>\n"
+"        % if user and user.signature:\n"
+"        ${user.signature | safe}\n"
+"        % endif\n"
+"    </p>\n"
+"</div>\n"
 
 #. module: account
 #: model:mail.template,body_html:account.email_template_edi_invoice
@@ -191,6 +212,34 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"    <p style=\"margin: 0px; padding: 0px; font-size: 13px;\">\n"
+"        Шановий(а) ${object.partner_id.name}\n"
+"        % if object.partner_id.parent_id:\n"
+"            (${object.partner_id.parent_id.name})\n"
+"        % endif\n"
+"        <br/><br/>\n"
+"        Це ваш рахунок \n"
+"        % if object.number:\n"
+"            invoice <strong>${object.number}</strong>\n"
+"        % else:\n"
+"            invoice\n"
+"        %endif\n"
+"        % if object.origin:\n"
+"            (with reference: ${object.origin})\n"
+"        % endif\n"
+"        у сумі <strong>${format_amount(object.amount_total, object.currency_id)}</strong>\n"
+"        від ${object.company_id.name}.\n"
+"        % if object.state=='paid':\n"
+"            Цей рахунок вже оплачено.\n"
+"        % else:\n"
+"            Здійсніть платіж якомога швидше.\n"
+"        % endif\n"
+"        <br/><br/>\n"
+"        Не соромтеся зв'язатися з нами, якщо у вас є запитання.\n"
+"    </p>\n"
+"</div>\n"
+"            "
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.portal_my_home_menu_invoice
@@ -358,6 +407,8 @@ msgid ""
 "<span class=\"o_form_label\">All selected journal entries will be validated "
 "and posted. You won't be able to modify them afterwards.</span>"
 msgstr ""
+"<span class=\"o_form_label\">Всі вибрані записи журналу будуть перевірені та"
+" опубліковані. Після цього ви не зможете змінити їх.</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
@@ -412,6 +463,8 @@ msgid ""
 "<span class=\"text-muted\">Only journals not yet linked to a bank account "
 "are proposed</span>"
 msgstr ""
+"<span class=\"text-muted\">Запропоновано лише журнали, які ще не пов'язані з"
+" банківським рахунком</span>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.report_invoice_document
@@ -577,6 +630,8 @@ msgid ""
 "<strong class=\"text-center\">The SEPA QR Code informations are not set "
 "correctly.</strong><br/>"
 msgstr ""
+"<strong class=\"text-center\">Інформація QR-коду SEPA не встановлена "
+"правильно.</strong><br/>"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.portal_invoice_page
@@ -714,7 +769,7 @@ msgstr "Тільки один рядок терміну оплати повин
 #: code:addons/account/models/account.py:861
 #, python-format
 msgid "A bank account can belong to only one journal."
-msgstr ""
+msgstr "Банківський рахунок може належати лише одному журналу."
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -730,7 +785,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_bank_statement_line
 msgid "A bank statement line is a financial transaction on a bank account"
-msgstr ""
+msgstr "Банківська виписка - це фінансова операція на банківському рахунку"
 
 #. module: account
 #: model_terms:ir.actions.act_window,help:account.action_move_journal_line
@@ -759,6 +814,10 @@ msgid ""
 "posted. Those will be posted automatically after performing the bank "
 "reconciliation."
 msgstr ""
+"Запис журналу платежів, згенерований у журналі, налаштований для публікації "
+"записів тільки тоді, коли платежі узгоджуються з випискою банку, не може "
+"бути опубліковано вручну. Вони будуть опубліковані автоматично після "
+"виконання банківської звірки."
 
 #. module: account
 #: code:addons/account/models/reconciliation_widget.py:692
@@ -792,6 +851,7 @@ msgstr "Вибраний рядок заяви вже був узгоджени
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only one time on same taxes."
 msgstr ""
+"Схема оподаткування може бути визначена лише один раз на однакові податки."
 
 #. module: account
 #: model:res.groups,name:account.group_warning_account
@@ -834,11 +894,13 @@ msgid ""
 "Account %s (%s) does not allow reconciliation. First change the "
 "configuration of this account to allow it."
 msgstr ""
+"Рахунок %s (%s) не дозволяє узгодження. Спочатку змініть налаштування цього "
+"рахунку, щоби дозволити узгодження."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cash_rounding
 msgid "Account Cash Rounding"
-msgstr ""
+msgstr "Округлення рахунку в бухобліку"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -1313,7 +1375,7 @@ msgstr "Додати примітку"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form
 msgid "Add a payment QR code to your invoices"
-msgstr ""
+msgstr "Додайте QR-код оплати до ваших рахунків"
 
 #. module: account
 #: selection:account.cash.rounding,strategy:0
@@ -2376,7 +2438,7 @@ msgstr "Рахунки до оплати"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
 msgid "Bills to Validate"
-msgstr ""
+msgstr "Рахунки для перевірки"
 
 #. module: account
 #: code:addons/account/models/account_journal_dashboard.py:178
@@ -6564,7 +6626,7 @@ msgstr "Введіть внутрішню примітку"
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_invoice_layout_step
 msgid "Looks great!"
-msgstr ""
+msgstr "Виглядає чудово!"
 
 #. module: account
 #: code:addons/account/models/account_bank_statement.py:175
@@ -7794,7 +7856,7 @@ msgstr "Квитанція про оплату:"
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__reference
 msgid "Payment Ref."
-msgstr ""
+msgstr "Референс оплати"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_payment__payment_reference
@@ -9110,7 +9172,7 @@ msgstr ""
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.onboarding_sample_invoice_step
 msgid "Send sample"
-msgstr ""
+msgstr "Надіслати зразок"
 
 #. module: account
 #: selection:account.payment,state:0
@@ -9753,7 +9815,7 @@ msgstr ""
 #. module: account
 #: model:ir.model.fields,field_description:account.field_account_invoice__amount_by_group
 msgid "Tax amount by group"
-msgstr ""
+msgstr "Сума податку за групами"
 
 #. module: account
 #: model:ir.model.fields,field_description:account.field_res_config_settings__tax_calculation_rounding_method
@@ -12277,7 +12339,7 @@ msgstr "транзакція в"
 #. module: account
 #: model:ir.model.fields,help:account.field_account_invoice__amount_by_group
 msgid "type: [(name, amount, base, formated amount, formated base)]"
-msgstr ""
+msgstr "type: [(name, amount, base, formated amount, formated base)]"
 
 #. module: account
 #: model_terms:ir.ui.view,arch_db:account.view_bank_statement_form
diff --git a/addons/account/models/account_journal_dashboard.py b/addons/account/models/account_journal_dashboard.py
index c0be7dad2d7..f815820da4a 100644
--- a/addons/account/models/account_journal_dashboard.py
+++ b/addons/account/models/account_journal_dashboard.py
@@ -392,12 +392,11 @@ class account_journal(models.Model):
             'journal_type': self.type,
             'default_journal_id': self.id,
             'default_type': invoice_type,
-            'type': invoice_type
+            'type': invoice_type,
+            'search_default_journal_id': self.id,
         })
 
         [action] = self.env.ref('account.%s' % action_name).read()
-        if not self.env.context.get('use_domain'):
-            ctx['search_default_journal_id'] = self.id
         action['context'] = ctx
         action['domain'] = self._context.get('use_domain', [])
         account_invoice_filter = self.env.ref('account.view_account_invoice_filter', False)
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index d8a7a9c7cc5..42138b29f8e 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -655,6 +655,7 @@
                 <search string="Search Invoice">
                     <field name="number" string="Invoice" filter_domain="['|','|','|', ('number','ilike',self), ('origin','ilike',self), ('reference', 'ilike', self), ('partner_id', 'child_of', self)]"/>
                     <filter domain="[('user_id','=',uid)]" name="myinvoices" help="My Invoices"/>
+                    <field name="journal_id"/>
                     <separator/>
                     <filter name="draft" string="Draft" domain="[('state','=','draft')]"/>
                     <filter name="unpaid" string="Open" domain="[('state', '=', 'open')]"/>
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index da5e493ea26..d6316fa4f8e 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -5,10 +5,9 @@
 # Translators:
 # Erwin van der Ploeg <erwin@odooexperts.nl>, 2016
 # Martin Trigaux, 2016
-# Yenthe Van Ginneken <yenthespam@gmail.com>, 2017
 # Cas Vissers <casvissers@brahoo.nl>, 2017
 # Eric Geens <ericgeens@yahoo.com>, 2018
-# Wynand Tastenhoye <wta@odoo.com>, 2018
+# Yenthe Van Ginneken <yenthespam@gmail.com>, 2018
 # 
 msgid ""
 msgstr ""
@@ -16,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
 "PO-Revision-Date: 2016-08-05 12:55+0000\n"
-"Last-Translator: Wynand Tastenhoye <wta@odoo.com>, 2018\n"
+"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n"
 "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,8 +50,8 @@ msgid ""
 "An analytic default requires at least an analytic account or an analytic "
 "tag."
 msgstr ""
-"Een analytische standaardwaarde vereist ten minste een analytische rekening "
-"of een analytische tag."
+"Een kostenplaats standaardwaarde vereist ten minste een kostenplaats "
+"rekening of een kostenplaats label."
 
 #. module: account_analytic_default
 #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default__analytic_id
diff --git a/addons/account_bank_statement_import/i18n/tr.po b/addons/account_bank_statement_import/i18n/tr.po
index b44e82c7c77..82386eb3c00 100644
--- a/addons/account_bank_statement_import/i18n/tr.po
+++ b/addons/account_bank_statement_import/i18n/tr.po
@@ -6,6 +6,7 @@
 # Levent Karakaş <levent@mektup.at>, 2017
 # Umur Akın <umura@projetgrup.com>, 2018
 # Murat Kaplan <muratk@projetgrup.com>, 2018
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2016-08-05 12:55+0000\n"
-"Last-Translator: Murat Kaplan <muratk@projetgrup.com>, 2018\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -287,12 +288,12 @@ msgstr "Dosya Adı"
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__inbound_payment_method_ids
 msgid "For Incoming Payments"
-msgstr ""
+msgstr "Gelen Ödemeler İçin"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation__outbound_payment_method_ids
 msgid "For Outgoing Payments"
-msgstr ""
+msgstr "Giden Ödemeler İçin"
 
 #. module: account_bank_statement_import
 #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import__data_file
diff --git a/addons/account_check_printing/i18n/hr.po b/addons/account_check_printing/i18n/hr.po
index febb8e6d584..a06a746186f 100644
--- a/addons/account_check_printing/i18n/hr.po
+++ b/addons/account_check_printing/i18n/hr.po
@@ -39,7 +39,7 @@ msgstr "Ček memo ne može sadržavati više od 60 znakova."
 #. module: account_check_printing
 #: model:ir.model,name:account_check_printing.model_account_chart_template
 msgid "Account Chart Template"
-msgstr ""
+msgstr "Predložak kontnog plana"
 
 #. module: account_check_printing
 #: model:ir.model.fields,help:account_check_printing.field_res_company__account_check_printing_margin_left
@@ -159,7 +159,7 @@ msgstr ""
 #. module: account_check_printing
 #: model:ir.model,name:account_check_printing.model_res_config_settings
 msgid "Config Settings"
-msgstr ""
+msgstr "Postavke"
 
 #. module: account_check_printing
 #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks__create_uid
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index c9788ab956f..07546100642 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -4,12 +4,12 @@
 # 
 # Translators:
 # Saban Yildiz <sabany@projetgrup.com>, 2017
-# Ediz Duman <neps1192@gmail.com>, 2017
 # Martin Trigaux, 2017
 # Hakan ıı, 2017
 # Murat Kaplan <muratk@projetgrup.com>, 2017
-# Umur Akın <umura@projetgrup.com>, 2018
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2019
+# Umur Akın <umura@projetgrup.com>, 2019
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-18 09:49+0000\n"
 "PO-Revision-Date: 2017-12-13 14:50+0000\n"
-"Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2019\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,21 +41,23 @@ msgid ""
 "<i class=\"fa fa-arrow-circle-right\"/><span class=\"d-none d-md-inline\"> "
 "Pay Now</span>"
 msgstr ""
+"<i class=\"fa fa-arrow-circle-right\"/><span class=\"d-none d-md-inline\"> "
+"Şimdi Öde</span>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
 msgid "<i class=\"fa fa-fw fa-arrow-circle-right\"/> Pay Now"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-arrow-circle-right\"/> Şimdi Öde"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
 msgid "<i class=\"fa fa-fw fa-check-circle\"/> Paid"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-check-circle\"/> Ödendi"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
 msgid "<i class=\"fa fa-fw fa-check-circle\"/> Pending"
-msgstr ""
+msgstr "<i class=\"fa fa-fw fa-check-circle\"/> Bekliyor"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_page_inherit_payment
@@ -63,6 +65,8 @@ msgid ""
 "<i class=\"fa fa-info\"/> You have credits card registered, you can log-in "
 "to be able to use them."
 msgstr ""
+"<i class=\"fa fa-info\"/> Kayıtlı bir kredi kartınız var, kullanabilmek için"
+" giriş yapabilirsiniz."
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
@@ -70,6 +74,8 @@ msgid ""
 "<span class=\"badge badge-pill badge-danger\"><i class=\"fa fa-fw fa-"
 "remove\"/><span class=\"d-none d-md-inline\"> Cancelled</span></span>"
 msgstr ""
+"<span class=\"badge badge-pill badge-danger\"><i class=\"fa fa-fw fa-"
+"remove\"/><span class=\"d-none d-md-inline\"> İptal Edildi</span></span>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
@@ -78,6 +84,9 @@ msgid ""
 "clock-o\"/><span class=\"d-none d-md-inline\"> Waiting for "
 "Payment</span></span>"
 msgstr ""
+"<span class=\"badge badge-pill badge-info\"><i class=\"fa fa-fw fa-"
+"clock-o\"/><span class=\"d-none d-md-inline\"> Ödeme "
+"Bekleniyor</span></span>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
@@ -92,6 +101,8 @@ msgid ""
 "<span class=\"badge badge-pill badge-success\"><i class=\"fa fa-fw fa-"
 "check\"/><span class=\"d-none d-md-inline\"> Paid</span></span>"
 msgstr ""
+"<span class=\"badge badge-pill badge-success\"><i class=\"fa fa-fw fa-"
+"check\"/><span class=\"d-none d-md-inline\"> Ödendi</span></span>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
@@ -99,6 +110,8 @@ msgid ""
 "<span class=\"badge badge-pill badge-warning\"><span class=\"d-none d-md-"
 "inline\"> Pending</span></span>"
 msgstr ""
+"<span class=\"badge badge-pill badge-warning\"><span class=\"d-none d-md-"
+"inline\"> Bekliyor</span></span>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_success
@@ -106,6 +119,8 @@ msgid ""
 "Done, your online payment has been successfully processed. Thank you for "
 "your order."
 msgstr ""
+"Tamam, çevrimiçi ödemeniz başarıyla işlendi. Siparişiniz için teşekkür "
+"ederiz."
 
 #. module: account_payment
 #: code:addons/account_payment/controllers/payment.py:47
@@ -132,7 +147,7 @@ msgstr "Şimdi Öde"
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_my_invoices_payment
 msgid "Pay now"
-msgstr ""
+msgstr "Şimdi Öde"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_payment
@@ -165,7 +180,7 @@ msgstr ""
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_error
 msgid "There was an error processing your payment: transaction failed.<br/>"
-msgstr ""
+msgstr "Ödeme işlemi sırasında bir sorun oluştu: işlem başarısız. <br/>"
 
 #. module: account_payment
 #: model_terms:ir.ui.view,arch_db:account_payment.portal_invoice_error
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 51dc0194577..7f0311c836e 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -8,7 +8,6 @@
 # Gökhan Erdoğdu <gokhan.erdogdu@mechsoft.com.tr>, 2017
 # gezgin biri <gezginbiri@hotmail.com>, 2017
 # Fırat Kaya <firat.kaya@mechsoft.com.tr>, 2017
-# Ediz Duman <neps1192@gmail.com>, 2017
 # Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2018
 # Martin Trigaux, 2018
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2018
@@ -16,6 +15,7 @@
 # Ramiz Deniz Öner <deniz@denizoner.com>, 2018
 # Murat Kaplan <muratk@projetgrup.com>, 2019
 # Buket Şeker <buket_skr@hotmail.com>, 2019
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2016-08-05 12:55+0000\n"
-"Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2019\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -379,7 +379,7 @@ msgstr "Eylem gerektiren mesaj sayısı"
 #. module: account_voucher
 #: model:ir.model.fields,help:account_voucher.field_account_voucher__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr ""
+msgstr "Teslimat hatası olan mesaj sayısı"
 
 #. module: account_voucher
 #: model:ir.model.fields,help:account_voucher.field_account_voucher__message_unread_counter
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index 954f14b7993..dfb45f30daf 100644
--- a/addons/analytic/i18n/tr.po
+++ b/addons/analytic/i18n/tr.po
@@ -12,10 +12,10 @@
 # Mehmet Demirel <mdemirell@gmail.com>, 2018
 # Ramiz Deniz Öner <deniz@denizoner.com>, 2018
 # Metin Akın <aknmetin@gmail.com>, 2018
-# Ediz Duman <neps1192@gmail.com>, 2018
 # Martin Trigaux, 2019
 # Murat Kaplan <muratk@projetgrup.com>, 2019
 # Buket Şeker <buket_skr@hotmail.com>, 2019
+# Ediz Duman <neps1192@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-09-21 13:17+0000\n"
 "PO-Revision-Date: 2016-08-05 12:56+0000\n"
-"Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2019\n"
+"Last-Translator: Ediz Duman <neps1192@gmail.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -444,7 +444,7 @@ msgstr "Eylem gerektiren mesaj sayısı"
 #. module: analytic
 #: model:ir.model.fields,help:analytic.field_account_analytic_account__message_has_error_counter
 msgid "Number of messages with delivery error"
-msgstr ""
+msgstr "Teslimat hatası olan mesaj sayısı"
 
 #. module: analytic
 #: model:ir.model.fields,help:analytic.field_account_analytic_account__message_unread_counter
diff --git a/addons/board/static/src/js/board_view.js b/addons/board/static/src/js/board_view.js
index 0d9c90beb0e..bcfc892213d 100644
--- a/addons/board/static/src/js/board_view.js
+++ b/addons/board/static/src/js/board_view.js
@@ -120,7 +120,6 @@ var BoardController = FormController.extend({
 
 var BoardRenderer = FormRenderer.extend({
     custom_events: _.extend({}, FormRenderer.prototype.custom_events, {
-        do_action: '_onDoAction',
         update_filters: '_onUpdateFilters',
         switch_view: '_onSwitchView',
     }),
diff --git a/addons/board/static/tests/dashboard_tests.js b/addons/board/static/tests/dashboard_tests.js
index 6b3f98cd3eb..19e3ec8c6bd 100644
--- a/addons/board/static/tests/dashboard_tests.js
+++ b/addons/board/static/tests/dashboard_tests.js
@@ -25,19 +25,23 @@ QUnit.module('Dashboard', {
                     display_name: {string: "Displayed name", type: "char", searchable: true},
                     foo: {string: "Foo", type: "char", default: "My little Foo Value", searchable: true},
                     bar: {string: "Bar", type: "boolean"},
+                    int_field: {string: "Integer field", type: "integer"},
                 },
                 records: [{
                     id: 1,
                     display_name: "first record",
                     foo: "yop",
+                    int_field: 3,
                 }, {
                     id: 2,
                     display_name: "second record",
                     foo: "lalala",
+                    int_field: 5,
                 }, {
                     id: 4,
                     display_name: "aaa",
                     foo: "abc",
+                    int_field: 2,
                 }],
             },
         };
@@ -859,4 +863,47 @@ QUnit.test("Dashboard should use correct groupby", function (assert) {
 
     form.destroy();
 });
+
+QUnit.test('click on a cell of pivot view inside dashboard', function (assert) {
+    assert.expect(3);
+
+    var form = createView({
+        View: BoardView,
+        model: 'board',
+        data: this.data,
+        arch: '<form>' +
+                '<board style="2-1">' +
+                    '<column>' +
+                        '<action view_mode="pivot" string="ABC" name="51"></action>' +
+                    '</column>' +
+                '</board>' +
+            '</form>',
+        mockRPC: function (route) {
+            if (route === '/web/action/load') {
+                return $.when({
+                    res_model: 'partner',
+                    views: [[4, 'pivot']],
+                });
+            }
+            return this._super.apply(this, arguments);
+        },
+        archs: {
+            'partner,4,pivot': '<pivot><field name="int_field" type="measure"/></pivot>',
+        },
+        intercepts: {
+            do_action: function () {
+                assert.step('do action');
+            },
+        },
+    });
+
+    assert.verifySteps([]);
+
+    testUtils.dom.click(form.$('.o_pivot .o_pivot_cell_value'));
+
+    assert.verifySteps(['do action']);
+
+    form.destroy();
+});
+
 });
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 116d071dbcc..0836ffa40a3 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -1724,6 +1724,11 @@ msgstr ""
 msgid "My Team Leaves"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_holidays_dashboard
+msgid "My Team"
+msgstr ""
+
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
 msgid "New"
diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py
index 65760f4f6d1..be18aaa71d6 100644
--- a/addons/hr_holidays/models/hr_leave.py
+++ b/addons/hr_holidays/models/hr_leave.py
@@ -507,6 +507,8 @@ class HolidaysRequest(models.Model):
         holiday = super(HolidaysRequest, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(values)
         if not self._context.get('leave_fast_create'):
             holiday.add_follower(employee_id)
+            if holiday.validation_type == 'hr':
+                holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids)
             if employee_id:
                 holiday._onchange_employee_id()
             if 'number_of_days' not in values and ('date_from' in values or 'date_to' in values):
@@ -515,7 +517,7 @@ class HolidaysRequest(models.Model):
                 holiday.sudo().action_validate()
                 holiday.message_subscribe(partner_ids=[holiday._get_responsible_for_approval().partner_id.id])
                 holiday.sudo().message_post(body=_("The time off has been automatically approved"), subtype="mt_comment") # Message from OdooBot (sudo)
-            if not self._context.get('import_file'):
+            elif not self._context.get('import_file'):
                 holiday.activity_update()
         return holiday
 
@@ -719,7 +721,7 @@ class HolidaysRequest(models.Model):
         employee_requests = self.filtered(lambda hol: hol.holiday_type == 'employee')
         employee_requests._validate_leave_request()
         if not self.env.context.get('leave_fast_create'):
-            employee_requests.activity_update()
+            employee_requests.filtered(lambda holiday: holiday.validation_type != 'no_validation').activity_update()
         return True
 
     @api.multi
@@ -746,48 +748,69 @@ class HolidaysRequest(models.Model):
         """ Check if target state is achievable. """
         current_employee = self.env['hr.employee'].search([('user_id', '=', self.env.uid)], limit=1)
         is_team_leader = self.env.user.has_group('hr_holidays.group_hr_holidays_team_leader')
+        is_officer = self.env.user.has_group('hr_holidays.group_hr_holidays_user')
         is_manager = self.env.user.has_group('hr_holidays.group_hr_holidays_manager')
+
+        # FIXME This is probably handled by hr_leave_allocation_rule_employee_update ir.rule
+        if state in ['refuse', 'validate1', 'validate'] and not is_team_leader:
+            raise UserError(_('Only a Team Leader, Time Off Officer or Manager can approve or refuse time off requests.'))
+
         for holiday in self:
             val_type = holiday.holiday_status_id.validation_type
-            if state == 'confirm':
-                continue
 
-            if state == 'draft':
-                if holiday.employee_id != current_employee and not is_manager:
-                    raise UserError(_('Only a Time Off Manager can reset other people time off.'))
-                continue
+            if not is_manager:
+                if state == 'confirm':
+                    continue
+                elif state == 'draft':
+                    if holiday.employee_id != current_employee:
+                        raise UserError(_('Only a Time Off Manager can reset other people time off.'))
+                else:
+                    # use ir.rule based first access check: department, members, ... (see security.xml)
+                    holiday.check_access_rule('write')
 
-            if not is_team_leader:
-                raise UserError(_('Only a Team Leader, Time Off Officer or Manager can approve or refuse time off requests.'))
+                    # FIXME Should probably be handled via ir.rule
+                    # This handles states validate1 validate and refuse
+                    if holiday.employee_id == current_employee:
+                        raise UserError(_('Only a Time Off Manager can approve its own requests.'))
 
-            if is_team_leader:
-                # use ir.rule based first access check: department, members, ... (see security.xml)
-                holiday.check_access_rule('write')
+                    if (state == 'validate1' and val_type == 'both') or (state == 'validate' and val_type == 'manager') and holiday.holiday_type == 'employee':
+                        manager = holiday.employee_id.parent_id or holiday.employee_id.department_id.manager_id
+                        team_leader = holiday.employee_id.leave_manager_id
+                        error = False
 
-            if holiday.employee_id == current_employee and not is_manager:
-                raise UserError(_('Only a Time Off Manager can approve its own requests.'))
+                        if not manager and not team_leader:
+                            error = not is_officer
+                        else:
+                            error = (not (manager and manager == current_employee) and not (team_leader and team_leader == self.env.user))
 
-            if (state == 'validate1' and val_type == 'both') or (state == 'validate' and val_type == 'manager'):
-                manager = holiday.employee_id.parent_id or holiday.employee_id.department_id.manager_id
-                if (manager and manager != current_employee) and not self.env.user.has_group('hr_holidays.group_hr_holidays_manager'):
-                    raise UserError(_('You must be either %s\'s manager or Time Off Manager to approve this time off') % (holiday.employee_id.name))
+                        if error:
+                            raise UserError(_('You must be either %s\'s manager or Time Off Manager to approve this time off') % (holiday.employee_id.name))
 
-            if state == 'validate' and val_type == 'both':
-                if not self.env.user.has_group('hr_holidays.group_hr_holidays_manager'):
-                    raise UserError(_('Only an Time Off Manager can apply the second approval on time off requests.'))
+                    if state == 'validate' and val_type == 'both':
+                        raise UserError(_('Only an Time Off Manager can apply the second approval on time off requests.'))
 
     # ------------------------------------------------------------
     # Activity methods
     # ------------------------------------------------------------
 
     def _get_responsible_for_approval(self):
-        if self.state == 'confirm' and self.employee_id.leave_manager_id and self.employee_id.leave_manager_id.has_group('hr_holidays.group_hr_holidays_team_leader'):
-            return self.employee_id.leave_manager_id
-        elif self.state == 'confirm' and self.employee_id.parent_id.user_id and self.employee_id.parent_id.user_id.has_group('hr_holidays.group_hr_holidays_team_leader'):
-            return self.employee_id.parent_id.user_id
-        elif self.department_id.manager_id.user_id:
-            return self.department_id.manager_id.user_id
-        return self.env.user
+        self.ensure_one()
+        responsible = self.env.user
+
+        if self.validation_type == 'hr' or (self.validation_type == 'both' and self.state == 'validate1'):
+            responsible = self.env['res.users'].search([
+                ('company_id', '=', self.employee_id.company_id.id),
+                ('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)
+            ], limit=1)
+        elif self.state == 'confirm' or (self.state == 'validate' and self.validation_type == 'no_validation'):
+            if self.employee_id.leave_manager_id and self.employee_id.leave_manager_id.has_group('hr_holidays.group_hr_holidays_team_leader'):
+                responsible = self.employee_id.leave_manager_id
+            elif self.employee_id.parent_id.user_id and self.employee_id.parent_id.user_id.has_group('hr_holidays.group_hr_holidays_team_leader'):
+                responsible = self.employee_id.parent_id.user_id
+            elif self.department_id.manager_id.user_id:
+                responsible = self.department_id.manager_id.user_id
+
+        return responsible
 
     def activity_update(self):
         to_clean, to_do = self.env['hr.leave'], self.env['hr.leave']
@@ -838,7 +861,7 @@ class HolidaysRequest(models.Model):
             ref_action = self._notify_get_action_link('controller', controller='/leave/refuse')
             hr_actions += [{'url': ref_action, 'title': _('Refuse')}]
 
-        holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_user').id
+        holiday_user_group_id = self.env.ref('hr_holidays.group_hr_holidays_team_leader').id
         new_group = (
             'group_hr_holidays_user', lambda pdata: pdata['type'] == 'user' and holiday_user_group_id in pdata['groups'], {
                 'actions': hr_actions,
diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py
index 206a3933555..8be3c4ac604 100644
--- a/addons/hr_holidays/models/hr_leave_allocation.py
+++ b/addons/hr_holidays/models/hr_leave_allocation.py
@@ -338,6 +338,8 @@ class HolidaysAllocation(models.Model):
             values.update({'department_id': self.env['hr.employee'].browse(employee_id).department_id.id})
         holiday = super(HolidaysAllocation, self.with_context(mail_create_nolog=True, mail_create_nosubscribe=True)).create(values)
         holiday.add_follower(employee_id)
+        if holiday.validation_type == 'hr':
+            holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids)
         if 'employee_id' in values:
             holiday._onchange_employee()
         holiday.activity_update()
@@ -520,6 +522,12 @@ class HolidaysAllocation(models.Model):
     # ------------------------------------------------------------
 
     def _get_responsible_for_approval(self):
+        self.ensure_one()
+        if self.validation_type == 'hr' or (self.validation_type == 'both' and self.state == 'validate1'):
+            return self.env['res.users'].search([
+                ('company_id', '=', self.employee_id.company_id.id),
+                ('groups_id', 'in', self.env.ref('hr_holidays.group_hr_holidays_user').id)
+            ], limit=1)
         if self.state == 'confirm' and self.employee_id.parent_id.user_id:
             return self.employee_id.parent_id.user_id
         elif self.department_id.manager_id.user_id:
diff --git a/addons/hr_holidays/models/hr_leave_type.py b/addons/hr_holidays/models/hr_leave_type.py
index 8d461c53a78..e5a5d810240 100644
--- a/addons/hr_holidays/models/hr_leave_type.py
+++ b/addons/hr_holidays/models/hr_leave_type.py
@@ -70,14 +70,6 @@ class HolidaysType(models.Model):
         ('hr', 'Payroll Officer'),
         ('manager', 'Team Leader'),
         ('both', 'Team Leader and Payroll Officer')], default='hr', string='Validation')
-    # TODO: remove me in master, the behavior is exactly the same if you choose 'hr' or 'manager'
-    # in the validation_type field. This field is used only to hide this possibility to the user
-    # to avoid misunderstandings. This field and its corresponding's functions must be removed once
-    # the functional part is implemented.
-    double_validation = fields.Boolean(string='Apply Double Validation',
-        compute='_compute_validation_type', inverse='_inverse_validation_type',
-        help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved.")
-    
     allocation_type = fields.Selection([
         ('no', 'No Allocation Needed'),
         ('fixed_allocation', 'Free Allocation Request'),
@@ -99,25 +91,6 @@ class HolidaysType(models.Model):
     leave_notif_subtype_id = fields.Many2one('mail.message.subtype', string='Time Off Notification Subtype', default=lambda self: self.env.ref('hr_holidays.mt_leave', raise_if_not_found=False))
     allocation_notif_subtype_id = fields.Many2one('mail.message.subtype', string='Allocation Notification Subtype', default=lambda self: self.env.ref('hr_holidays.mt_leave_allocation', raise_if_not_found=False))
 
-    # TODO: remove me in master
-    @api.depends('validation_type')
-    def _compute_validation_type(self):
-        for holiday_type in self:
-            if holiday_type.validation_type == 'both':
-                holiday_type.double_validation = True
-            else:
-                holiday_type.double_validation = False
-
-    # TODO: remove me in master
-    def _inverse_validation_type(self):
-        for holiday_type in self:
-            if holiday_type.double_validation == True:
-                holiday_type.validation_type = 'both'
-            else:
-                #IF to preserve the information (hr or manager)
-                if holiday_type.validation_type == 'both':
-                    holiday_type.validation_type = 'hr'
-
     @api.multi
     @api.constrains('validity_start', 'validity_stop')
     def _check_validity_dates(self):
diff --git a/addons/hr_holidays/views/hr_leave_type_views.xml b/addons/hr_holidays/views/hr_leave_type_views.xml
index 45b8b1a727d..f2c01f8e7f8 100644
--- a/addons/hr_holidays/views/hr_leave_type_views.xml
+++ b/addons/hr_holidays/views/hr_leave_type_views.xml
@@ -39,8 +39,8 @@
                             options='{"terminology": "archive"}'/>
                         </button>
                     </div>
-                    <div class="oe_title">  
-                        <h1><field name="name"/></h1>   
+                    <div class="oe_title">
+                        <h1><field name="name"/></h1>
                     </div>
                     <group>
                         <group name="description" string="Options">
@@ -49,8 +49,7 @@
                             <field name="sequence" groups="base.group_no_one"/>
                         </group>
                         <group name="validation" string="Validation">
-                            <field name="validation_type" widget="radio" invisible="1"/>
-                            <field name="double_validation"/>
+                            <field name="validation_type" widget="radio"/>
                         </group>
                         <group name="visibility" string="Allocation">
                             <field name="allocation_type" widget="radio" force_save="1"/>
@@ -111,8 +110,7 @@
                 <field name="display_name"/>
                 <field name="code"/>
                 <field name="allocation_type"/>
-                <field name="validation_type" invisible="1"/>
-                <field name="double_validation"/>
+                <field name="validation_type"/>
                 <field name="validity_start"/>
                 <field name="validity_stop"/>
             </tree>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index c38c2d9f7dd..f1e2865fd66 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -30,7 +30,7 @@
                 <separator/>
                 <filter string="Unread Messages" name="message_needaction" domain="[('message_needaction','=',True)]"/>
                 <separator/>
-                <filter string="My Department Time Off" name="department" domain="[('department_id.member_ids.user_id', '=', uid)]" help="My Department Time Off"/>
+                <filter string="My Department Time Off" name="department" domain="['|', ('department_id.member_ids.user_id', '=', uid), ('employee_id.user_id', '=', uid)]" help="My Department Time Off"/>
                 <filter string="People I Manage" name="managed_people" domain="[('employee_id.parent_id.user_id', '=', uid)]" help="Time off of people you are manager of"/>
                 <filter string="My Team Time Off" name="my_team_leaves" domain="[('employee_id.leave_manager_id', '=', uid)]" groups="hr_holidays.group_hr_holidays_team_leader" help="Time off of Your Team Members"/>
                 <filter string="My Time Off" name="my_leaves" domain="[('employee_id.user_id', '=', uid)]"/>
@@ -367,7 +367,7 @@
         <field name="res_model">hr.leave</field>
         <field name="view_type">form</field>
         <field name="view_mode">calendar</field>
-        <field name="context">{'search_default_year': 1, 'search_default_group_employee': 1, 'search_default_managed_people': 1, 'search_default_my_leaves': 1}</field>
+        <field name="context">{'search_default_year': 1, 'search_default_group_employee': 1, 'search_default_managed_people': 1, 'search_default_managed_people': 1, 'search_default_my_team_leaves': 1}</field>
         <field name="domain">[('holiday_type','=','employee'), ('state', '!=', 'refuse')]</field>
         <field name="search_view_id" ref="view_hr_holidays_filter"/>
         <field name="view_id" ref="hr_leave_view_calendar"/>
@@ -382,7 +382,7 @@
 
     <menuitem
         id="menu_hr_holidays_dashboard"
-        name="Overview"
+        name="My Team"
         parent="menu_hr_holidays_root"
         sequence="1"
         action="action_hr_holidays_dashboard"
@@ -521,7 +521,8 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,kanban,form,calendar,activity</field>
         <field name="context">{
-            'search_default_department':1,
+            'search_default_managed_people': 1,
+            'search_default_my_team_leaves': 1
             'search_default_approve':1}
         </field>
         <field name="domain">[]</field>
diff --git a/addons/mail/models/mail_channel.py b/addons/mail/models/mail_channel.py
index 5ba1fd08ea9..1ae85a249ca 100644
--- a/addons/mail/models/mail_channel.py
+++ b/addons/mail/models/mail_channel.py
@@ -756,7 +756,7 @@ class Channel(models.Model):
         self.ensure_one()
         if self.channel_message_ids.ids:
             last_message_id = self.channel_message_ids.ids[0] # zero is the index of the last message
-            channel_partner = self.env['mail.channel.partner'].search([('channel_id', 'in', self.ids), ('partner_id', '=', self.env.user.partner_id.id)])
+            channel_partner = self.env['mail.channel.partner'].search([('channel_id', 'in', self.ids), ('partner_id', '=', self.env.user.partner_id.id)], limit=1)
             if channel_partner.seen_message_id.id == last_message_id:
                 # last message seen by user is already up-to-date
                 return
@@ -787,7 +787,7 @@ class Channel(models.Model):
             if channel.channel_type != 'chat':
                 return
             last_message_id = channel.channel_message_ids.ids[0] # zero is the index of the last message
-            channel_partner = self.env['mail.channel.partner'].search([('channel_id', '=', channel.id), ('partner_id', '=', self.env.user.partner_id.id)])
+            channel_partner = self.env['mail.channel.partner'].search([('channel_id', '=', channel.id), ('partner_id', '=', self.env.user.partner_id.id)], limit=1)
             if channel_partner.fetched_message_id.id == last_message_id:
                 # last message fetched by user is already up-to-date
                 return
diff --git a/addons/mail/static/src/js/composers/basic_composer.js b/addons/mail/static/src/js/composers/basic_composer.js
index 58e334808bf..9def912612c 100644
--- a/addons/mail/static/src/js/composers/basic_composer.js
+++ b/addons/mail/static/src/js/composers/basic_composer.js
@@ -694,6 +694,7 @@ var BasicComposer = Widget.extend({
      * @param {Event} ev
      */
     _onEmojiImageClick: function (ev) {
+        ev.preventDefault();
         var cursorPosition = this.getSelectionPositions();
         var inputVal = this.$input.val();
         var leftSubstring = inputVal.substring(0, cursorPosition.start);
diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js
index d30d263fa12..bd46faf1e08 100644
--- a/addons/web/static/src/js/fields/relational_fields.js
+++ b/addons/web/static/src/js/fields/relational_fields.js
@@ -107,6 +107,7 @@ var FieldMany2One = AbstractField.extend({
         'click': '_onClick',
     }),
     AUTOCOMPLETE_DELAY: 200,
+    SEARCH_MORE_LIMIT: 320,
 
     /**
      * @override
@@ -501,18 +502,33 @@ var FieldMany2One = AbstractField.extend({
                     values.push({
                         label: _t("Search More..."),
                         action: function () {
-                            self._rpc({
+                            var prom;
+                            if (search_val !== '') {
+                                prom = self._rpc({
                                     model: self.field.relation,
                                     method: 'name_search',
                                     kwargs: {
                                         name: search_val,
                                         args: domain,
                                         operator: "ilike",
-                                        limit: 160,
+                                        limit: self.SEARCH_MORE_LIMIT,
                                         context: context,
                                     },
-                                })
-                                .then(self._searchCreatePopup.bind(self, "search"));
+                                });
+                            }
+                            $.when(prom).then(function (results) {
+                                var dynamicFilters;
+                                if (results) {
+                                    var ids = _.map(results, function (x) {
+                                        return x[0];
+                                    });
+                                    dynamicFilters = [{
+                                        description: _.str.sprintf(_t('Quick search: %s'), search_val),
+                                        domain: [['id', 'in', ids]],
+                                    }];
+                                }
+                                self._searchCreatePopup("search", false, {}, dynamicFilters);
+                            });
                         },
                         classname: 'o_m2o_dropdown_option',
                     });
@@ -555,19 +571,25 @@ var FieldMany2One = AbstractField.extend({
     /**
      * all search/create popup handling
      *
+     * TODO: ids argument is no longer used, remove it in master (as well as
+     * initial_ids param of the dialog)
+     *
      * @private
      * @param {any} view
      * @param {any} ids
      * @param {any} context
+     * @param {Object[]} [dynamicFilters=[]] filters to add to the search view
+     *   in the dialog (each filter has keys 'description' and 'domain')
      */
-    _searchCreatePopup: function (view, ids, context) {
+    _searchCreatePopup: function (view, ids, context, dynamicFilters) {
         var self = this;
         return new dialogs.SelectCreateDialog(this, _.extend({}, this.nodeOptions, {
             res_model: this.field.relation,
             domain: this.record.getDomain({fieldName: this.name}),
             context: _.extend({}, this.record.getContext(this.recordParams), context || {}),
+            dynamicFilters: dynamicFilters || [],
             title: (view === 'search' ? _t("Search: ") : _t("Create: ")) + this.string,
-            initial_ids: ids ? _.map(ids, function (x) { return x[0]; }) : undefined,
+            initial_ids: ids,
             initial_view: view,
             disable_multiple_selection: true,
             no_create: !self.can_create,
diff --git a/addons/web/static/src/js/views/abstract_view.js b/addons/web/static/src/js/views/abstract_view.js
index 72108e3c8ad..ce8951f6ee8 100644
--- a/addons/web/static/src/js/views/abstract_view.js
+++ b/addons/web/static/src/js/views/abstract_view.js
@@ -78,6 +78,8 @@ var AbstractView = Factory.extend({
      * @param {string} [params.controllerState]
      * @param {string} [params.displayName]
      * @param {Array[]} [params.domain=[]]
+     * @param {Object[]} [params.dynamicFilters] transmitted to the
+     *   ControlPanelView
      * @param {number[]} [params.ids]
      * @param {boolean} [params.isEmbedded=false]
      * @param {Object} [params.searchQuery={}]
@@ -165,6 +167,7 @@ var AbstractView = Factory.extend({
         this.controlPanelParams = {
             action: action,
             activateDefaultFavorite: params.activateDefaultFavorite,
+            dynamicFilters: params.dynamicFilters,
             breadcrumbs: params.breadcrumbs,
             context: this.loadParams.context,
             domain: this.loadParams.domain,
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_view.js b/addons/web/static/src/js/views/control_panel/control_panel_view.js
index 2bde26340e7..0a140e1f901 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_view.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_view.js
@@ -43,6 +43,10 @@ var ControlPanelView = Factory.extend({
      *   breadcrumbs won't be rendered
      * @param {boolean} [params.withSearchBar=true] if set to false, no default
      *   search bar will be rendered
+     * @param {Object[]} [params.dynamicFilters=[]] filters to add to the
+     *   search (in addition to those described in the arch), each filter being
+     *   an object with keys 'description' (what is displayed in the searchbar)
+     *   and 'domain'
      */
     init: function (params) {
         var self = this;
@@ -101,6 +105,19 @@ var ControlPanelView = Factory.extend({
         INTERVAL_OPTIONS = INTERVAL_OPTIONS.map(function (option) {
             return _.extend(option, {description: option.description.toString()});
         });
+
+        // add a filter group with the dynamic filters, if any
+        if (params.dynamicFilters && params.dynamicFilters.length) {
+            var dynamicFiltersGroup = params.dynamicFilters.map(function (filter) {
+                return {
+                    description: filter.description,
+                    domain: JSON.stringify(filter.domain),
+                    isDefault: true,
+                    type: 'filter',
+                };
+            });
+            this.loadParams.groups.unshift(dynamicFiltersGroup);
+        }
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js
index 65fee4a01b4..befe4247c00 100644
--- a/addons/web/static/src/js/views/view_dialogs.js
+++ b/addons/web/static/src/js/views/view_dialogs.js
@@ -317,6 +317,7 @@ var SelectCreateDialog = ViewDialog.extend({
      * - list_view_options: dict of options to pass to the List View
      * - on_selected: optional callback to execute when records are selected
      * - disable_multiple_selection: true to allow create/select multiple records
+     * - dynamicFilters: filters to add to the searchview
      */
     init: function () {
         this._super.apply(this, arguments);
@@ -359,6 +360,7 @@ var SelectCreateDialog = ViewDialog.extend({
                 controlPanelFieldsView: fieldsViews.search,
             },
             action_buttons: false,
+            dynamicFilters: this.options.dynamicFilters,
             context: this.context,
             domain: domain,
             hasSelectors: !this.options.disable_multiple_selection,
diff --git a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
index 84fac135ad2..04b58b017ba 100644
--- a/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
+++ b/addons/web/static/tests/fields/relational_fields/field_many2one_tests.js
@@ -958,7 +958,7 @@ QUnit.module('fields', {}, function () {
                     return result;
                 },
             });
-            await testUtils.fields.many2one.searchAndClickItem('trululu', 'b');
+            await testUtils.fields.many2one.searchAndClickItem('trululu', {search: 'b'});
             testUtils.form.clickSave(form);
 
             assert.verifySteps(['name_create'],
@@ -2596,6 +2596,107 @@ QUnit.module('fields', {}, function () {
             form.destroy();
         });
 
+        QUnit.test('search more in many2one: no text in input', async function (assert) {
+            // when the user clicks on 'Search More...' in a many2one dropdown, and there is no text
+            // in the input (i.e. no value to search on), we bypass the name_search that is meant to
+            // return a list of preselected ids to filter on in the list view (opened in a dialog)
+            assert.expect(6);
+
+            for (var i = 0; i < 8; i++) {
+                this.data.partner.records.push({id: 100 + i, display_name: 'test_' + i});
+            }
+
+            var form = createView({
+                View: FormView,
+                model: 'partner',
+                data: this.data,
+                arch: '<form><field name="trululu"/></form>',
+                archs: {
+                    'partner,false,list': '<list><field name="display_name"/></list>',
+                    'partner,false,search': '<search></search>',
+                },
+                mockRPC: function (route, args) {
+                    assert.step(args.method || route);
+                    if (route === '/web/dataset/search_read') {
+                        assert.deepEqual(args.domain, [],
+                            "should not preselect ids as there as nothing in the m2o input");
+                    }
+                    return this._super.apply(this, arguments);
+                },
+            });
+
+            await testUtils.fields.many2one.searchAndClickItem('trululu', {
+                item: 'Search More',
+                search: '',
+            });
+
+            assert.verifySteps([
+                'default_get',
+                'name_search', // to display results in the dropdown
+                'load_views', // list view in dialog
+                '/web/dataset/search_read', // to display results in the dialog
+            ]);
+
+            form.destroy();
+        });
+
+        QUnit.test('search more in many2one: text in input', async function (assert) {
+            // when the user clicks on 'Search More...' in a many2one dropdown, and there is some
+            // text in the input, we perform a name_search to get a (limited) list of preselected
+            // ids and we add a dynamic filter (with those ids) to the search view in the dialog, so
+            // that the user can remove this filter to bypass the limit
+            assert.expect(12);
+
+            for (var i = 0; i < 8; i++) {
+                this.data.partner.records.push({id: 100 + i, display_name: 'test_' + i});
+            }
+
+            var expectedDomain;
+            var form = createView({
+                View: FormView,
+                model: 'partner',
+                data: this.data,
+                arch: '<form><field name="trululu"/></form>',
+                archs: {
+                    'partner,false,list': '<list><field name="display_name"/></list>',
+                    'partner,false,search': '<search></search>',
+                },
+                mockRPC: function (route, args) {
+                    assert.step(args.method || route);
+                    if (route === '/web/dataset/search_read') {
+                        assert.deepEqual(args.domain, expectedDomain);
+                    }
+                    return this._super.apply(this, arguments);
+                },
+            });
+
+            expectedDomain = [['id', 'in', [100, 101, 102, 103, 104, 105, 106, 107]]];
+            await testUtils.fields.many2one.searchAndClickItem('trululu', {
+                item: 'Search More',
+                search: 'test',
+            });
+
+            assert.containsOnce(document.body, '.modal .o_list_view');
+            assert.containsOnce(document.body, '.modal .o_cp_searchview .o_facet_values',
+                "should have a special facet for the pre-selected ids");
+
+            // remove the filter on ids
+            expectedDomain = [];
+            testUtils.dom.click($('.modal .o_cp_searchview .o_facet_remove'));
+
+            assert.verifySteps([
+                'default_get',
+                'name_search', // empty search, triggered when the user clicks in the input
+                'name_search', // to display results in the dropdown
+                'name_search', // to get preselected ids matching the search
+                'load_views', // list view in dialog
+                '/web/dataset/search_read', // to display results in the dialog
+                '/web/dataset/search_read', // after removal of dynamic filter
+            ]);
+
+            form.destroy();
+        });
+
         QUnit.test('updating a many2one from a many2many', function (assert) {
             assert.expect(4);
 
diff --git a/addons/web/static/tests/helpers/mock_server.js b/addons/web/static/tests/helpers/mock_server.js
index 09f6852951b..ff75722b333 100644
--- a/addons/web/static/tests/helpers/mock_server.js
+++ b/addons/web/static/tests/helpers/mock_server.js
@@ -705,8 +705,8 @@ var MockServer = Class.extend({
         var result = _.map(records, function (record) {
             return [record.id, record.display_name];
         });
-        if (args.limit) {
-            return result.slice(0, args.limit);
+        if (_kwargs.limit) {
+            return result.slice(0, _kwargs.limit);
         }
         return result;
     },
diff --git a/addons/web/static/tests/helpers/test_utils_fields.js b/addons/web/static/tests/helpers/test_utils_fields.js
index f7d8829ce82..f0f29839a9d 100644
--- a/addons/web/static/tests/helpers/test_utils_fields.js
+++ b/addons/web/static/tests/helpers/test_utils_fields.js
@@ -125,15 +125,16 @@ function clickM2OItem(fieldName, searchText) {
  * - click to open the dropdown
  * - enter a search string in the input
  * - wait for the selection
- * - click on the active menuitem
+ * - click on the requested menuitem, or the active one by default
  *
  * Example:
- *    testUtils.fields.many2one.searchAndClickM2OItem('partner_id', 'George');
+ *    testUtils.fields.many2one.searchAndClickM2OItem('partner_id', {search: 'George'});
  *
  * @param {string} fieldName
  * @param {[Object]} options
  * @param {[string]} options.selector
  * @param {[string]} options.search
+ * @param {[string]} options.item
  * @returns {Promise}
  */
 function searchAndClickM2OItem(fieldName, options) {
@@ -156,7 +157,11 @@ function searchAndClickM2OItem(fieldName, options) {
     }
 
     return $.when(def).then(function () {
-        clickM2OHighlightedItem(fieldName, options.selector);
+        if (options.item) {
+            clickM2OItem(fieldName, options.item);
+        } else {
+            clickM2OHighlightedItem(fieldName, options.selector);
+        }
     });
 }
 return {
diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index fa9af18a51b..3fc3bfc4fd2 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -13,7 +13,7 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
         'click .edit_contact_confirm': '_onEditContactConfirm',
         'click .new_opp_confirm': '_onNewOppConfirm',
         'click .edit_opp_confirm': '_onEditOppConfirm',
-        'change .edit_opp_form .next_activity': '_onEditOppConfirm',
+        'change .edit_opp_form .next_activity': '_onEditOppForm',
         'click div.input-group span.fa-calendar': '_onCalendarIconClick',
     },
 
diff --git a/addons/website_sale_slides/views/website_slides_templates.xml b/addons/website_sale_slides/views/website_slides_templates.xml
index 334616bc30b..ad980a29a7a 100644
--- a/addons/website_sale_slides/views/website_slides_templates.xml
+++ b/addons/website_sale_slides/views/website_slides_templates.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" ?>
 <odoo><data>
 
-<template id='course_main' inherit_id="website_slides.course_main">
+<template id='course_sidebar' inherit_id="website_slides.course_sidebar">
     <!-- Channel main template: override button to join channel -->
-    <xpath expr="//div[hasclass('o_wslides_join_channel')]" position="inside">
+    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
         <t t-if="not channel.is_member and channel.enroll == 'payment'">
             <t t-if="channel.product_id.website_published">
                 <h4>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 2e051152cb5..73e09b11484 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -35,6 +35,7 @@ Featuring
         'views/website_slides_templates_homepage.xml',
         'views/website_slides_templates_course.xml',
         'views/website_slides_templates_lesson.xml',
+        'views/website_slides_templates_lesson_fullscreen.xml',
         'views/website_slides_templates_lesson_embed.xml',
         'views/website_slides_templates_profile.xml',
         'views/website_slides_templates_utils.xml',
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 7ab6b6052d7..d829f22d2fd 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -36,6 +36,17 @@ class WebsiteSlides(WebsiteProfile):
             if not qs or qs.lower() in loc:
                 yield {'loc': loc}
 
+    def _fetch_slide(self, slide_id):
+        slide = request.env['slide.slide'].browse(int(slide_id)).exists()
+        if not slide:
+            return {'error': 'slide_wrong'}
+        try:
+            slide.check_access_rights('read')
+            slide.check_access_rule('read')
+        except:
+            return {'error': 'slide_access'}
+        return {'slide': slide}
+
     def _set_viewed_slide(self, slide):
         if request.env.user._is_public() or slide.is_preview or not slide.channel_id.is_member:
             viewed_slides = request.session.setdefault('viewed_slides', list())
@@ -65,20 +76,20 @@ class WebsiteSlides(WebsiteProfile):
             'user_progress': {}
         }
         if slide.channel_id.channel_type == "training":
-            channel_slides = slide.channel_id.slide_ids.ids
-            slide_index = channel_slides.index(slide.id)
-            previous_slide = None
-            next_slide = None
-            if slide_index > 0:
-                previous_slide = slide.channel_id.slide_ids[slide_index-1]
-            if slide_index < len(channel_slides) - 1:
-                next_slide = slide.channel_id.slide_ids[slide_index+1]
+            channel_slides_ids = slide.channel_id.slide_ids.ids
+            slide_index = channel_slides_ids.index(slide.id)
+            previous_slide = slide.channel_id.slide_ids[slide_index-1] if slide_index > 0 else None
+            next_slide = slide.channel_id.slide_ids[slide_index+1] if slide_index < len(channel_slides_ids) - 1 else None
             values.update({
                 'previous_slide': slug(previous_slide) if previous_slide else "",
                 'next_slide': slug(next_slide) if next_slide else ""
             })
         return values
 
+    def _get_quiz_points(self, slide, attempt_count):
+        possible_points = [slide.quiz_first_attempt_reward,slide.quiz_second_attempt_reward,slide.quiz_third_attempt_reward, slide.quiz_fourth_attempt_reward]
+        return possible_points[attempt_count] if attempt_count < len(possible_points) else possible_points[-1]
+
     def _get_user_progress(self, channel):
         user_progress = { slide_partner.slide_id.id: slide_partner for slide_partner in request.env['slide.slide.partner'].sudo().search([('channel_id', '=', channel.id),('partner_id', '=', request.env.user.partner_id.id)])}
         return {
@@ -364,6 +375,7 @@ class WebsiteSlides(WebsiteProfile):
 
         if channel.channel_type == "training":
             values.update(self._get_user_progress(channel))
+            values['uncategorized_slides'] = channel.slide_ids.filtered(lambda slide: not slide.category_id)
 
         return request.render('website_slides.course_main', values)
 
@@ -408,6 +420,7 @@ class WebsiteSlides(WebsiteProfile):
         self._set_viewed_slide(slide)
         if slide.channel_id.channel_type == "training":
             values.update(self._get_user_progress(slide.channel_id))
+            values['uncategorized_slides'] = slide.channel_id.slide_ids.filtered(lambda slide: not slide.category_id)
             if 'fullscreen' in kwargs:
                 return request.render("website_slides.slide_fullscreen", values)
         return request.render("website_slides.slide_detail_view", values)
@@ -489,55 +502,61 @@ class WebsiteSlides(WebsiteProfile):
         good_answers = request.env['slide.answer'].search([('id', 'in', answer_ids), ('is_correct', '=', True)])
         bad_answers = request.env['slide.answer'].browse(answer_ids) - good_answers
         slide_partner = request.env['slide.slide.partner'].search([('slide_id', '=', slide_id), ('partner_id', '=', request.env.user.partner_id.id)])
-        possible_points = [slide.quiz_first_attempt_reward, slide.quiz_second_attempt_reward, slide.quiz_third_attempt_reward, slide.quiz_fourth_attempt_reward]
         points = 0
         if not slide_partner:
-            slide_partner = request.env['slide.slide.partner'].sudo().create({
-                "slide_id": slide.id,
-                "partner_id": request.env.user.partner_id.id,
-                "channel_id": slide.channel_id.id,
-                "completed": False
-            })
+            slide.action_set_viewed()
         if not slide_partner.completed:
-            if slide_partner.quiz_attempts_count < len(possible_points):
-                points = possible_points[slide_partner.quiz_attempts_count]
-            else:
-                points = possible_points[-1]
+            points = self._get_quiz_points(slide, slide_partner.quiz_attempts_count)
             slide_partner.sudo().write({
                 'quiz_attempts_count': slide_partner.quiz_attempts_count if not bad_answers else slide_partner.quiz_attempts_count + 1,
                 'points_won': points if not bad_answers else 0,
                 'completed': not bad_answers
             })
+            user = {}
+            if not bad_answers:
+                request.env.user.sudo().add_karma(points)
+                lower_bound = request.env.user.rank_id.karma_min
+                upper_bound = request.env.user.next_rank_id.karma_min
+                user= {
+                        'lower_bound': lower_bound,
+                        'upper_bound': upper_bound,
+                        'karma': request.env.user.karma,
+                        'progress_bar_percentage': 100 * ((request.env.user.karma - lower_bound) / (upper_bound - lower_bound))
+                    }
             return {
                 'goodAnswers': [good_answer.id for good_answer in good_answers],
                 'badAnswers': [bad_answer.id for bad_answer in bad_answers],
                 'passed': not bad_answers,
                 'points': points if not bad_answers else 0,
                 'attempts_count': slide_partner.quiz_attempts_count if slide_partner else 0,
-                'channel_completion': slide.channel_id.completion
+                'channel_completion': slide.channel_id.completion,
+                'user': user
             }
         return {
             'error': "You already passed this quiz"
         }
 
-    # SLIDE STATE CONTROLLERS
-    # TDE CLEANME: clean ctrlr / method name
+    # --------------------------------------------------
+    # SLIDE.SLIDE TOOLS CONTOLLERS
+    # --------------------------------------------------
 
-    @http.route('/slide/completed/<int:slide_id>', website=True, type="http", auth="user")
-    def mark_as_completed(self, slide_id, next_slide=None):
-        slide = request.env['slide.slide'].browse(slide_id)
+    @http.route('/slides/slide/<model("slide.slide"):slide>/set_completed', website=True, type="http", auth="user")
+    def slide_set_completed_and_redirect(self, slide, next_slide=None):
         self._set_completed_slide(slide)
-        return werkzeug.utils.redirect("/slides/slide/%s" %(next_slide))
+        return werkzeug.utils.redirect("/slides/slide/%s" % (next_slide if next_slide else slide.id))
 
-    @http.route('/slides/set_completed', website=True, type="json", auth="user")
-    def set_status_as_done(self, slide_id):
-        slide = request.env['slide.slide'].browse(slide_id)
-        self._set_completed_slide(slide)
+    @http.route('/slides/slide/set_completed', website=True, type="json", auth="public")
+    def slide_set_completed(self, slide_id):
+        if request.website.is_public_user():
+            return {'error': 'public_user'}
+        fetch_res = self._fetch_slide(slide_id)
+        if fetch_res.get('error'):
+            return fetch_res
+        self._set_completed_slide(fetch_res['slide'])
         return {
-            'channel_completion': slide.channel_id.completion
+            'channel_completion': fetch_res['slide'].channel_id.completion
         }
 
-    # JSONRPC
     @http.route('/slides/slide/like', type='json', auth="public", website=True)
     def slide_like(self, slide_id, upvote):
         if request.website.is_public_user():
@@ -556,18 +575,63 @@ class WebsiteSlides(WebsiteProfile):
         slide.invalidate_cache()
         return slide.read(['likes', 'dislikes', 'user_vote'])[0]
 
+    @http.route('/slides/slide/archive', type='json', auth='user', website=True)
+    def slide_archive(self, slide_id):
+        """ This route allows channel publishers to archive slides.
+        It has to be done in sudo mode since only website_publishers can write on slides in ACLs """
+        slide = request.env['slide.slide'].browse(int(slide_id))
+        if slide.channel_id.can_publish:
+            slide.sudo().active = False
+            return True
+
+        return False
+
     @http.route(['/slides/slide/send_share_email'], type='json', auth='user', website=True)
     def slide_send_share_email(self, slide_id, email):
         slide = request.env['slide.slide'].browse(int(slide_id))
         result = slide._send_share_email(email)
         return result
 
+    # --------------------------------------------------
+    # CATEGORY MANAGEMENT
+    # --------------------------------------------------
+
+    @http.route(['/slides/category/search_read'], type='json', auth='user', methods=['POST'], website=True)
+    def slide_category_search_read(self, fields, domain):
+        can_create = request.env['slide.category'].check_access_rights('create', raise_exception=False)
+        return {
+            'read_results': request.env['slide.category'].search_read(domain, fields),
+            'can_create': can_create,
+        }
+
+    @http.route('/slides/category/add', type="http", website=True, auth="user")
+    def slide_category_add(self, channel_id, name):
+        """ Adds a category to the specified channel. If categories already exist
+        within this channel, it will be added at the bottom (sequence+1) """
+        channel = request.env['slide.channel'].browse(int(channel_id))
+
+        values = {
+            'name': name,
+            'channel_id': channel.id
+        }
+
+        latest_category = request.env['slide.category'].search_read([
+            ('channel_id', '=', channel.id)
+        ], ["sequence"], order="sequence desc", limit=1)
+        if latest_category:
+            values['sequence'] = latest_category[0]['sequence'] + 1
+
+        request.env['slide.category'].create(values)
+
+        return werkzeug.utils.redirect("/slides/%s" % (slug(channel)))
+
     # --------------------------------------------------
     # TOOLS
     # --------------------------------------------------
 
     @http.route(['/slides/channel/enroll'], type='http', auth='public', website=True)
     def slide_channel_join_http(self, channel_id):
+        # TDE FIXME: why 2 routes ?
         if not request.website.is_public_user():
             channel = request.env['slide.channel'].browse(int(channel_id))
             channel.action_add_member()
@@ -582,6 +646,24 @@ class WebsiteSlides(WebsiteProfile):
             return {'error': 'join_done'}
         return success
 
+    @http.route('/slides/channel/resequence', type="json", website=True, auth="user")
+    def resequence_slides(self, channel_id, slides_data):
+        """" Reorder the slides within the channel by reassigning their 'sequence' field.
+        This method also handles slides that are put in a new category (or uncategorized). """
+        channel = request.env['slide.channel'].browse(int(channel_id))
+        if not channel.can_publish:
+            return {'error': 'Only the publishers of the channel can edit it'}
+
+        slides = request.env['slide.slide'].search([
+            ('id', 'in', [int(key) for key in slides_data.keys()]),
+            ('channel_id', '=', channel.id)
+        ])
+
+        for slide in slides:
+            slide_key = str(slide.id)
+            slide.sequence = slides_data[slide_key]['sequence']
+            slide.category_id = slides_data[slide_key]['category_id'] if 'category_id' in slides_data[slide_key] else False
+
     @http.route(['/slides/prepare_preview'], type='json', auth='user', methods=['POST'], website=True)
     def prepare_preview(self, **data):
         Slide = request.env['slide.slide']
@@ -618,8 +700,6 @@ class WebsiteSlides(WebsiteProfile):
             else:
                 values['category_id'] = post['category_id'][0]
 
-        values['is_preview'] = post.get('is_preview') == 'true'
-
         # handle exception during creation of slide and sent error notification to the client
         # otherwise client slide create dialog box continue processing even server fail to create a slide
         try:
@@ -660,7 +740,7 @@ class WebsiteSlides(WebsiteProfile):
             }
 
     def _get_valid_slide_post_values(self):
-        return ['name', 'url', 'tag_ids', 'slide_type', 'channel_id',
+        return ['name', 'url', 'tag_ids', 'slide_type', 'channel_id', 'is_preview',
             'mime_type', 'datas', 'description', 'image', 'index_content', 'website_published']
 
     @http.route(['/slides/channel/tag/search_read'], type='json', auth='user', methods=['POST'], website=True)
@@ -679,40 +759,6 @@ class WebsiteSlides(WebsiteProfile):
             'can_create': can_create,
         }
 
-    @http.route(['/slides/category/search_read'], type='json', auth='user', methods=['POST'], website=True)
-    def slide_category_search_read(self, fields, domain):
-        can_create = request.env['slide.category'].check_access_rights('create', raise_exception=False)
-        return {
-            'read_results': request.env['slide.category'].search_read(domain, fields),
-            'can_create': can_create,
-        }
-
-    @http.route('/slides/add_category', type="json", website=True, auth="user")
-    def add_category(self, channel_id, name, **kw):
-        channel = request.env['slide.channel'].browse(channel_id)
-        request.env['slide.category'].create({
-            'name': name,
-            'channel_id': channel.id
-        })
-
-        return {'url': "/slides/%s" %(slug(channel))}
-
-    #Not using the /web/dataset/resequence route as a slide can be dragged into another category at the same time
-    @http.route('/slides/resequence_slides', type="json", website=True, auth="user")
-    def resequence_slides(self, slides_data=None, **kw):
-        channel_user = None
-        for slide in slides_data:
-            s = request.env['slide.slide'].browse(slide['id'])
-            if not channel_user:
-                channel_user = s.channel_id.user_id
-                if request.env.user != channel_user:
-                    return {'error': 'Only the responsible of the channel can edit it'}
-            s.write({
-                'sequence': slide['sequence'],
-                'category_id': slide['category_id']
-            })
-
-
     # --------------------------------------------------
     # EMBED IN THIRD PARTY WEBSITES
     # --------------------------------------------------
diff --git a/addons/website_slides/models/slide_channel.py b/addons/website_slides/models/slide_channel.py
index 3dfba4e7576..30aee951c11 100644
--- a/addons/website_slides/models/slide_channel.py
+++ b/addons/website_slides/models/slide_channel.py
@@ -338,7 +338,7 @@ class Channel(models.Model):
     def action_channel_invite(self):
         self.ensure_one()
 
-        if self.visibility != 'invite':
+        if self.enroll != 'invite':
             raise UserError(_("You cannot send invitations for channels that are not set as 'invite'."))
 
         template = self.env.ref('website_slides.mail_template_slide_channel_invite', raise_if_not_found=False)
diff --git a/addons/website_slides/models/slide_slide.py b/addons/website_slides/models/slide_slide.py
index 0ab75feec59..9ca2eff8adb 100644
--- a/addons/website_slides/models/slide_slide.py
+++ b/addons/website_slides/models/slide_slide.py
@@ -105,7 +105,7 @@ class Slide(models.Model):
     category_id = fields.Many2one('slide.category', string="Category", domain="[('channel_id', '=', channel_id)]")
     tag_ids = fields.Many2many('slide.tag', 'rel_slide_tag', 'slide_id', 'tag_id', string='Tags')
     access_token = fields.Char("Security Token", copy=False, default=_default_access_token)
-    is_preview = fields.Boolean('Always visible', default=False)
+    is_preview = fields.Boolean('Is Preview', default=False, help="The course is accessible by anyone : the users don't need to join the channel to access the content of the course.")
     completion_time = fields.Float('# Hours', default=1, digits=(10, 4))
     # subscribers
     partner_ids = fields.Many2many('res.partner', 'slide_slide_partner', 'slide_id', 'partner_id',
diff --git a/addons/website_slides/static/src/js/slides_category.js b/addons/website_slides/static/src/js/slides_category.js
deleted file mode 100644
index daed1506e26..00000000000
--- a/addons/website_slides/static/src/js/slides_category.js
+++ /dev/null
@@ -1,144 +0,0 @@
-odoo.define('website_slides.add.section', function (require) {
-    'use strict';
-
-    var publicWidget = require('web.public.widget');
-
-    var SectionDialog = publicWidget.Widget.extend({
-        template: 'website.slide.add.section',
-        events: {
-            'hidden.bs.modal': 'destroy',
-            'click button.save': '_save',
-            'click button[data-dismiss="modal"]': '_cancel',
-            'change input#upload': '_slideUpload',
-            'change input#url': '_slideUrl',
-            'click .list-group-item': function (ev) {
-                this.$('.list-group-item').removeClass('active');
-                $(ev.target).closest('li').addClass('active');
-            }
-        },
-
-        /**
-         * @override
-         * @param {Object} el
-         * @param {number} channel_id
-         */
-        init: function (el, channelID) {
-            this._super(el, channelID);
-            this.channel_id = parseInt(channelID, 10);
-            this.index_content = '';
-        },
-        /**
-         * @override
-         */
-        start: function () {
-            this.$el.modal({
-                backdrop: 'static'
-            });
-
-            return this._super.apply(this, arguments);
-        },
-        _getValue: function () {
-            var canvas = this.$('#data_canvas')[0],
-                values = {
-                    'channel_id': this.channel_id || '',
-                    'url': this.$('#url').val(),
-                    'name': this.$('#section_name').val()
-                };
-            return values;
-        },
-        /**
-         * @private
-         */
-        _validate: function () {
-            this.$('.form-group').removeClass('o_has_error').find('.form-control, .custom-select').removeClass('is-invalid');
-            if (!this.$('#name').val()) {
-                this.$('#name').closest('.form-group').addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
-                return false;
-            }
-            var url = this.$('#url').val() ? this.is_valid_url : false;
-            if (!(this.file.name || url)) {
-                this.$('#url').closest('.form-group').addClass('o_has_error').find('.form-control, .custom-select').addClass('is-invalid');
-                return false;
-            }
-            return true;
-        },
-        //--------------------------------------------------------------------------
-        // Handlers
-        //--------------------------------------------------------------------------
-
-        /**
-         * @override
-         * @param {Object} ev
-         */
-        _save: function (ev) {
-            var self = this;
-
-            var values = this._getValue();
-            if ($(ev.target).data('published')) {
-                values.website_published = true;
-            }
-            this.$('.oe_slides_upload_loading').show();
-            this.$('.modal-footer, .modal-body').hide();
-            this._rpc({
-                route: '/slides/add_category',
-                params: values,
-            }).then(function (data) {
-                if (data.error) {
-                    self._displayAlert(data.error);
-                    self.$('.oe_slides_upload_loading').hide();
-                    self.$('.modal-footer, .modal-body').show();
-
-                } else {
-                    window.location = data.url;
-                }
-            });
-        },
-        /**
-         * @override
-         */
-        _cancel: function () {
-            this.trigger('cancel');
-        },
-
-    });
-
-    publicWidget.registry.websiteSlidesSection = publicWidget.Widget.extend({
-        selector: '.oe_slide_js_add_section',
-        xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
-        events: {
-            'click': '_onAddSectionClick',
-        },
-
-        /**
-         * @override
-         */
-        start: function () {
-            // Automatically open the upload dialog if requested from query string
-            if ($.deparam.querystring().enable_slide_upload !== undefined) {
-                this._openDialog(this.$el.attr('channel_id'));
-            }
-            return this._super.apply(this, arguments);
-        },
-
-        //--------------------------------------------------------------------------
-        // Private
-        //--------------------------------------------------------------------------
-
-        _openDialog: function (channelID) {
-            new SectionDialog(this, channelID).appendTo(document.body);
-        },
-
-        //--------------------------------------------------------------------------
-        // Handlers
-        //--------------------------------------------------------------------------
-
-        /**
-         * @private
-         * @param {Event} ev
-         */
-        _onAddSectionClick: function (ev) {
-            console.log('test');
-            this._openDialog($(ev.currentTarget).attr('channel_id'));
-        },
-    });
-});
diff --git a/addons/website_slides/static/src/js/slides_category_add.js b/addons/website_slides/static/src/js/slides_category_add.js
new file mode 100644
index 00000000000..4d34512b100
--- /dev/null
+++ b/addons/website_slides/static/src/js/slides_category_add.js
@@ -0,0 +1,84 @@
+odoo.define('website_slides.category.add', function (require) {
+'use strict';
+
+var sAnimations = require('website.content.snippets.animation');
+var Dialog = require('web.Dialog');
+var core = require('web.core');
+var _t = core._t;
+
+var CategoryAddDialog = Dialog.extend({
+    template: 'slides.category.add',
+
+    /**
+     * @override
+     */
+    init: function (parent, options) {
+        options = _.defaults(options || {}, {
+            title: _t('Add a section'),
+            size: 'medium',
+            buttons: [{
+                text: _t('Save'),
+                classes: 'btn-primary',
+                click: this._onClickFormSubmit.bind(this)
+            }, {
+                text: _t('Discard'),
+                close: true
+            }]
+        });
+
+        this.channelId = options.channelId;
+        this._super(parent, options);
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _formValidate: function ($form) {
+        $form.addClass('was-validated');
+        return $form[0].checkValidity();
+    },
+
+    _onClickFormSubmit: function (ev) {
+        var $form = this.$('#slide_category_add_form');
+        if (this._formValidate($form)) {
+            $form.submit();
+        }
+    },
+});
+
+sAnimations.registry.websiteSlidesCategoryAdd = sAnimations.Class.extend({
+    selector: '.o_wslides_js_slide_section_add',
+    xmlDependencies: ['/website_slides/static/src/xml/slide_management.xml'],
+    read_events: {
+        'click': '_onAddSectionClick',
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _openDialog: function (channelId) {
+        new CategoryAddDialog(this, {channelId: channelId}).open();
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * @private
+     * @param {Event} ev
+     */
+    _onAddSectionClick: function (ev) {
+        ev.preventDefault();
+        this._openDialog($(ev.currentTarget).attr('channel_id'));
+    },
+});
+
+return {
+    categoryAddDialog: CategoryAddDialog,
+    websiteSlidesCategoryAdd: sAnimations.registry.websiteSlidesCategoryAdd
+};
+
+});
diff --git a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
index ff4a4ff4eca..5e6781e8f0a 100644
--- a/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
+++ b/addons/website_slides/static/src/js/slides_course_fullscreen_player.js
@@ -1,4 +1,4 @@
-var onYouTubeIframeAPIReady;
+var onYouTubeIframeAPIReady = undefined;
 
 odoo.define('website_slides.fullscreen', function (require) {
     'use strict';
@@ -22,11 +22,10 @@ odoo.define('website_slides.fullscreen', function (require) {
         * @param {Object} el
         * @param {Object} data holding channelId and optionally upload and publish control parameters
         */
-        init: function(el, course_id,slide_id, user_id){
-            this._super.apply(this,arguments);
-            this.courseID = parseInt(course_id, 10);
-            this.slideID = parseInt(slide_id, 10);
-            this.userID = parseInt(user_id, 10);
+        init: function (el, courseId, slideId, userId) {
+            this.courseID = parseInt(courseId, 10);
+            this.slideID = parseInt(slideId, 10);
+            this.userID = parseInt(userId, 10);
             this.course = undefined;
             this.slide = undefined;
             this.slides = [];
@@ -39,15 +38,14 @@ odoo.define('website_slides.fullscreen', function (require) {
             this.goToQuiz = false;
             this.answeredQuestions = [];
             this.slideTitle = undefined;
+            return this._super.apply(this,arguments);
         },
-        start: function(){
-            var self = this;
+        start: function (){
             this.url = window.location.pathname;
             this.urlToSmallScreen = this.url.replace('/fullscreen','');
             this._getSlides();
             this._renderPlayer();
             this._bindListEvents();
-
             $(document).keydown(this._onKeyDown.bind(this));
             return this._super.apply(this, arguments);
         },
@@ -58,18 +56,18 @@ odoo.define('website_slides.fullscreen', function (require) {
          * @private
          * Renders the player accordingly to the current slide
          */
-        _renderPlayer: function(){
+        _renderPlayer: function (){
             var self = this;
             var embed_url;
-            if(self.slide.slide_type !== 'webpage' || self.slide.htmlContent){
-                if((self.slide.slide_type == "quiz" || self.slide.hasQuiz) && !self.slide.quiz){
+            if (self.slide.slide_type !== 'webpage' || self.slide.htmlContent){
+                if ((self.slide.slide_type === "quiz" || self.slide.has_quiz) && !self.slide.quiz){
                     self._fetchQuiz();
                 } else {
                     embed_url = $(this.slide.embed_code).attr('src');
                     if (self.slide.slide_type === "video"){
                         embed_url = "https://" + embed_url + "&rel=0&autoplay=1&enablejsapi=1&origin=" + window.location.origin;
                     }
-                    $('.o_wslides_fullscreen_player').html(QWeb.render('website.slides.fullscreen', {
+                    $('.o_wslides_fs_player').html(QWeb.render('website.slides.fullscreen', {
                         slide: self.slide,
                         nextSlide: self.nextSlide,
                         questions: self.slide.quiz ? self.slide.quiz.questions: '',
@@ -79,13 +77,13 @@ odoo.define('website_slides.fullscreen', function (require) {
                         letters: self.slide.quiz ? self.letters : '',
                         showMiniQuiz: self.goToQuiz
                     }));
-                    if(self.slide.slide_type === "video"){
+                    if (self.slide.slide_type === "video"){
                       self._renderYoutubeIframe();
                     }
-                    if(self.slide.slide_type == 'webpage'){
+                    if (self.slide.slide_type === 'webpage'){
                         self._renderWebpage();
                     }
-                    if((self.slide.slide_type == "presentation" || self.slide.slide_type == "document" || self.slide.slide_type == "infographic" || self.slide.slide_type == "webpage") && !self.slide.quiz){
+                    if ((self.slide.slide_type === "presentation" || self.slide.slide_type === "document" || self.slide.slide_type === "infographic" || self.slide.slide_type === "webpage") && !self.slide.quiz){
                         self._setSlideStateAsDone();
                     }
                     if ((self.slide.quiz && self.slide.slide_type === "quiz") || self.goToQuiz){
@@ -97,40 +95,40 @@ odoo.define('website_slides.fullscreen', function (require) {
             }
             self._renderTitle();
         },
-        _renderYoutubeIframe: function(){
+        _renderYoutubeIframe: function (){
             var self = this;
               /**
              * Due to issues of synchronization between the youtube api script and the widget's instanciation.
              */
-            try{
+            try {
                 self._setupYoutubePlayer();
             }
             catch (e) {
-                onYouTubeIframeAPIReady = function(){
+                onYouTubeIframeAPIReady = function (){
                     var self = this;
                     self._setupYoutubePlayer();
-                }.bind(this)
+                }.bind(this);
             }
         },
-        _renderWebpage: function(){
+        _renderWebpage: function (){
             var self = this;
-            $(self.slide.htmlContent).appendTo('.o_wslides_fullscreen_webpage_content');
+            $(self.slide.htmlContent).appendTo('.o_wslides_fs_webpage_content');
         },
-        _renderQuiz: function(){
+        _renderQuiz: function (){
             var self = this;
-            var Quiz = new QuizWidget(this, self.slide);
-            Quiz.appendTo('.o_wslides_fullscreen_player');
-            $('.next-slide').click(function(){
+            var Quiz = new QuizWidget(this, self.slide, self.nextSlide);
+            Quiz.appendTo('.o_wslides_fs_player');
+            $('.next-slide').click(function (){
                 self._goToNextSlide();
-            })
-            $('.back-to-video').click(function(){
+            });
+            $('.back-to-video').click(function (){
                 self.goToQuiz = false;
                 self._renderPlayer();
             });
         },
-        _renderTitle: function(){
+        _renderTitle: function (){
             var self = this;
-            $('.o_wslides_fullscreen_slide_title').empty().html(QWeb.render('website.course.fullscreen.title', {
+            $('.o_wslides_fs_slide_title').empty().html(QWeb.render('website.course.fullscreen.title', {
                 slide: self.slide,
                 miniQuiz: self.goToQuiz
             }));
@@ -139,7 +137,7 @@ odoo.define('website_slides.fullscreen', function (require) {
          * @private
          * Links the youtube api to the iframe present in the template
          */
-        _setupYoutubePlayer: function(){
+        _setupYoutubePlayer: function (){
             var self = this;
             self.player = new YT.Player('youtube-player', {
                 host: 'https://www.youtube.com',
@@ -159,18 +157,18 @@ odoo.define('website_slides.fullscreen', function (require) {
          * Once the user reaches a particular time in the video, the slide will be considered as completed if the video doesn't have a mini-quiz.
          * This method also allows to automatically go to the next slide (or the quiz associated to the current video) once the video is over
          */
-        _onPlayerStateChange: function(event){
+        _onPlayerStateChange: function (event){
             var self = this;
             var tid;
             clearInterval(self.tid);
-            if (event.data == YT.PlayerState.PLAYING && !self.slide.done) {
-                self.tid = setInterval(function(){
-                    if(event.target.getCurrentTime){
+            if (event.data === YT.PlayerState.PLAYING && !self.slide.done) {
+                self.tid = setInterval(function (){
+                    if (event.target.getCurrentTime){
                         var currentTime = event.target.getCurrentTime();
                         var totalTime = event.target.getDuration();
-                        if(totalTime && currentTime > totalTime - 30){
+                        if (totalTime && currentTime > totalTime - 30){
                             clearInterval(self.tid);
-                            if(!self.slide.hasQuiz && !self.slide.done){
+                            if (!self.slide.has_quiz && !self.slide.done){
                                 self.slide.done = true;
                                 self._setSlideStateAsDone();
                             }
@@ -178,7 +176,7 @@ odoo.define('website_slides.fullscreen', function (require) {
                     }
                 }, 1000);
             }
-            if(event.data == YT.PlayerState.ENDED){
+            if (event.data === YT.PlayerState.ENDED){
                 self.player = undefined;
                 self._goToNextSlide();
             }
@@ -187,21 +185,12 @@ odoo.define('website_slides.fullscreen', function (require) {
          * @private
          * Creates slides objects from every slide-list-cells attributes
          */
-        _getSlides: function(){
+        _getSlides: function (){
             var self = this;
-            var slides = $('.o_wslides_fullscreen_sidebar_slide_tab');
-            for(var i = 0; i < slides.length;i++){
+            var slides = $('.o_wslides_fs_sidebar_slide_tab');
+            for (var i = 0; i < slides.length;i++){
                 var slide = $(slides[i]);
-                self.slides.push({
-                    id: parseInt(slide.attr('slide_id'), 10),
-                    name: slide.attr('slide_name'),
-                    embed_code: slide.attr('slide_embed_code'),
-                    slide_type: slide.attr('slide_type'),
-                    done: slide.attr('done'),
-                    hasQuiz: slide.attr('quiz'),
-                    slug: slide.attr('slide_slug'),
-                    htmlContent: undefined
-                });
+                self.slides.push(slide.data());
                 this._getActiveSlide();
             }
         },
@@ -210,77 +199,78 @@ odoo.define('website_slides.fullscreen', function (require) {
          * @param {object} slide
          * Fetch the quiz for a particular slide
          */
-        _fetchQuiz: function(){
+        _fetchQuiz: function (){
             var self = this;
             self._rpc({
                 route:"/slide/quiz/get",
                 params: {
                     'slide_id': self.slide.id
                 }
-            }).then(function(data){
-                if(data){
+            }).then(function (data){
+                if (data){
                     self.slide.quiz = data;
                     self._renderPlayer();
                 }
-            })
+            });
         },
-        _fetchHtmlContent: function(){
+        _fetchHtmlContent: function (){
             var self = this;
             self._rpc({
                 route:"/slide/html_content/get",
                 params: {
                     'slide_id': self.slide.id
                 }
-            }).then(function(data){
+            }).then(function (data){
                 if (data.html_content) {
                     self.slide.htmlContent = data.html_content;
                     self._renderPlayer();
                 }
-            })
+            });
         },
         /**
          * @private
          * Once the completion conditions are filled,
          * sends a json request to the backend to set the relation between the slide and the user as being completed
          */
-        _setSlideStateAsDone: function(){
+        _setSlideStateAsDone: function (){
             var self = this;
             self._rpc({
-                route: '/slides/set_completed',
+                route: '/slides/slide/set_completed',
                 params: {
                     slide_id: self.slide.id,
                 }
-            }).then(function(data){
-                $('#check-'+self.slide.id).replaceWith($('<i class="check-done o_wslides_slide_completed fa fa-check-circle"></i>'))
-                self.slide.done = true;
-                clearInterval(self.tid);
-                self.channelCompletion = data.channel_completion;
-                self._updateProgressbar();
+            }).then(function (data) {
+                if (! data.error) {
+                    $('#check-'+self.slide.id).replaceWith($('<i class="check-done o_wslides_slide_completed fa fa-check-circle"></i>'));
+                    self.slide.done = true;
+                    clearInterval(self.tid);
+                    self.channelCompletion = data.channel_completion;
+                    self._updateProgressbar();
+                }
             });
         },
-        _updateProgressbar: function(){
-            var self = this;
-            var completion = self.channelCompletion <= 100 ? self.channelCompletion : 100;
-            $('.o_wslides_fullscreen_sidebar_progress_gauge').css('width', completion + "%" );
-            $('.o_wslides_progress_percentage').text(completion);
+        _updateProgressbar: function () {
+            var completion = _.min([this.channelCompletion, 100]);
+            this.$('.o_wslides_fs_sidebar_progressbar .progress-bar').css('width', completion + "%" );
+            this.$('.o_wslides_progress_percentage').text(completion);
         },
         /**
          * @private
          * Creates an array of letters to be used in the quiz with a foreach
          */
-        _generateQuizLetters: function(){
+        _generateQuizLetters: function (){
             var letters = [];
-            for(var i = 65; i < 91; i++){
+            for (var i = 65; i < 91; i++){
                 letters.push(String.fromCharCode(i));
             }
             return letters;
         },
-        _goToNextSlide: function(){
+        _goToNextSlide: function (){
             var self = this;
             clearInterval(self.tid);
             self.player = undefined;
-            self.goToQuiz = self.slide.hasQuiz && !self.goToQuiz;
-            if(self.nextSlide && !self.goToQuiz){
+            self.goToQuiz = self.slide.has_quiz && !self.goToQuiz && self.slide.slide_type !== 'quiz';
+            if (self.nextSlide && !self.goToQuiz){
                 self.slide = self.nextSlide;
                 self.index++;
                 self._setActiveTab();
@@ -289,16 +279,16 @@ odoo.define('website_slides.fullscreen', function (require) {
                 self._updateUrl();
                 history.pushState(null,'',self.url);
             }
-            else if(self.nextSlide){
+            else if (self.nextSlide){
                 self._renderPlayer();
             }
         },
-        _goToPreviousSlide: function(){
+        _goToPreviousSlide: function (){
             var self = this;
             clearInterval(self.tid);
             self.goToQuiz = false;
             self.player = undefined;
-            if(self.previousSlide){
+            if (self.previousSlide){
                 self.slide = self.previousSlide;
                 self.index--;
                 self._setActiveTab();
@@ -308,7 +298,7 @@ odoo.define('website_slides.fullscreen', function (require) {
                 history.pushState(null,'',self.url);
             }
         },
-        _setPreviousAndNextSlides: function(){
+        _setPreviousAndNextSlides: function (){
             var self = this;
             self.previousSlide = self.index > 0 ? self.slides[self.index-1] : undefined;
             self.nextSlide = self.index < (self.slides.length - 1) ? self.slides[self.index+1] : undefined;
@@ -317,7 +307,7 @@ odoo.define('website_slides.fullscreen', function (require) {
          * Changes the url whenever the user changes slides.
          * This allows the user to refresh the page and stay at the right video
          */
-        _updateUrl: function(){
+        _updateUrl: function (){
             var self = this;
             var url = window.location.pathname.split('/');
             url[url.length-1] = self.slide.slug;
@@ -330,21 +320,21 @@ odoo.define('website_slides.fullscreen', function (require) {
         /**
          * Whenever the user changes slide, change the active tab
          */
-        _setActiveTab: function(){
+        _setActiveTab: function (){
             var self = this;
             self.activeTab.removeClass('active');
             $('li.active').removeClass('active');
-            $('li[slide_id='+self.slide.id+']').addClass('active');
-            self.activeTab = $('.o_wslides_fullscreen_sidebar_slide_tab[index="'+self.index+'"]')
+            $('li[data-slide-id='+self.slide.id+']').addClass('active');
+            self.activeTab = $('.o_wslides_fs_sidebar_slide_tab[index="'+self.index+'"]');
             self.activeTab.addClass('active');
         },
         /**
          * The first time the user gets on the player,
          * get the slide that is represented by the active tab in the sidebar
          */
-        _getActiveSlide: function(){
+        _getActiveSlide: function (){
             var self = this;
-            self.activeTab = $('.o_wslides_fullscreen_sidebar_slide_tab.active');
+            self.activeTab = $('.o_wslides_fs_sidebar_slide_tab.active');
             self.index = parseInt(self.activeTab.attr('index'), 10);
             self.slide = self.slides[self.index];
             self._setPreviousAndNextSlides();
@@ -352,26 +342,32 @@ odoo.define('website_slides.fullscreen', function (require) {
         //--------------------------------------------------------------------------
         // Handlers
         //--------------------------------------------------------------------------
-        _onListCellClick: function(ev){
+        _onListCellClick: function (ev){
             var self = this;
             clearInterval(self.tid);
             self.player = undefined;
             var target = $(ev.currentTarget);
             self.goToQuiz = false;
-            if(target[0] !== self.activeTab[0]){
+            if (target[0] !== self.activeTab[0]){
                 self.activeTab.removeClass('active');
                 target.addClass('active');
                 self.index = parseInt(target.attr('index'));
                 self._getActiveSlide();
                 self._renderPlayer();
                 $('li.active').removeClass('active');
-                $('li[slide_id='+self.slide.id+']').addClass('active');
+                $('li[data-slide-id='+self.slide.id+']').addClass('active');
                 self._setPreviousAndNextSlides();
                 self._updateUrl();
                 history.pushState(null,'',self.url);
             }
         },
-        _onMiniQuizClick: function(ev){
+        _sidebarToggle: function (ev){
+            ev.preventDefault();
+            $(ev.currentTarget).toggleClass('active');
+            $('.o_wslides_fs_sidebar').toggleClass('o_wslides_fs_sidebar_hidden');
+            $('.o_wslides_fs_player').toggleClass('o_wslides_fs_player_no_sidebar');
+        },
+        _onMiniQuizClick: function (ev){
             var self = this;
             self.index = parseInt($(ev.currentTarget).attr('index'));
             self.slide = self.slides[self.index];
@@ -386,19 +382,21 @@ odoo.define('website_slides.fullscreen', function (require) {
         * @private
         * Binds events related to the list
         */
-        _bindListEvents: function(){
+        _bindListEvents: function (){
             var self = this;
-            $('.o_wslides_fullscreen_sidebar_slide_tab').each(function () {
+            $('.o_wslides_fs_sidebar_slide_tab').each(function () {
                 $(this).click(self._onListCellClick.bind(self));
             });
-
-            $('.o_wslides_slide_quiz ').each(function(){
+            $('.o_wslides_fs_slide_quiz ').each(function (){
                 $(this).click(self._onMiniQuizClick.bind(self));
-            })
+            });
+            $('.o_wslides_fs_toggle_sidebar').click(function (ev){
+                self._sidebarToggle(ev);
+            });
         },
-        _onKeyDown: function(ev){
+        _onKeyDown: function (ev){
             var self = this;
-            switch(ev.key){
+            switch (ev.key){
                 case "ArrowRight":
                 self._goToNextSlide();
                 break;
@@ -407,21 +405,22 @@ odoo.define('website_slides.fullscreen', function (require) {
                 break;
             }
         },
-    })
+    });
 
     publicWidget.registry.websiteSlidesFullscreenPlayer = publicWidget.Widget.extend({
-        selector: '.oe_js_course_slide',
+        selector: '.o_wslides_fs_main',
         xmlDependencies: ['/website_slides/static/src/xml/website_slides_fullscreen.xml'],
-        init: function(el){
+        init: function (el){
             this._super.apply(this, arguments);
         },
-        start: function(){
-            this._super.apply(this, arguments);
-            var user_id = this.$el.attr('user_id');
-            var course_id = this.$el.attr('course_id');
-            var slide_id = this.$el.attr('slide_id');
-            var fullscreen = new Fullscreen(this, course_id, slide_id, user_id);
-            fullscreen.appendTo(".oe_js_course_slide");
+        start: function (){
+            var defs = [this._super.apply(this, arguments)];
+            var userId = this.$el.data('userId');
+            var courseId = this.$el.data('courseId');
+            var slideId = this.$el.data('slideId');
+            var fullscreen = new Fullscreen(this, courseId, slideId, userId);
+            defs.push(fullscreen.attachTo(this.$el));
+            return $.when.apply($, defs);
         }
     });
 
diff --git a/addons/website_slides/static/src/js/slides_join_channel.js b/addons/website_slides/static/src/js/slides_course_join.js
similarity index 77%
rename from addons/website_slides/static/src/js/slides_join_channel.js
rename to addons/website_slides/static/src/js/slides_course_join.js
index 0ad83a89d5e..9fd6043a369 100644
--- a/addons/website_slides/static/src/js/slides_join_channel.js
+++ b/addons/website_slides/static/src/js/slides_course_join.js
@@ -1,4 +1,4 @@
-odoo.define('website_slides.slides_join_channel', function (require) {
+odoo.define('website_slides.course.join.widget', function (require) {
 'use strict';
 
 var core = require('web.core');
@@ -7,9 +7,9 @@ require('website_slides.slides');
 
 var _t = core._t;
 
-var JoinChannelButton = publicWidget.Widget.extend({
+var CourseJoinWidget = publicWidget.extend({
     events: {
-        'click .o_wslides_join_channel_link': '_onClickJoin',
+        'click .o_wslides_js_course_join_link': '_onClickJoin',
     },
 
     //--------------------------------------------------------------------------
@@ -64,17 +64,27 @@ var JoinChannelButton = publicWidget.Widget.extend({
     },
 });
 
-publicWidget.registry.websiteSlidesJoinChannel = publicWidget.Widget.extend({
-    selector: '#wrapwrap',
+publicWidget.registry.websiteSlidesCourseJoin = publicWidget.Widget.extend({
+    selector: '.o_wslides_wrap',
 
     /**
      * @override
      * @param {Object} parent
      */
     start: function () {
+        var self = this;
         var defs = [this._super.apply(this, arguments)];
-        defs.push(new JoinChannelButton(this).attachTo($('.o_wslides_join_channel')));
+        $('.o_wslides_js_course_join').each(function () {
+            defs.push(new CourseJoinWidget(self).attachTo($(this)));
+        });
         return $.when.apply($, defs);
     },
 });
+
+
+return {
+    courseJoinWidget: CourseJoinWidget,
+    websiteSlidesCourseJoin: publicWidget.registry.websiteSlidesCourseJoin
+};
+
 });
diff --git a/addons/website_slides/static/src/js/slides_course_progress_bar.js b/addons/website_slides/static/src/js/slides_course_progress_bar.js
deleted file mode 100644
index c65f117e928..00000000000
--- a/addons/website_slides/static/src/js/slides_course_progress_bar.js
+++ /dev/null
@@ -1,47 +0,0 @@
-odoo.define('website_slides.progress.bar', function (require) {
-    'use strict';
-
-    var publicWidget = require('web.public.widget');
-
-    var ProgressBar = publicWidget.Widget.extend({
-
-        /**
-         * @override
-         * @param {Object} el
-         * @param {number} channel_id
-         */
-        init: function (el, completion) {
-            this._super(el);
-            this.completion = completion;
-        },
-        /**
-         * @override
-         */
-        start: function () {
-            this._renderProgressBar();
-            return this._super.apply(this, arguments);
-        },
-        //--------------------------------------------------------------------------
-        // Handlers
-        //--------------------------------------------------------------------------
-        _renderProgressBar: function (ev) {
-            var self = this;
-            $('.oe_slide_js_progress_bar').css('width', (self.completion <= 100 ? self.completion : 100)  + '%');
-        },
-    });
-
-    publicWidget.registry.websiteSlidesProgressBar = publicWidget.Widget.extend({
-        selector: '.oe_slide_js_progress_bar',
-        /**
-         * @override
-         */
-        start: function () {
-            var completion = parseInt($('.oe_slide_js_progress_bar').attr('channel_completion'));
-            var progressBar = new ProgressBar(this, completion);
-            progressBar.appendTo(".oe_slide_js_progress_bar");
-            return this._super.apply(this, arguments);
-        },
-    });
-
-    return ProgressBar;
-});
diff --git a/addons/website_slides/static/src/js/slides_course_quiz.js b/addons/website_slides/static/src/js/slides_course_quiz.js
index 7de8c3d20bd..3b72a5ab7b1 100644
--- a/addons/website_slides/static/src/js/slides_course_quiz.js
+++ b/addons/website_slides/static/src/js/slides_course_quiz.js
@@ -13,39 +13,41 @@ odoo.define('website_slides.quiz', function (require) {
         * @param {Object} data holding all the slide elements needed for the quiz
         * It will either come from the fullscreen widget or the sAnimation at the end of this file
         */
-        init: function(el, data){
+        init: function (el, data, nextSlide){
             this.slide = data;
+            this.nextSlide = nextSlide;
             this.answeredQuestions = [];
             this.fullscreen = el;
             return this._super.apply(this,arguments);
         },
-        start: function(){
+        start: function (){
             var self = this;
             self._bindQuizEvents();
             /**
              * If the quiz is rendered by the server instead of the fullscreen widget,
              * questions and their answers will have to be created manually from attributes
              */
-            if(self.slide.quiz.questions.length === 0){
+            if (self.slide.quiz.questions.length === 0){
                 this._setQuestions();
             }
             return this._super.apply(this, arguments);
         },
-        _renderSuccessModal: function(){
+        _renderSuccessModal: function (data){
             var self =this;
-            $('.o_wslides_fullscreen_quiz').append(QWeb.render('website.course.quiz.success', {
-                data: data
+            $('.o_wslides_fs_quiz').append(QWeb.render('website.course.quiz.success', {
+                data: data,
+                nextSlide: self.nextSlide
             }));
             $('.submit-quiz').remove();
             $('.next-slide').css('display', 'inline-block');
-            $('.next-slide').click(function(){
+            $('.next-slide').click(function (){
                 self.fullscreen._goToNextSlide();
             });
-            $('.o_wslides_quiz_success_modal_close').click(function(){
+            $('.o_wslides_quiz_success_modal_close').click(function (){
                 $('.o_wslides_quiz_success_modal').remove();
                 $('.o_wslides_quiz_modal_background').remove();
             });
-            $(".o_wslides_quiz_modal_background").click(function(ev){
+            $(".o_wslides_quiz_modal_background").click(function (ev){
                 $(ev.currentTarget).remove();
                 $('.o_wslides_quiz_success_modal').remove();
             });
@@ -58,21 +60,20 @@ odoo.define('website_slides.quiz', function (require) {
         * In case the quiz is rendered by the server and the data don't come from the fullscreen widget,
         * questions and their answers will have to be set here by using attributes
         */
-        _setQuestions: function(){
+        _setQuestions: function (){
             var self = this;
-            $('.o_wslides_quiz_question').each(function(){
+            $('.o_wslides_quiz_question').each(function (){
                 self.slide.quiz.questions.push({
                     id: parseInt($(this).attr('id')),
                     title: $(this).attr('title'),
                     answers: []
                 });
-            })
-            for(var i = 0; i < self.slide.quiz.questions.length; i++){
+            });
+            for (var i = 0; i < self.slide.quiz.questions.length; i++){
                 self._setAnswersForQuestion(self.slide.quiz.questions[i]);
             }
         },
         _setAnswersForQuestion: function (question){
-            var self = this;
             $('.o_wslides_quiz_answer[question_id='+question.id+']').each(function (){
                 question.answers.push({
                     id: parseInt($(this).attr('id')),
@@ -84,13 +85,13 @@ odoo.define('website_slides.quiz', function (require) {
         _updateProgressbar: function (){
             var self = this;
             var completion = self.channelCompletion <= 100 ? self.channelCompletion : 100;
-            $('.o_wslides_fullscreen_sidebar_progress_gauge').css('width', completion + "%" );
+            $('.o_wslides_fs_sidebar_progress_gauge').css('width', completion + "%" );
             $('.o_wslides_progress_percentage').text(completion);
         },
         _bindQuizEvents: function (){
             var self = this;
             if (!self.slide.done){
-                $('.o_wslides_quiz_answer').each(function(){
+                $('.o_wslides_quiz_answer').each(function (){
                     $(this).click(self._onAnswerClick.bind(self));
                 });
             }
@@ -105,10 +106,10 @@ odoo.define('website_slides.quiz', function (require) {
                 var questionID =$('#answer'+ answers.goodAnswers[i] +' .o_wslides_quiz_radio_box input').attr('question_id');
                 self.answeredQuestions.push(questionID);
                 $('.o_wslides_quiz_answer[question_id='+questionID+']:not(.o_wslides_quiz_good_answer)').addClass('o_wslides_quiz_ignored_answer');
-                $('.o_wslides_quiz_answer[question_id='+questionID+']').each(function(){
-                    $(this).unbind('click')
+                $('.o_wslides_quiz_answer[question_id='+questionID+']').each(function (){
+                    $(this).unbind('click');
                 });
-                $('input[question_id='+questionID+']').each(function(){
+                $('input[question_id='+questionID+']').each(function (){
                     $(this).prop('disabled',true);
                 });
             }
@@ -149,7 +150,7 @@ odoo.define('website_slides.quiz', function (require) {
                         answer_ids: values,
                         quiz_id: self.slide.quiz_id
                     }
-                }).then(function(data){
+                }).then(function (data){
                     self._highlightAnswers(data);
                     self.slide.quiz.nb_attempts = data.attempts_count;
                     if (data.passed){
@@ -157,14 +158,15 @@ odoo.define('website_slides.quiz', function (require) {
                         self._updateProgressbar();
                         $('#check-'+self.slide.id).replaceWith($('<i class="check-done o_wslides_slide_completed fa fa-check-circle"></i>'));
                         self.slide.done = true;
-                        self._renderSuccessModal();
+                        self._renderSuccessModal(data);
                     }
                     else {
-                        $('#quiz-points').text(self.slide.quiz.nb_attempts < 3 ? self.slide.quiz.possible_rewards[self.slide.quiz.nb_attempts] : self.slide.quiz.possible_rewards[self.slide.quiz.possible_rewards.length-1]);
+                        var points = self.slide.quiz.nb_attempts < self.slide.quiz.possible_rewards.length ? self.slide.quiz.possible_rewards[self.slide.quiz.nb_attempts] : self.slide.quiz.possible_rewards[self.slide.quiz.possible_rewards.length-1];
+                        $('#quiz-points').text(points);
                     }
                 });
             } else {
-                $('.o_wslides_fullscreen_player').append($('<p class="quiz-danger text-danger mt-1">All questions must be answered !</p>'));
+                $('#quiz_buttons').append($('<p class="quiz-danger text-danger mt-1">All questions must be answered !</p>'));
             }
         },
 });
@@ -184,7 +186,7 @@ odoo.define('website_slides.quiz', function (require) {
             var secondAttemptReward = this.$el.attr('second_reward');
             var thirdAttemptReward = this.$el.attr('third_reward');
             var fourthAttemptReward = this.$el.attr('fourth_reward');
-            var possibleRewards = [firstAttemptReward,secondAttemptReward,thirdAttemptReward,fourthAttemptReward]
+            var possibleRewards = [firstAttemptReward,secondAttemptReward,thirdAttemptReward,fourthAttemptReward];
             var data = {
                 id: slideID,
                 done: slideDone,
@@ -194,8 +196,8 @@ odoo.define('website_slides.quiz', function (require) {
                     possible_rewards: possibleRewards,
                     reward: nbAttempts < possibleRewards.length ? possibleRewards[nbAttempts] : possibleRewards[possibleRewards.length-1]
                 }
-            }
-            if(!slideDone){
+            };
+            if (!slideDone){
                 var NewQuiz = new Quiz(this, data);
                 NewQuiz.appendTo(".o_w_slides_quiz_no_fullscreen");
             }
diff --git a/addons/website_slides/static/src/js/slides_course_sidebar_list.js b/addons/website_slides/static/src/js/slides_course_sidebar_list.js
deleted file mode 100644
index 32896eb50e7..00000000000
--- a/addons/website_slides/static/src/js/slides_course_sidebar_list.js
+++ /dev/null
@@ -1,33 +0,0 @@
-odoo.define('website_slides.sidebar', function (require) {
-    'use strict';
-
-    var publicWidget = require('web.public.widget');
-
-    var SideBar = publicWidget.Widget.extend({
-        init: function (el){
-            this._super.apply(this,arguments);
-        },
-        start: function (){
-            $('.o_wslides_fullscreen_toggle_sidebar').click(function (ev){
-                ev.preventDefault();
-                $(ev.currentTarget).toggleClass('active');
-                $('.o_wslides_fullscreen_sidebar').toggleClass('o_wslides_fullscreen_sidebar_hidden');
-                $('.o_wslides_fullscreen_player').toggleClass('o_wslides_fullscreen_player_no_sidebar')
-            })
-            return this._super.apply(this, arguments);
-        },
-    });
-
-    publicWidget.registry.websiteSlidesSidebarList = publicWidget.Widget.extend({
-        selector: '.o_wslides_fullscreen_toggle_sidebar',
-        // xmlDependencies: ['/website_slides/static/src/xml/website_slides.xml'],
-        init: function (el){
-            this._super.apply(this, arguments);
-        },
-        start: function (){
-            this._super.apply(this, arguments);
-            var sideBar = new SideBar(this);
-            sideBar.appendTo(".oe_js_side_bar_list");
-        }
-    });
-});
diff --git a/addons/website_slides/static/src/js/slides_course_slides_list.js b/addons/website_slides/static/src/js/slides_course_slides_list.js
index fe80ac5b393..ac11e94259e 100644
--- a/addons/website_slides/static/src/js/slides_course_slides_list.js
+++ b/addons/website_slides/static/src/js/slides_course_slides_list.js
@@ -1,251 +1,143 @@
-odoo.define('website_slides.slideslist', function (require) {
-    'use strict';
+odoo.define('website_slides.course.slides.list', function (require) {
+'use strict';
 
-    var publicWidget = require('web.public.widget');
+var publicWidget = require('web.public.widget');
 
-    var SlideUpload = require('website_slides.upload_modal');
+publicWidget.registry.websiteSlidesCourseSlidesList = publicWidget.Widget.extend({
+    selector: '.o_wslides_slides_list',
+    xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
 
-    var List = publicWidget.Widget.extend({
-        init: function (el){
-            this._super.apply(this,arguments);
-            this.draggedElement = undefined;
-            this.dropTarget = undefined;
-            this.slideCount = undefined;
-            this.slides = [];
-            this.categories = [];
-        },
-        start: function (){
-            this._super.apply(this,arguments);
-            this.slideCount = $('li.content-slide').length;
-            //Change links HREF to fullscreen mode for SEO
-            var links = $(".link-to-slide");
-            for (var i = 0; i < links.length; i++){
-                $(links[i]).attr('href', $(links[i]).attr('href') + "?fullscreen=1");
-            }
-            this._bindEvents();
-        },
-        _bindEvents: function (){
-            var self = this;
-            $('.slide-draggable').each(function (){
-               self._addSlideDragAndDropHandlers($(this));
-            });
-            $('.section-draggable').each(function (){
-                self._addSectionDragAndDropHandlers($(this));
-            });
-            $('.course-section').each(function (){
-                self._addDropSlideOnSectionHandler($(this));
-            });
-        },
-        _unbind: function (className){
-            $("."+className).each(function (){
-                $(this).unbind();
-            });
-        },
-        _unbindAll: function (){
-            this._unbind('slide-draggable');
-            this._unbind('section-draggable');
-            this._unbind('course-section');
-        },
-        _getSlides: function (){
-            var self = this;
-            var slides = $('li.content-slide');
-            for(var i = 0; i < slides.length;i++){
-                var slide = $(slides[i]);
-                self.slides.push({
-                    id: parseInt(slide.attr('slide_id')),
-                    category_id: parseInt(slide.attr('category_id')),
-                    sequence: i
-                });
-            }
-        },
-        _getCategories: function (){
-            var self = this;
-            self.categories = [];
-            var categories = $('.course-section');
-            for (var i = 0; i < categories.length;i++){
-                var category = $(categories[i]);
-                self.categories.push(parseInt(category.attr('category_id')));
-            }
-        },
-        _addDropSlideOnSectionHandler: function (target){
-            var self = this;
-            target.on('drop', function (ev){
-                if (ev.preventDefault){
-                    ev.preventDefault();
-                }
-                self.dropTarget = $(ev.currentTarget);
-                self.draggedElement[0].parentNode.removeChild(self.draggedElement[0]);
-                $('ul[category_id='+target.attr('category_id')+']').append(self.draggedElement)
-                self._addSlideDragAndDropHandlers(self.draggedElement);
-                self._reorderSlides();
-            });
-            target.on('dragover', function (ev){
-                if(ev.preventDefault){
-                    ev.preventDefault();
-                }
-            });
-        },
-        _addSlideDragAndDropHandlers: function (target){
-            var self = this;
-            target.on('dragstart', function (ev){
-                $('.section-draggable').removeClass('hold')
-                self._unbind('section-draggable');
-                ev.originalEvent.dataTransfer.effectAllowed = 'move';
-                ev.originalEvent.dataTransfer.setData('text/html', this.outerHTML);
-                self.draggedElement = target;
-                self.draggedElement.addClass('hold');
-            });
-            target.on('dragover', function (ev){
-                if ($(ev.currentTarget) !== self.draggedElement){
-                    if (ev.preventDefault){
-                        ev.preventDefault();
-                    }
-                    target.addClass('slide-hovered');
-                }
-            });
-            target.on('dragleave', function (ev){
-                if (ev.preventDefault){
-                    ev.preventDefault();
-                }
-                target.removeClass('slide-hovered');
-            });
-            target.on('drop', function (ev){
-                if (self.draggedElement.hasClass('slide-draggable') && target.hasClass('slide-draggable')){
-                    if (ev.preventDefault){
-                        ev.preventDefault();
-                    }
-                    target.removeClass('slide-hovered');
-                    target.removeClass('hold');
-                    if (target !== self.draggedElement){
-                        self.dropTarget = $(ev.currentTarget);
-                        self.draggedElement[0].parentNode.removeChild(self.draggedElement[0]);
-                        var dropHTML = ev.originalEvent.dataTransfer.getData('text/html');
-                        target[0].insertAdjacentHTML('beforebegin',dropHTML);
-                        self.draggedElement = $(target[0].previousSibling);
-                        self._reorderSlides();
-                    }
-                    self._unbindAll();
-                    self._bindEvents();
-                }
-            });
-            target.on('dragend', function (ev){
-                if (ev.preventDefault){
-                    ev.preventDefault();
-                }
-                target.removeClass('slide-hovered');
-                target.removeClass('hold');
-            });
-        },
-        _addSectionDragAndDropHandlers: function(target){
-            var self = this;
-            target.on('dragstart', function (ev){
-                self._unbind('slide-draggable');
-                self._unbind('course-section');
-                ev.originalEvent.dataTransfer.effectAllowed = 'move';
-                ev.originalEvent.dataTransfer.setData('text/html', this.outerHTML);
-                self.draggedElement = target;
-                self.draggedElement.addClass('hold');
-            });
-            target.on('dragover', function (ev){
-                if (target.hasClass('section-draggable') && self.draggedElement.hasClass('section-draggable')){
-                    if (ev.preventDefault){
-                        ev.preventDefault();
-                    }
-                    target.addClass('slide-hovered');
-                }
-            });
-            target.on('dragleave', function (ev){
-                if (ev.preventDefault){
-                    ev.preventDefault();
-                }
-                target.removeClass('slide-hovered');
-            });
-            target.on('drop', function (ev){
-                if(ev.preventDefault){
-                    ev.preventDefault();
-                }
-                if(self.draggedElement.hasClass('section-draggable')  && target.hasClass('section-draggable')){
-                    target.removeClass('slide-hovered');
-                    target.removeClass('hold');
-                    self.dropTarget = $(ev.currentTarget);
-                    if(target !== self.draggedElement && $(ev.currentTarget).hasClass('section-draggable')){
-                        self.draggedElement[0].parentNode.removeChild(self.draggedElement[0]);
-                        var dropHTML = ev.originalEvent.dataTransfer.getData('text/html');
-                        target[0].insertAdjacentHTML('beforebegin',dropHTML);
-                        self.draggedElement = $(target[0].previousSibling);
-                        self._reorderCategories();
-                        self._reorderSlides();
-                        self._rebindUploadButton(self.draggedElement.attr('category_id'));
-                    }
-                    self._unbindAll();
-                    self._bindEvents();
-                }
-            });
-            target.on('dragend', function (ev){
-                if (ev.preventDefault){
-                    ev.preventDefault();
-                }
-                target.removeClass('slide-hovered');
-                target.removeClass('hold');
-            });
-        },
-        _reorderCategories: function (){
-            var self = this;
-            self._getCategories();
-            self._rpc({
-                route: '/web/dataset/resequence',
-                params: {
-                    model: "slide.category",
-                    ids: self.categories
-                }
-            }).then(function (){
-                self._resetCategoriesIndex();
-            });
-        },
-        _resetCategoriesIndex: function (){
-            var categoriesIndexes = $('.section-index')
-            for (var i = 0; i < categoriesIndexes.length; i++){
-                $(categoriesIndexes[i]).text(i+1)
-            }
-        },
-        _reorderSlides: function(){
-            var self = this;
-            // In case the slide was transfered to another section
-            if (self.draggedElement.hasClass('slide-draggable')){
-                self.draggedElement.attr('category_id', parseInt(self.dropTarget.attr('category_id')))
-            }
-            self.slides = [];
-            self._getSlides();
-            self._rpc({
-                route: "/slides/resequence_slides",
-                params: {
-                    slides_data: self.slides
-                }
-            }).then(function(){
-            });
-        },
-        _rebindUploadButton: function(categoryID){
-            var self = this;
-            this.$('.oe_slide_js_upload[data-category-id='+categoryID+']').click(function(ev){
-                ev.preventDefault();
-                var data = $(ev.currentTarget).data();
-                var dialog = new SlideUpload.SlideUploadDialog(self, data);
-                dialog.appendTo(document.body);
-                dialog.open();
-            })
-        }
-    })
+    start: function () {
+        this._super.apply(this,arguments);
+
+        this.channelId = this.$el.data('channelId');
+
+        this._updateHref();
+        this._bindSortable();
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------,
+
+    /**
+     * Bind the sortable jQuery widget to both
+     * - course sections
+     * - course slides
+     *
+     * @private
+     */
+    _bindSortable: function () {
+        this.$('ul.o_wslides_slides_list_container').sortable({
+            handle: '.fa-arrows',
+            stop: this._reorderCategories.bind(this),
+            items: '.o_wslides_slide_list_category'
+        });
+
+        this.$('.o_wslides_slides_list_container ul').sortable({
+            handle: '.fa-arrows',
+            connectWith: '.o_wslides_slides_list_container ul',
+            stop: this._reorderSlides.bind(this),
+            items: '.o_wslides_slides_list_slide:not(.o_wslides_empty_category)'
+        });
+    },
+
+    /**
+     * This method will check that a section is empty/not empty
+     * when the slides are reordered and show/hide the
+     * "Empty category" placeholder.
+     *
+     * @private
+     */
+    _checkForEmptySections: function (){
+        this.$('.o_wslides_slides_list_container ul').each(function (){
+            var $emptyCategory = $(this).find('.o_wslides_empty_category');
+            if ($(this).find('li.o_wslides_slides_list_slide[data-slide-id]').length === 0) {
+                $emptyCategory.removeClass('d-none').addClass('d-flex');
+            } else {
+                $emptyCategory.addClass('d-none').removeClass('d-flex');
+            }
+        });
+    },
+
+    _getCategories: function (){
+        var categories = [];
+        this.$('.o_wslides_js_category').each(function (){
+            categories.push(parseInt($(this).data('categoryId')));
+        });
+        return categories;
+    },
+
+    /**
+     * Returns a slides dict in the form:
+     * {slide_id: {'sequence': slide_sequence, 'category_id': slide.category_id.id}}
+     *
+     *
+     * (Uncategorized slides don't have the category_id key)
+     *
+     * @private
+     */
+    _getSlides: function (){
+        var slides = {};
+        this.$('li.o_wslides_slides_list_slide[data-slide-id]').each(function (index){
+            var $slide = $(this);
+            var values = {
+                sequence: index
+            };
+
+            var categoryId = $slide.closest('.o_wslides_slide_list_category').data('categoryId');
+            if (typeof categoryId !== typeof undefined && categoryId !== false) {
+                values.category_id = categoryId;
+            }
+
+            slides[$slide.data('slideId')] = values;
+        });
+
+        return slides;
+    },
+
+    _reorderCategories: function (){
+        var self = this;
+        self._rpc({
+            route: '/web/dataset/resequence',
+            params: {
+                model: "slide.category",
+                ids: self._getCategories()
+            }
+        });
+    },
+
+    _reorderSlides: function (){
+        this._checkForEmptySections();
+
+        this._rpc({
+            route: "/slides/channel/resequence",
+            params: {
+                channel_id: this.channelId,
+                slides_data: this._getSlides()
+            }
+        });
+    },
+
+    /**
+     * Change links href to fullscreen mode for SEO.
+     *
+     * Specifications demand that links are generated (xml) without the "fullscreen"
+     * parameter for SEO purposes.
+     *
+     * This method then adds the parameter as soon as the page is loaded.
+     *
+     * @private
+     */
+    _updateHref: function () {
+        this.$(".o_wslides_slides_list_slide_link").each(function (){
+            var href = $(this).attr('href');
+            var operator = href.indexOf('?') !== -1 ? '&' : '?';
+            $(this).attr('href', href + operator + "fullscreen=1");
+        });
+    }
+});
+
+return publicWidget.registry.websiteSlidesCourseSlidesList;
 
-    publicWidget.registry.websiteSlidesCourseSlidesList = publicWidget.Widget.extend({
-        selector: '.oe_js_course_slides_list',
-        xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
-        init: function (el){
-            this._super.apply(this, arguments);
-        },
-        start: function (){
-            this._super.apply(this, arguments);
-            var list = new List(this);
-            list.appendTo(".oe_js_course_slides_list");
-        }
-    });
 });
diff --git a/addons/website_slides/static/src/js/slides_delete_slide.js b/addons/website_slides/static/src/js/slides_delete_slide.js
deleted file mode 100644
index 77ceec5ba16..00000000000
--- a/addons/website_slides/static/src/js/slides_delete_slide.js
+++ /dev/null
@@ -1,84 +0,0 @@
-odoo.define('website_slides.delete.slide', function (require) {
-    'use strict';
-
-    var publicWidget = require('web.public.widget');
-
-    var DeleteSlideDialog = publicWidget.Widget.extend({
-        template: 'website.slide.delete.slide',
-        events: {
-            'hidden.bs.modal': 'destroy',
-            'click button[data-dismiss="modal"]': '_cancel',
-            'click button.delete': '_delete'
-        },
-
-        /**
-         * @override
-         * @param {Object} el
-         * @param {number} channel_id
-         */
-        init: function (el, slideID) {
-            this._super(el, slideID);
-            this.slide_id = parseInt(slideID, 10);
-        },
-        /**
-         * @override
-         */
-        start: function () {
-            this.$el.modal({
-                backdrop: 'static'
-            });
-            return this._super.apply(this, arguments);
-        },
-        //--------------------------------------------------------------------------
-        // Handlers
-        //--------------------------------------------------------------------------
-        _delete: function (ev) {
-            var self = this;
-            // TO FIX: CallBack is not executed
-            $('[slide_id='+this.slide_id+']').remove();
-            this._rpc({
-                model: 'slide.slide',
-                method: 'unlink',
-                args: [[self.slide_id]],
-            }).then(function () {
-                $('[slide='+this.slide_id+']').remove();
-            });
-        },
-        /**
-         * @override
-         */
-        _cancel: function () {
-            this.trigger('cancel');
-        }
-    });
-
-    publicWidget.registry.websiteSlidesDeleteSlide = publicWidget.Widget.extend({
-        selector: '.oe_slide_js_delete_slide',
-        xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
-        events: {
-            'click': '_onDeleteSlideClick',
-        },
-
-        //--------------------------------------------------------------------------
-        // Private
-        //--------------------------------------------------------------------------
-
-        _openDialog: function (slideID) {
-            new DeleteSlideDialog(this, slideID).appendTo(document.body);
-        },
-
-        //--------------------------------------------------------------------------
-        // Handlers
-        //--------------------------------------------------------------------------
-
-        /**
-         * @private
-         * @param {Event} ev
-         */
-        _onDeleteSlideClick: function (ev) {
-            var target = $(ev.currentTarget);
-            this._openDialog(target.attr('slide_id'));
-        },
-    });
-    return DeleteSlideDialog;
-});
diff --git a/addons/website_slides/static/src/js/slides_slide_archive.js b/addons/website_slides/static/src/js/slides_slide_archive.js
new file mode 100644
index 00000000000..7e5db9a5f49
--- /dev/null
+++ b/addons/website_slides/static/src/js/slides_slide_archive.js
@@ -0,0 +1,91 @@
+odoo.define('website_slides.slide.archive', function (require) {
+'use strict';
+
+var sAnimations = require('website.content.snippets.animation');
+var Dialog = require('web.Dialog');
+var core = require('web.core');
+var _t = core._t;
+
+var SlideArchiveDialog = Dialog.extend({
+    template: 'slides.slide.archive',
+
+    /**
+     * @override
+     */
+    init: function (parent, options) {
+        options = _.defaults(options || {}, {
+            title: _t('Archive Slide'),
+            size: 'medium',
+            buttons: [{
+                text: _t('Archive'),
+                classes: 'btn-primary',
+                click: this._onClickArchive.bind(this)
+            }, {
+                text: _t('Cancel'),
+                close: true
+            }]
+        });
+
+        this.$slideTarget = options.slideTarget;
+        this.slideId = this.$slideTarget.data('slideId');
+        this._super(parent, options);
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * Calls 'archive' on slide controller and then visually removes the slide dom element
+     */
+    _onClickArchive: function () {
+        var self = this;
+
+        this._rpc({
+            route: '/slides/slide/archive',
+            params: {
+                slide_id: this.slideId
+            },
+        }).then(function () {
+            self.$slideTarget.closest('.o_wslides_slides_list_slide').remove();
+            self.close();
+        });
+    }
+});
+
+sAnimations.registry.websiteSlidesSlideArchive = sAnimations.Class.extend({
+    selector: '.o_wslides_js_slide_archive',
+    xmlDependencies: ['/website_slides/static/src/xml/slide_management.xml'],
+    read_events: {
+        'click': '_onArchiveSlideClick',
+    },
+
+    //--------------------------------------------------------------------------
+    // Private
+    //--------------------------------------------------------------------------
+
+    _openDialog: function ($slideTarget) {
+        new SlideArchiveDialog(this, {slideTarget: $slideTarget}).open();
+    },
+
+    //--------------------------------------------------------------------------
+    // Handlers
+    //--------------------------------------------------------------------------
+
+    /**
+     * @private
+     * @param {Event} ev
+     */
+    _onArchiveSlideClick: function (ev) {
+        ev.preventDefault();
+        var $slideTarget = $(ev.currentTarget);
+        this._openDialog($slideTarget);
+    },
+});
+
+return {
+    slideArchiveDialog: SlideArchiveDialog,
+    websiteSlidesSlideArchive: sAnimations.registry.websiteSlidesSlideArchive
+};
+
+});
diff --git a/addons/website_slides/static/src/js/slides_like.js b/addons/website_slides/static/src/js/slides_slide_like.js
similarity index 69%
rename from addons/website_slides/static/src/js/slides_like.js
rename to addons/website_slides/static/src/js/slides_slide_like.js
index 9596d0ccb52..406368ded25 100644
--- a/addons/website_slides/static/src/js/slides_like.js
+++ b/addons/website_slides/static/src/js/slides_slide_like.js
@@ -1,4 +1,4 @@
-odoo.define('website_slides.slides_like', function (require) {
+odoo.define('website_slides.slides.slide.like', function (require) {
 'use strict';
 
 var core = require('web.core');
@@ -7,10 +7,10 @@ require('website_slides.slides');
 
 var _t = core._t;
 
-var LikeButton = publicWidget.Widget.extend({
+var SlideLikeWidget = publicWidget.Widget.extend({
     events: {
-        'click .o_wslides_like_up': '_onClickUp',
-        'click .o_wslides_like_down': '_onClickDown',
+        'click .o_wslides_js_slide_like_up': '_onClickUp',
+        'click .o_wslides_js_slide_like_down': '_onClickDown',
     },
 
     //--------------------------------------------------------------------------
@@ -51,8 +51,8 @@ var LikeButton = publicWidget.Widget.extend({
             },
         }).then(function (data) {
             if (! data.error) {
-                self.$el.find('span.o_wslides_like_up span').text(data.likes);
-                self.$el.find('span.o_wslides_like_down span').text(data.dislikes);
+                self.$el.find('span.o_wslides_js_slide_like_up span').text(data.likes);
+                self.$el.find('span.o_wslides_js_slide_like_down span').text(data.dislikes);
             } else {
                 if (data.error === 'public_user') {
                     self._popoverAlert(self.$el, _.str.sprintf(_t('Please <a href="/web/login?redirect=%s">login</a> to vote this slide'), (document.URL)));
@@ -65,18 +65,18 @@ var LikeButton = publicWidget.Widget.extend({
         });
     },
 
-    _onClickUp: function (event) {
-        var slideId = $(event.currentTarget).data('slide-id');
+    _onClickUp: function (ev) {
+        var slideId = $(ev.currentTarget).data('slide-id');
         return this._onClick(slideId, 'like');
     },
 
-    _onClickDown: function (event) {
-        var slideId = $(event.currentTarget).data('slide-id');
+    _onClickDown: function (ev) {
+        var slideId = $(ev.currentTarget).data('slide-id');
         return this._onClick(slideId, 'dislike');
     },
 });
 
-publicWidget.registry.websiteSlidesLike = publicWidget.Widget.extend({
+publicWidget.registry.websiteSlidesSlideLike = publicWidget.Widget.extend({
     selector: '#wrapwrap',
 
     /**
@@ -86,10 +86,16 @@ publicWidget.registry.websiteSlidesLike = publicWidget.Widget.extend({
     start: function () {
         var self = this;
         var defs = [this._super.apply(this, arguments)];
-        $('.o_wslides_like').each(function () {
-            defs.push(new LikeButton(self).attachTo($(this)));
+        $('.o_wslides_js_slide_like').each(function () {
+            defs.push(new SlideLikeWidget(self).attachTo($(this)));
         });
         return $.when.apply($, defs);
     },
 });
+
+return {
+    slideLikeWidget: SlideLikeWidget,
+    websiteSlidesSlideLike: publicWidget.registry.websiteSlidesSlideLike
+};
+
 });
diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js
index 34ba2347596..602b96992cb 100644
--- a/addons/website_slides/static/src/js/slides_upload.js
+++ b/addons/website_slides/static/src/js/slides_upload.js
@@ -30,7 +30,7 @@ var SlideUploadDialog = Dialog.extend({
         this._setup();
 
         this.channelID = parseInt(options.channelId, 10);
-        this.defaultCategoryID = parseInt(options.categoryId,10)
+        this.defaultCategoryID = parseInt(options.categoryId,10);
         this.canUpload = options.canUpload === 'True';
         this.canPublish = options.canPublish === 'True';
 
@@ -182,8 +182,8 @@ var SlideUploadDialog = Dialog.extend({
         } else if (state !== '_upload') { // no button when uploading
             if (this.canUpload) {
                 if (this.canPublish) {
-                    btnList.push({text: _t("Save as Draft"), classes: 'o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
                     btnList.push({text: _t("Publish"), classes: 'btn-primary o_w_slide_upload o_w_slide_upload_published', click: this._onClickFormSubmit.bind(this)});
+                    btnList.push({text: _t("Save as Draft"), classes: 'o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
                 } else {
                     btnList.push({text: _t("Save as Draft"), classes: 'btn-primary o_w_slide_upload', click: this._onClickFormSubmit.bind(this)});
                 }
@@ -213,7 +213,7 @@ var SlideUploadDialog = Dialog.extend({
             result['tag_ids'] = tagValues;
         }
         // category
-        if(!self.defaultCategoryID){
+        if (!self.defaultCategoryID){
             var categoryValue = this.$('#category_id').select2('data');
             if (categoryValue && categoryValue.create) {
                 result['category_id'] = [0, {'name': categoryValue.text}];
@@ -311,25 +311,6 @@ var SlideUploadDialog = Dialog.extend({
 
         return values;
     },
-    _reorderSlidesSequence: function(){
-        var self = this;
-        var slidesElement = $('li.content-slide');
-        var slides = [];
-        for(var i = 0; i < slidesElement.length;i++){
-            slides.push({
-                id: parseInt($(slidesElement[i]).attr('slide_id')),
-                category_id: parseInt($(slidesElement[i]).attr('category_id')),
-                sequence: i
-            })
-        }
-        self._rpc({
-            route: '/slides/resequence_slides',
-            params: {
-                slides_data: slides
-            }
-        }).then(function(){
-        })
-    },
     /**
      * Init the data relative to the support slide type to upload
      *
@@ -339,7 +320,7 @@ var SlideUploadDialog = Dialog.extend({
         this.slide_type_data = {
             presentation: {
                 icon: 'fa-file-pdf-o',
-                label: _t('Presentation (PDF)'),
+                label: _t('Presentation'),
                 template: 'website.slide.upload.modal.presentation',
             },
             webpage: {
@@ -539,12 +520,6 @@ var SlideUploadDialog = Dialog.extend({
                     self.set('state', oldType);
                     self._alertDisplay(data.error);
                 } else {
-                    //Quick and really dirty fix for reordering issues
-                    if(data.channel_type == 'training' && self.categoryID){
-                        var categoryElement = $('ul[category_id='+self.categoryID+']');
-                        $('<li hidden class="content-slide" slide_id="'+data.slide_id+'" category_id="'+self.categoryID+'">temp</li>').appendTo(categoryElement)
-                        self._reorderSlidesSequence();
-                    }
                     window.location = data.url;
                 }
             });
@@ -560,7 +535,7 @@ var SlideUploadDialog = Dialog.extend({
 });
 
 publicWidget.registry.websiteSlidesUpload = publicWidget.Widget.extend({
-    selector: '.oe_slide_js_upload',
+    selector: '.o_wslides_js_slide_upload',
     xmlDependencies: ['/website_slides/static/src/xml/website_slides_upload.xml'],
     events: {
         'click': '_onUploadClick',
@@ -595,6 +570,7 @@ publicWidget.registry.websiteSlidesUpload = publicWidget.Widget.extend({
      * @param {Event} ev
      */
     _onUploadClick: function (ev) {
+        ev.preventDefault();
         this._openDialog($(ev.currentTarget));
     },
 });
diff --git a/addons/website_slides/static/src/scss/slide_course.scss b/addons/website_slides/static/src/scss/slide_course.scss
deleted file mode 100644
index 38179498415..00000000000
--- a/addons/website_slides/static/src/scss/slide_course.scss
+++ /dev/null
@@ -1,536 +0,0 @@
-
-.banner{
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 20%;
-    background-color: $primary;
-    width: 256px;
-    opacity: 0;
-    color: #fff;
-    transition: all .3s ease-out;
-    z-index: 2;
-    visibility: hidden;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    margin-left: 15px;
-}
-
-.banner a {
-    font-size: 1.5rem;
-    text-align: center;
-    padding: 20px;
-}
-
-.banner a:hover{
-    cursor: pointer;
-}
-
-.fill {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    overflow: hidden
-}
-.fill img {
-    flex-shrink: 0;
-    min-width: 100%;
-    min-height: 100%
-}
-
-.main_image{
-    position: relative
-}
-.main_image:hover{
-    .banner{
-        opacity: 1;
-        visibility: visible;
-    }
-
-}
-
-.course-content {
-    padding: 0;
-
-    ul {
-        list-style: none;
-        padding: 0
-    }
-}
-
-.course-section {
-    margin: 0;
-    background-color: #ddd;
-    display: flex;
-    list-style: none;
-    font-size: 1.05rem;
-    border-bottom: 1px solid #ccc
-}
-
-.content-type {
-    width: 30%;
-}
-
-.content-type:hover{
-    cursor: pointer;
-}
-
-.course-progress-bar{
-    height: 10px;
-    width: 80%;
-    box-sizing: border-box;
-    border-radius: 5px;
-    background-color: rgba(0,0,0,.2);
-    overflow: hidden;
-
-    .progress-gauge{
-        height: 100%;
-        width: 0;
-        background-color: $primary;
-
-        transition: all .8s ease-out;
-    }
-}
-
-.course-rating{
-    color:$primary;
-}
-.course-banner{
-    border-bottom: 1px solid $primary;
-}
-
-.content-tab{
-    .active {
-
-        border: none;
-        border-bottom: 1px solid $secondary;
-    }
-}
-
-.content-tab a:hover{
-    border:none;
-    border-bottom: 1px solid $secondary;
-}
-
-.content-container{
-    border:none;
-}
-
-.content-slide:nth-child(odd){
-    background-color: #f6f6f6;
-}
-
-.content-slide:nth-child(even){
-    background-color: #f9f9f9;
-}
-
-.content-slide-controls {
-    i:hover{
-        color: $primary !important;
-        cursor: pointer;
-    }
-}
-
-.viewer-container {
-    display: flex;
-    align-items: stretch;
-    height: 500px;
-    width: 100%;
-    background-color: #ccc;
-    justify-content: flex-start;
-}
-
-
-
-.slide-infos {
-    margin-top: 1rem;
-    display: flex;
-    justify-content: space-between;
-    align-items: start;
-}
-
-.oe_js_player {
-
-}
-
-.slide-deactivated {
-    pointer-events: none;
-}
-
-.slide-draggable {
-    user-select: none;
-    -khtml-user-drag: element;
-    -webkit-user-drag: element;
-}
-
-.slide-hovered{
-    margin-top: 10px;
-}
-
-.section-draggable {
-    user-select: none;
-    -khtml-user-drag: element;
-    -webkit-user-drag: element;
-}
-
-.hold{
-    border: solid #ccc 4px;
-}
-
-
-.fullscreen {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 100%;
-    z-index: 1000;
-    height: 100%;
-    margin: 0;
-    padding: 0;
-}
-
-
-.sidebar-list{
-    position: fixed;
-    top: 46px;
-    bottom: 0;
-    left: 0;
-    width: 300px;
-    z-index: 2000;
-}
-
-
-
-.sidebar-list-visible {
-    left: 50px;
-}
-
-.show-list {
-    position: absolute;
-    top: 15%;
-    left: 50px;
-    font-size: 2rem;
-    z-index: 10000;
-    color: #a0a0a0;
-    border: 2px solid #ccc;
-    border-radius: 10px;
-    padding: 5px 10px;
-}
-
-.hover-background {
-    opacity: 0;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 3000;
-}
-
-.hover-background:hover {
-    opacity: 1;
-}
-
-
-.show-list:hover {
-    cursor: pointer;
-}
-
-.change-small-screen {
-    font-size: 1.5rem;
-    z-index: 10000;
-    color: #a0a0a0;
-}
-
-.change-small-screen:hover {
-    cursor: pointer;
-    border-color: $primary;
-    color: $primary;
-}
-
-.sidebar-header {
-    padding: 10px 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 1.5rem;
-    border-bottom: 1px solid #ccc;
-    height: 80px;
-
-    a {
-        color: black;
-    }
-
-    a:hover {
-        color: $primary;
-    }
-
-    i:hover{
-        color: $primary;
-    }
-}
-
-.close-list:hover {
-    cursor: pointer;
-}
-
-.fullscreen-btn{
-    font-size: 2rem;
-    display: inline-block;
-    a {
-        text-decoration: none;
-        color: $text-muted;
-    }
-}
-
-.fullscreen-btn:hover{
-    cursor: pointer;
-
-    a {
-        color: $primary;
-    }
-}
-
-.sidebar-fullscreen {
-    position: relative;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    height: auto;
-    transform: translateX(-100%);
-    width: 0;
-}
-
-.fullscreen-question-container{
-    background-color: #fff;
-    width: 100%;
-    padding-top: 20px;
-    overflow: auto;
-}
-
-.fullscreen-question{
-    border-radius: 10px;
-    padding: 10px 20px;
-    box-shadow: 0px 1px 4px rgba(0,0,0,.5);
-    margin-top: 50px;
-}
-
-.question-title {
-    font-size: 1.5rem;
-}
-
-.buttons-container{
-    width: 80%;
-    display: flex;
-    justify-content: space-between;
-    flex-direction: row-reverse;
-    margin-top: 40px;
-}
-
-// .slide-resources {
-//     border-bottom: 1px solid #ccc;
-// }
-
-.slide-resource {
-    padding: 5px 50px;
-    width: 100%;
-    i{
-        margin-right: 10px;
-    }
-}
-
-.list-cell {
-}
-
-
-.quiz-header{
-    border-bottom: 2px solid #CBCBCB;
-    margin-bottom: 50px;
-}
-
-.quiz-header-container{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    h1 {
-        width: 80%;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-}
-
-.quiz-good-answer{
-    background-color: #C7EAE9;
-}
-
-.quiz-bad-answer{
-    background-color: #FEBEBE;
-}
-
-.quiz-bad-answer label.radio-box,
-.quiz-good-answer label.radio-box{
-    border: none;
-}
-
-.quiz-bad-answer label.radio-box i{
-    background-color: #FD0606;
-    color: white;
-    height: 100%;
-    width: 100%;
-    font-size: 1.5rem;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    padding: 50px;
-}
-
-.quiz-ignored-answer {
-    color: $text-muted;
-}
-
-
-.quiz-good-answer label.radio-box input:checked + i{
-    height: 100%;
-    width: 100%;
-    background-color: #fff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 2.4rem;
-    border: 10px solid $primary;
-    border-radius: 50px;
-}
-
-.quiz-answer {
-    border-radius: 10px;
-    padding: 5px 10px;
-    transition: all .2s ease-in-out;
-    display: flex;
-    align-items: center;
-    margin-bottom: 5px;
-}
-
-.quiz-answer:not(.quiz-good-answer,.quiz-bad-answer,.quiz-ignored-answer):hover{
-    background-color: #E5E5E5;
-    cursor: pointer;
-}
-
-label.radio-box{
-    border: 2px solid #CBCBCB;
-    background-color: #fff;
-    width: 50px;
-    height: 50px;
-    display: inline-flex;
-    border-radius: 50%;
-    overflow: hidden;
-    justify-content: center;
-    align-items: center;
-    margin: 0;
-    margin-right: 20px;
-    font-size: 1.2rem;
-    outline: none;
-}
-
-.quiz-answer:not(.quiz-good-answer,.quiz-bad-answer,.quiz-ignored-answer) label.radio-box:hover{
-    cursor: pointer;
-}
-
-label.radio-box input{
-    display:none;
-    outline: none;
-    border: none;
-}
-
-
-label.radio-box span{
-    color: inherit;
-    padding: 20px;
-}
-
-label.radio-box input:checked + span{
-    background-color: $primary;
-    color: #fff;
-}
-
-label.radio-box input:checked{
-    background-color: #C7EAE9;
-}
-
-.quiz-question {
-    border-bottom: 2px solid #CBCBCB;
-    padding-bottom: 20px;
-    margin-bottom: 20px;
-}
-
-.quiz-question-answers {
-    list-style: none;
-    margin: 0;
-    margin-top: 20px;
-    padding: 0;
-    font-size: 1rem;
-}
-
-.submit-quiz {
-    margin-top: 20px;
-}
-
-
-.quiz-modal-background{
-    position: absolute;
-    top: 0;
-    left: 0;
-    background-color: rgba(0,0,0,.5);
-    width: 100%;
-    height: 100%;
-}
-
-.quiz-modal-container{
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.quiz-modal{
-    position: absolute;
-    width: 30%;
-    height: 500px;
-    background-color: #fff;
-    top: 50%;
-    left: 50%;
-    transform: translateX(-50%) translateY(-50%);
-    border-radius: 10px;
-    z-index: 2000;
-}
-.quiz-points-container{
-    font-size: 1.2rem;
-}
-
-.quiz-points {
-    background-color:  #C4C4C4;
-    padding: 0 4px ;
-    border-radius: 10px;
-    color: #fff;
-}
-
-
-.quiz-points-won{
-    background-color: $primary;
-}
-
-.webpage-container{
-    background-color: #fff;
-    width: 100%;
-}
-
-.webpage-content {
-    background-color: #fff;
-    height: 100%;
-}
-
-
-
-
diff --git a/addons/website_slides/static/src/scss/slide_slide.scss b/addons/website_slides/static/src/scss/slide_slide.scss
index d99aaea101a..2aeac35b889 100644
--- a/addons/website_slides/static/src/scss/slide_slide.scss
+++ b/addons/website_slides/static/src/scss/slide_slide.scss
@@ -1,15 +1,15 @@
-.slide-header {
+.o_wslides_slide_header {
     background-color: #62495B;
     height: 200px;
 }
 
-.slide-header-container {
+.o_wslides_slide_header_container {
     width: 1000px;
     margin: 0 auto;
     height: 100%;
 }
 
-.slide-header-box{
+.o_wslides_slide_header_box{
     display: flex;
     height: 100%;
     width: 50%;
@@ -25,7 +25,7 @@
 }
 
 
-.slide-content-list {
+.o_wslides_slide_content_list {
     position: absolute;
     top: 140px;
     left: 80px;
@@ -34,7 +34,7 @@
     z-index: 200;
 }
 
-.slide-list{
+.o_wslides_slide_list{
     background-color: #fff;
     list-style: none;
     height: 100%;
@@ -55,19 +55,19 @@
     }
 }
 
-.slide-content-list-section{
+.o_wslides_slide_content_list_section{
     border-bottom: 1px solid #fff;
     color: #9B9B9B;
     text-transform: uppercase;
     padding: 10px 15px;
 }
 
-.slide-content-list-slide{
+.o_wslides_slide_content_list_slide{
     color: #666666;
     padding: 10px 15px;
 }
 
-.slide-list-cell{
+.o_wslides_slide_list_cell{
     word-wrap: none;
     padding: 0.5rem 1rem;;
     height: 40px;
@@ -77,25 +77,25 @@
     text-decoration: none !important;
 }
 
-.slide-list-cell:hover{
+.o_wslides_slide_list_cell:hover{
     background-color: #eee;
     cursor: pointer;
 }
 
-.slide-list-cell:active{
+.o_wslides_slide_list_cell:active{
     background-color: #eee;
     cursor: pointer;
 }
 
 
-.slide-content-list-header {
+.o_wslides_slide_content_list_header {
     padding: 10px 15px;
     font-size: 1.2rem;
     background-color: #F7F7F7;
     color: #6F6F6F;
 }
 
-.slide-button {
+.o_wslides_slide_button {
     color: #666;
     text-decoration: none;
     border:1px solid #B9B9B9;
@@ -107,7 +107,7 @@
     border-radius: 3px;
 }
 
-.slide-button-fullscreen {
+.o_wslides_slide_button_fullscreen {
     color: #666;
     text-decoration: none;
     border:1px solid #B9B9B9;
@@ -118,7 +118,7 @@
     border-radius: 3px;
 }
 
-.slide-button-done {
+.o_wslides_slide_button_done {
     color: #fff;
     text-transform: uppercase;
     background-color: $primary;
@@ -130,7 +130,7 @@
     margin: 0;
 }
 
-.slide-title {
+.o_wslides_slide_title {
     width: 60%;
     display: flex;
     align-items: center;
@@ -139,7 +139,7 @@
         font-size: 1.5rem;
     }
 
-    .slide-points {
+    .o_wslides_slide_points {
         margin-left: 20px;
         padding: 5px 10px;
         background-color:  #DC9D45;
@@ -149,7 +149,7 @@
     }
 }
 
-.slide-documentation-sidebar {
+.o_wslides_slide_documentation_sidebar {
     position: absolute;
     top: 300px;
     left: 30px;
diff --git a/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss b/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss
index d7368160733..f6612d5d04f 100644
--- a/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss
+++ b/addons/website_slides/static/src/scss/slides_slide_fullscreen.scss
@@ -1,12 +1,11 @@
-.o_wslides {
+.o_wslides_fs_main {
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
     z-index: 2000;
-
-    .o_wslides_slide_fullscreen_header {
+    .o_wslides_slide_fs_header {
         align-items: center;
         background-color: #313A44;
         color: #AEB0B2;
@@ -15,7 +14,7 @@
         justify-content: space-between;
         width: 100%;
 
-        .o_wslides_fullscreen_slide_title {
+        .o_wslides_fs_slide_title {
             height: 100%;
             display: flex;
             align-items: center;
@@ -63,7 +62,7 @@
         }
     }
 
-    .o_wslides_fullscreen_container {
+    .o_wslides_fs_container {
         display: flex;
         align-items: stretch;
         height: calc(100% - 50px);
@@ -71,11 +70,11 @@
         background-color: #313A44;
     }
 
-    .o_wslides_fullscreen_sidebar_hidden{
+    .o_wslides_fs_sidebar_hidden{
         transform: translateX(-100%);
     }
 
-    .o_wslides_fullscreen_sidebar{
+    .o_wslides_fs_sidebar{
         width: 400px;
         min-width: 400px;
         background-color: #313A44;
@@ -98,78 +97,94 @@
             padding-left: 20px;
         }
 
-        .o_wslides_fullscreen_sidebar_header{
+        .o_wslides_fs_sidebar_header {
             height: 100px;
             padding: 20px 0;
             display: flex;
             flex-direction: column;
 
-            .o_wslides_slide_fullscreen_progress_box{
+            .o_wslides_slide_fs_progress_box{
                 display: flex;
                 align-items: center;
                 font-size: .9rem;
-                .o_wslides_fullscreen_sidebar_progressbar{
+                .o_wslides_fs_sidebar_progressbar{
                     height: 5px;
                     border-radius: 10px;
                     width: 70%;
                     background-color: rgba(0,0,0,.3);
                     margin-right: 40px;
                     overflow: hidden;
-
                 }
-
-                .o_wslides_fullscreen_sidebar_progress_gauge {
+                .progress-bar {
                     background-color: $primary;
                     height: 100%;
                     width: 0;
                     transition: all 1.5s ease-in;
                 }
-
                 span {
                     color: #BABDC0;
                 }
-
             }
-
             a {
                 font-size: 1.5rem;
                 font-weight: bold;
             }
-
         }
-
-        .o_wslides_fullscreen_sidebar_section {
+        .o_wslides_fs_sidebar_section {
             margin-bottom: 20px;
             background-color: #283038;
             padding: 10px 0;
-
+            > a > li {
+                color: #656B72;
+                font-size: .8rem;
+                text-transform: uppercase;
+                font-weight: bold;
+                padding: 5px 0 5px 15px;
+            }
         }
-
-        .o_wslides_fullscreen_sidebar_section_tab {
-            color: #656B72;
-            font-size: .8rem;
-            text-transform: uppercase;
-            font-weight: bold;
-            padding: 5px 0 5px 15px;
-        }
-
-        .o_wslides_fullscreen_sidebar_section_slides{
+        .o_wslides_fs_sidebar_section_slides{
             padding: 0;
             margin-bottom: 15px;
-
-
-
             li {
                 margin: 0;
                 padding: 0;
                 border-left: 2px solid transparent;
                 display: flex;
-
                 a {
                     flex: 1;
                 }
+                > span{
+                    width: 15px;
+                    padding: 0;
+                    margin: 0;
+                    margin-left: 10px;
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    i {
+                        z-index: 100;
+                        padding: 0;
+                        margin: 0;
+                    }
+                    i.o_wslides_slide_completed{
+                        color: #00A04A;
+                        border-radius: 50%;
+                        overflow: hidden;
+                        background-color: #fff;
+                        height: 12px;
+                        width: 12px;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                        border: 1px solid #00A04A;
+                    }
+                    .o_wslides_fs_full_line{
+                        width: 1px;
+                        height: 100%;
+                        background-color: #787D82;
+                    }
+                }
             }
-
             .o_wslides_top_line,
             .o_wslides_bottom_line{
                 width: 1px;
@@ -177,82 +192,38 @@
                 flex-grow: 1;
                 background-color: #787D82;
             }
-
             li:first-child .o_wslides_top_line{
                 background-color: transparent;
             }
-
             li:last-child .o_wslides_bottom_line{
                 background-color: transparent;
             }
-
             li:hover,
             li.active {
                 border-left: 2px solid $primary;
                 cursor: pointer;
                 background-color: #1D2228;
             }
-
-            .o_wslides_fullscreen_sidebar_slide_tab {
+            .o_wslides_fs_sidebar_slide_tab {
                 padding:5px 0 5px 15px;
                 font-size: .8rem;
                 color: #8A8F93;
                 font-weight: bold;
                 flex: 1;
-
             }
-
-            .o_wslides_fullscreen_sidebar_slide_tab.active{
+            .o_wslides_fs_sidebar_slide_tab.active{
                 color: #fff;
             }
-
-            .o_wslides_fullscreen_slide_tab_line{
-                width: 15px;
-                padding: 0;
-                margin: 0;
-                margin-left: 10px;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-
-                i {
-                    z-index: 100;
-                    padding: 0;
-                    margin: 0;
-                }
-
-                i.o_wslides_slide_completed{
-                    color: #00A04A;
-                    border-radius: 50%;
-                    overflow: hidden;
-                    background-color: #fff;
-                    height: 12px;
-                    width: 12px;
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    border: 1px solid #00A04A;
-                }
-
-                .o_wslides_full_line{
-                    width: 1px;
-                    height: 100%;
-                    background-color: #787D82;
-                }
-            }
-
-            .o_wslides_slide_link {
+            .o_wslides_fs_slide_link {
                 color: #098586;
                 font-size: .8rem;
                 margin-left: 15px;
                 flex: 1;
-
                 i {
                     margin-right: 10px;
                 }
             }
-
-            .o_wslides_slide_quiz {
+            .o_wslides_fs_slide_quiz {
                 font-size: .8rem;
                 margin-left: 15px;
                 color: #8A8F93;
@@ -267,7 +238,7 @@
 
     }
 
-    .o_wslides_fullscreen_player {
+    .o_wslides_fs_player {
         display: flex;
         align-items: stretch;
         max-width: calc(100% - 400px);
@@ -286,7 +257,7 @@
         }
     }
 
-    .o_wslides_fullscreen_webpage {
+    .o_wslides_fs_webpage {
         background-color: #fff;
         width: 100%;
         height: 100%;
@@ -294,10 +265,8 @@
         padding: 20px 0;
     }
 
-    .o_wslides_fullscreen_player_no_sidebar {
+    .o_wslides_fs_player_no_sidebar {
         max-width: 100%;
         width: 100%;
-    }
-
-    
-}
\ No newline at end of file
+    }  
+}
diff --git a/addons/website_slides/static/src/scss/website_slides.scss b/addons/website_slides/static/src/scss/website_slides.scss
index b884a0df64f..cf6bed1830e 100644
--- a/addons/website_slides/static/src/scss/website_slides.scss
+++ b/addons/website_slides/static/src/scss/website_slides.scss
@@ -1,14 +1,8 @@
 // FIXME may be useless (check initial code here: https://github.com/odoo/odoo/blob/51be5bbfb38db784cb3406877cc0e8806b1bf55a/addons/website_slides/static/src/less/website_slides.less#L1)
 $nav-tabs-border-color: #dddddd !default;
 $body-bg: #FFFFFF !default;
-$link-color: theme-color('primary') !default;
 $MAX-Z-INDEX : 2147483647 !default;
 
-@mixin top-covered-image {
-    object-fit: cover;
-    object-position: top;
-}
-
 
 // Common to new slides pages
 // **************************************************
@@ -20,39 +14,33 @@ $MAX-Z-INDEX : 2147483647 !default;
     padding: 0px 32px 0px 32px;
 }
 
-div .o_wslides_home_nav {
-    top: -40px;
-
-    @include media-breakpoint-up(md) {
-        font-size: 1rem;
-
-        .o_wslides_nav_navbar_right {
-            margin-left: auto;
-            padding-left: $spacer;
-            border-left: 1px solid $border-color;
-        }
-    }
-}
-
 .o_wslides_wrap {
     background-color: desaturate(map-get($grays, "200"), 80%);
 
-    .o_wslides_course_card {
-        border-width: 0 0 3px 0;
+    .o_wslides_home_nav {
+        top: -40px;
+
+        @include media-breakpoint-up(md) {
+            font-size: 1rem;
+
+            .o_wslides_nav_navbar_right {
+                padding-left: $spacer;
+                margin-left: auto;
+                border-left: 1px solid $border-color;
+            }
+        }
     }
 
+    .o_wslides_course_card,
     .o_wslides_lesson_card {
         border-width: 0 0 3px 0;
     }
 
-    // responsive card-deck like
-    // .row.o_wslides_row > div[class*='col-'] {
-        // display: flex;
-        // flex:1 0 auto;
-        // .card {
-            // width:100%;
-        // }
-    // }
+    .o_wslides_js_slide_like_up,
+    .o_wslides_js_slide_like_down {
+        cursor: pointer;
+        color: $link-color;
+    }
 
     // tools
     // ****************************************
@@ -64,10 +52,6 @@ div .o_wslides_home_nav {
     .o_wslides_entry_muted {
         opacity: 0.5;
     }
-    img.o_wslides_img_center_crop {
-        object-fit: cover;
-        object-position: center;
-    }
 
     .o_wslides_home_circled {
         border-radius: 50%;
@@ -83,10 +67,12 @@ div .o_wslides_home_nav {
         overflow: visible;
         margin-bottom: 0em;
         height: 4px;
+
         .progress-bar {
             background-color: #00A09D;
             position: relative;
             border-radius: 4px;
+
             span {
                 background-color: #00A09D;
                 position: absolute;
@@ -97,6 +83,7 @@ div .o_wslides_home_nav {
                 right: -1.4em;
                 border-radius: 2px;
             }
+
             span:after {
                 bottom: 100%;
                 left: 50%;
@@ -119,27 +106,14 @@ div .o_wslides_home_nav {
 // New home page
 // **************************************************
 
-div .o_wslides_home_nav {
-    top: -40px;
-
-    @include media-breakpoint-up(md) {
-        font-size: 1rem;
-
-         .o_wslides_nav_navbar_right {
-            margin-left: auto;
-            padding-left: $spacer;
-            border-left: 1px solid $border-color;
-        }
-    }
-}
-
-div .o_wslides_home_main {
+.o_wslides_home_main {
     .o_wslides_home_aside {
         .fa-check {
             color: #00A09D;
             font-size: 1.2em;
         }
     }
+
     .o_wprofile_next_rank_card {
         background-color: transparent !important;
     }
@@ -192,6 +166,7 @@ div .o_wslides_home_main {
     border-bottom: 48px solid #66445e;
 
     .o_wslides_course_header_container {
+        position: relative;
         top: 48px;
         padding-top: 0px;
 
@@ -219,7 +194,6 @@ div .o_wslides_home_main {
                         height: 48px;
                         font-weight: bold;
                         padding-top: 12px;
-                        border-left: 2px solid #875A7B;
                         text-align: center;
                         width: 120px;
                         &:hover {
@@ -240,18 +214,6 @@ div .o_wslides_home_main {
 }
 
 .o_wslides_course_main {
-    margin: auto;
-    background-color: #f2f2f2;
-
-    .o_wslides_course_content_main {
-        h3 {
-            font-size: 1.4em;
-        }
-
-        h4 {
-            font-size: 1.3em;
-        }
-
         .o_wslides_course_content_aside {
             max-width: 286px;
             .bg-white {
@@ -263,13 +225,54 @@ div .o_wslides_home_main {
                     padding-right: 15px;
                  }
             }
+        }
+}
 
-            .o_wslides_course_aside_line {
+// Slides list reordering widget
+.o_wslides_slides_list {
+    padding: 0;
+
+    ul {
+        list-style: none;
+        padding: 0;
+    }
+
+    .o_wslides_slide_list_category_container {
+        margin: 0;
+        background-color: #ddd;
+        display: flex;
+        list-style: none;
+        font-size: 1.05rem;
+        border-bottom: 1px solid #ccc;
+    }
+
+    .o_wslides_slides_list_slide {
+        &.o_not_editable {
+            height: 0px;
+        }
+
+        &:nth-child(odd) {
+            background-color: #f6f6f6;
+        }
+
+        &:nth-child(even) {
+            background-color: #f9f9f9;
+        }
+
+        .o_wslides_slides_list_slide_controls {
+            i:hover {
+                color: $primary !important;
+                cursor: pointer;
             }
         }
     }
 }
 
+
+// New lesson page
+// **************************************************
+
+
 // Old brol to clean someday
 // **************************************************
 
@@ -292,9 +295,10 @@ div .o_wslides_home_main {
 }
 
 .oe_slides_apart_small {
-    @include top-covered-image;
     height: 60px;
     width: 90px;
+    object-fit: cover;
+    object-position: top;
 }
 
 .oe_slides_statistics_title {
@@ -306,11 +310,6 @@ div .o_wslides_home_main {
     max-height: 500px;
 }
 
-.o_wslides_like_up, .o_wslides_like_down {
-    cursor: pointer;
-    color: $link-color;
-}
-
 // Thumbnails
 .oe_slides_ellipsis {
     white-space: nowrap;
diff --git a/addons/website_slides/static/src/scss/website_slides_quiz.scss b/addons/website_slides/static/src/scss/website_slides_quiz.scss
index 9fe4438ee57..cca013c0be9 100644
--- a/addons/website_slides/static/src/scss/website_slides_quiz.scss
+++ b/addons/website_slides/static/src/scss/website_slides_quiz.scss
@@ -1,5 +1,5 @@
 
-    .o_wslides_fullscreen_quiz {
+    .o_wslides_fs_quiz {
         background-color: #F6F6F6;
         width: 100%;
         height: 100%;
diff --git a/addons/website_slides/static/src/xml/slide_management.xml b/addons/website_slides/static/src/xml/slide_management.xml
new file mode 100644
index 00000000000..b402c1e3fd3
--- /dev/null
+++ b/addons/website_slides/static/src/xml/slide_management.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="slides.slide.archive">
+        <div>
+            <p>Are you sure you want to archive this slide ?</p>
+        </div>
+    </t>
+
+     <t t-name="slides.category.add">
+        <div>
+            <form action="/slides/category/add" method="POST" id="slide_category_add_form">
+                <input type="hidden" name="csrf_token" t-att-value="csrf_token"/>
+                <input type="hidden" name="channel_id" t-att-value="widget.channelId"/>
+                <div class="form-group row">
+                    <label for="section_name" class="col-sm-3 col-form-label">Section name</label>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" name="name" id="section_name" required="required"/>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website_slides/static/src/xml/website_slides_fullscreen.xml b/addons/website_slides/static/src/xml/website_slides_fullscreen.xml
index c1161a02488..1817d085f71 100644
--- a/addons/website_slides/static/src/xml/website_slides_fullscreen.xml
+++ b/addons/website_slides/static/src/xml/website_slides_fullscreen.xml
@@ -9,20 +9,20 @@
             <div style="width:100%;height:100%;text-align:center;" t-if="slide.slide_type == 'infographic' &amp;&amp; !showMiniQuiz">
                 <img t-attf-src="/web/image/slide.slide/#{slide.id}/image" class="img-fluid" style="height: 100%" alt="Slide image"/>
             </div>
-            <div t-if="(slide.slide_type == 'quiz' || showMiniQuiz) &amp;&amp; questions " class="o_wslides_fullscreen_quiz">
+            <div t-if="(slide.slide_type == 'quiz' || showMiniQuiz) &amp;&amp; questions " class="o_wslides_fs_quiz">
                 <div>
                     <t t-call="website.slide.quiz"/>
-                    <div class="container">
+                    <div id="quiz_buttons" class="container">
                         <button t-if="!slide.done" class="btn btn-primary submit-quiz" >Check your answers</button>
                         <button t-if="embed_url" class="btn btn-primary back-to-video" >Watch again</button>
                         <button t-if="slide.done &amp;&amp; nextSlide" class="btn btn-primary next-slide" >Continue</button>
                     </div>
                 </div>
             </div>
-            <div t-if="slide.slide_type == 'webpage'" class="o_wslides_fullscreen_webpage">
-                    <div class="o_wslides_fullscreen_webpage_content container"/>
+            <div t-if="slide.slide_type == 'webpage'" class="o_wslides_fs_webpage">
+                    <div class="o_wslides_fs_webpage_content container"/>
             </div>
-        <div class="o_wslides_fullscreen_content"/>
+        <div class="o_wslides_fs_content"/>
     </t>
 
     <t t-name="website.slide.quiz">
@@ -76,17 +76,17 @@
                 <div class="o_wslides_quiz_success_modal_close"><i class="fa fa-times"></i></div>
                 <h1>Amazing!</h1>
                 <div class="o_wslides_quiz_success_xp">
-                    <p>You gained <span t-esc="data.points"/> !</p>
+                    <p>You gained <span t-esc="data.points"/> points!</p>
                     <div class="o_wslides_quiz_success_progress_bar">
-                        <div class="o_wslides_quiz_success_progress_gauge"/>
+                        <div class="o_wslides_quiz_success_progress_gauge" t-att-style="'width:'+data.user.progress_bar_percentage+'%'"/>
                     </div>
                     <div class="o_wslides_quiz_success_progress_bounds">
-                        <span>600</span>
-                        <span>1000</span>
+                        <span t-esc="data.user.lower_bound"/>
+                        <span t-esc="data.user.upper_bound"/>
                     </div>
                 </div>
                 <div class="o_wslides_quiz_success_reward"></div>
-                <div class="o_wslides_quiz_success_button">
+                <div t-if="nextSlide" class="o_wslides_quiz_success_button">
                     <a class="next-slide">Next &gt;</a>
                 </div>
             </div>
@@ -101,7 +101,7 @@
             <i t-if="slide.slide_type == 'link'" class="fa fa-file-code-o mr-2"></i>
             <i t-if="slide.slide_type == 'webpage'" class="fa fa-file-text mr-2"></i>
             <i t-if="slide.slide_type == 'quiz'" class="fa fa-question-circle mr-2 text"></i>
-            <span class="o_wslides_fullscreen_slide_title_span" t-esc="slide.name"/>
+            <span class="o_wslides_fs_slide_title_span" t-esc="slide.name"/>
         </t>
         <t t-else="">
             <span><i class="fa fa-flag-checkered"></i>Quiz: <span t-esc="slide.name"/></span>
diff --git a/addons/website_slides/static/src/xml/website_slides_upload.xml b/addons/website_slides/static/src/xml/website_slides_upload.xml
index d57923c561b..bc42bb8557c 100644
--- a/addons/website_slides/static/src/xml/website_slides_upload.xml
+++ b/addons/website_slides/static/src/xml/website_slides_upload.xml
@@ -207,55 +207,4 @@
             </div>
         </div>
     </t>
-
-    <t t-name="website.slide.delete.slide">
-        <div role="dialog" class="modal" tabindex="-1">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <header class="modal-header">
-                        <h3 class="modal-title">Delete Slide</h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
-                    </header>
-                    <main class="modal-body">
-                        <div>
-                           <p>Are you sure you want to remove this slide ? </p>
-                        </div>
-                    </main>
-                    <footer class="modal-footer">
-                        <button type="button" class="btn btn-primary delete" data-dismiss="modal">Delete</button>
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                    </footer>
-                </div>
-            </div>
-        </div>
-    </t>
-
-     <t t-name="website.slide.add.section">
-         <div role="dialog" class="modal" tabindex="-1">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <header class="modal-header">
-                        <h3 class="modal-title">Add a section</h3>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">×</button>
-                    </header>
-                    <main class="modal-body modal-content">
-                        <form class="clearfix">
-                            <div class="form-group row">
-                                <label for="section_name" class="col-form-label col-md-3">Section name</label>
-                                <div class="col-md-9">
-                                    <input type="text" class="form-control" id="section_name"/>
-                                </div>
-                            </div>
-                            <canvas id="data_canvas" style="display: none;"></canvas>
-                        </form>
-                    </main>
-                    <footer class="modal-footer">
-                        <button type="button" data-loading-text="Loading..." data-published="true" class="btn btn-primary save">Add</button>
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Discard</button>
-                    </footer>
-                </div>
-            </div>
-        </div>
-    </t>
-
 </templates>
diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml
index a43729f527d..eb000518491 100644
--- a/addons/website_slides/views/assets.xml
+++ b/addons/website_slides/views/assets.xml
@@ -6,23 +6,20 @@
             <xpath expr="//link[last()]" position="after">
                 <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides.scss" t-ignore="true"/>
                 <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides_profile.scss"/>
-                <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slide_course.scss" t-ignore="true"/>
                 <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slide_slide.scss" t-ignore="true"/>
                 <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/slides_slide_fullscreen.scss" t-ignore="true"/>
                 <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides_quiz.scss"/>
             </xpath>
             <xpath expr="//script[last()]" position="after">
                 <script type="text/javascript" src="/website_slides/static/src/js/slides.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_join_channel.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_like.js"/>
                 <script type="text/javascript" src="/website_slides/static/src/js/slides_share.js"/>
                 <script type="text/javascript" src="/website_slides/static/src/js/slides_upload.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_category.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_delete_slide.js"/>
+                <script type="text/javascript" src="/website_slides/static/src/js/slides_category_add.js"/>
+                <script type="text/javascript" src="/website_slides/static/src/js/slides_slide_archive.js"/>
+                <script type="text/javascript" src="/website_slides/static/src/js/slides_slide_like.js"/>
                 <script type="text/javascript" src="/website_slides/static/src/js/slides_course_slides_list.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_progress_bar.js"/>
-                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_sidebar_list.js"/>
                 <script type="text/javascript" src="/website_slides/static/src/js/slides_course_fullscreen_player.js"/>
+                <script type="text/javascript" src="/website_slides/static/src/js/slides_course_join.js"/>
                 <script type="text/javascript" src="/website_slides/static/src/js/slides_course_quiz.js"/>
             </xpath>
         </template>
diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml
index 3459fba05a5..ec52bb3961a 100644
--- a/addons/website_slides/views/website_slides_templates_course.xml
+++ b/addons/website_slides/views/website_slides_templates_course.xml
@@ -71,6 +71,7 @@
     </div>
 </template>
 
+
 <!-- Channel main template -->
 <template id='course_main' name="Course Main">
     <t t-set="head">
@@ -82,8 +83,8 @@
             <t t-set="main_object" t-value="channel"/>
             <t t-call="website_slides.course_nav"/>
 
-            <div class="row o_wslides_course_header">
-                <div class="col-lg-12 o_wslides_container o_wslides_course_header_container">
+            <div class="o_wslides_course_header">
+                <div class="container o_wslides_course_header_container">
                     <div class="row align-items-end d-flex">
                         <div class="col-md-4 d-none d-sm-block o_wslides_course_header_aside">
                             <div t-field="channel.image" widget="image" t-options="{'widget': 'image'}"/>
@@ -108,15 +109,14 @@
                             </div>
                             <div class="row mt-auto o_wslides_course_header_nav">
                                 <div class="col-xs-12 col-md-8">
-                                    <ul class="nav nav-tabs o_wslides_nav_tabs" role="tablist" id="profile_extra_info_tablist">
-                                        <li class="nav-item o_wslides_nav_tabs_item_home">
-                                            <a t-att-href="'/slides/%s%s?%s' % (slug(channel), '/%s' % slug(category) if category else '', keep_query('debug'))"
-                                                t-att-class="'nav-link %s' % ('' if search_slide_type else 'active')">
-                                                <i class="fa fa-home"/> Course</a>
+                                    <ul class="nav nav-tabs o_wslides_nav_tabs" id="profile_extra_info_tablist" role="tablist">
+                                        <li class="nav-item o_wlides_course_header_nav_home">
+                                            <a t-att-class="'nav-link %s' % ('' if search_slide_type else 'active')" id="home-tab" data-toggle="pill" href="#home" role="tab" aria-controls="home" aria-selected="true">
+                                                <i class="fa fa-home"/> Course
+                                            </a>
                                         </li>
                                         <li class="nav-item">
-                                            <a t-att-href="'/slides/%s' % (slug(channel))"
-                                                t-att-class="'nav-link'">Review</a>
+                                            <a class="nav-link" id="review-tab" data-toggle="pill" href="#review" role="tab" aria-controls="review" aria-selected="false">Review</a>
                                         </li>
                                     </ul>
                                 </div>
@@ -125,117 +125,25 @@
                     </div>
                 </div>
             </div>
-            <div class="row o_wslides_course_main">
-                <div class="col-lg-12 o_wslides_container">
-                    <div class="row o_wslides_course_content_main">
-                        <!-- Channel presentation, aka general information + CTAs -->
-                        <div class="col-md-4 col-xs-12 o_wslides_course_content_aside">
-                            <div class="bg-white">
-                                <div class="row justify-content-center o_wslides_join_channel">
-                                    <a t-if="not channel.is_member and channel.enroll == 'public'" role="button"
-                                        class="col-10 mt8 btn btn-primary o_wslides_join_channel_link"
-                                        title="Start Course" aria-label="Start Course Channel"
-                                        t-att-href="'#'"
-                                        t-att-data-channel-id="channel.id">
-                                        <span class="cta-title text_small_caps">
-                                            <t t-if="channel.channel_type == 'documentation'">Start Course</t>
-                                            <t t-else="">Join Course</t>
-                                        </span>
-                                    </a>
-                                    <t t-if="not channel.is_member and channel.enroll == 'invite'">
-                                        <a role="button" class="col-10 mt8 btn btn-light" t-att-href="'#'">
-                                            <span class="cta-title text_small_caps">Private Course</span>
-                                        </a>
-                                        <div t-if="channel.enroll_msg" t-field="channel.enroll_msg"/>
-                                        <span t-if="not channel.enroll_msg">Contact website administrator.</span>
-                                    </t>
-                                    <span t-if="channel.is_member" class="col-10 mt8 btn btn-primary">
-                                        <i class="fa fa-chevron-right"></i>
-                                        <span class="cta-title text_small_caps">Already member</span>
-                                    </span>
-                                </div>
-                                <div class="row mt8">
-                                    <span class="col-5">Last Update</span>
-                                    <span class="col"><t t-esc="channel.slide_last_update" t-options="{'widget': 'date'}"/></span>
-                                </div>
-                                <div class="row mt8">
-                                    <span class="col-5">Members</span>
-                                    <span class="col" t-esc="channel.members_count"/>
-                                </div>
-                                <t t-if="channel.channel_type == 'documentation'">
-                                    <div class="row mt8"><div class="col"><hr/></div></div>
-                                    <t t-set="slide_type_keys" t-value="slide_types.keys()"/>
-                                    <t t-foreach="slide_type_keys" t-as="slide_type_key">
-                                        <div class="row mt8 align-items-center">
-                                            <span class="col-5">
-                                                <t t-if="search_category">
-                                                    <a t-att-href="'/slides/%s/category/%s?%s' % (slug(channel), slug(search_category), keep_query('debug', slide_type=slide_type_key))"
-                                                        t-att-class="'%s' % ('active' if search_slide_type == slide_type_key else '')">
-                                                        <t t-esc="slide_types[slide_type_key]"/>
-                                                    </a>
-                                                </t>
-                                                <t t-else="">
-                                                    <a t-att-href="'/slides/%s?%s' % (slug(channel), keep_query('debug', slide_type=slide_type_key))"
-                                                        t-att-class="'%s' % ('active' if search_slide_type == slide_type_key else '')">
-                                                        <t t-esc="slide_types[slide_type_key]"/>
-                                                    </a>
-                                                </t>
-                                            </span>
-                                            <span class="col">
-                                                <t t-if="search_category">
-                                                    <span class="badge badge-pill badge-info" t-esc="search_category['nbr_%s' % slide_type_key]"/>
-                                                </t>
-                                                <t t-else="">
-                                                    <span class="badge badge-pill badge-info" t-esc="channel['nbr_%s' % slide_type_key]"/>
-                                                </t>
-                                            </span>
-                                        </div>
-                                    </t>
+            <div class="container o_wslides_course_main">
+                <div class="tab-content" id="courseMainTabContent">
+                    <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
+                        <t t-if="channel.channel_type == 'training'" t-call="website_slides.course_slides_list"/>
+                        <t t-if="channel.channel_type == 'documentation'" t-call="website_slides.course_slides_cards"/>
+                    </div>
+                    <div class="tab-pane fade" id="review" role="tabpanel" aria-labelledby="review-tab">
+                        <div class="row">
+                            <t t-call="website_slides.course_sidebar"/>
+                            <div class="col-lg-8">
+                                <t t-call="portal.message_thread">
+                                    <t t-set="object" t-value="channel"/>
+                                    <t t-set="hash" t-value="message_post_hash"/>
+                                    <t t-set="pid" t-value="message_post_pid"/>
+                                    <t t-set="display_rating" t-value="True"/>
+                                    <t t-set="disable_composer" t-value="True"/>
                                 </t>
-                                <div class="row mt8"><div class="col"><hr/></div></div>
-                                <div class="row justify-content-center mt8">
-                                    <button role="button" class="btn btn-primary col-10" title="Share Channel"
-                                        aria-label="Share Channel"
-                                        data-toggle="modal" data-target="#slideChannelShareModal">
-                                        <i class="fa fa-share-square"></i> Share
-                                    </button>
-                                    <div class="modal fade" id="slideChannelShareModal" tabindex="-1" role="dialog" aria-labelledby="slideChannelShareModalLabel" aria-hidden="true">
-                                        <div class="modal-dialog" role="document">
-                                            <div class="modal-content">
-                                                <div class="modal-header">
-                                                    <h5 class="modal-title" id="slideChannelShareModalLabel">
-                                                        Share
-                                                    </h5>
-                                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                                        <span>&amp;times;</span>
-                                                    </button>
-                                                </div>
-                                                <div class="modal-body">
-                                                    <h5>Share on Social Networks</h5>
-                                                    <t t-call="website_slides.slides_share">
-                                                        <t t-set="record" t-value="channel"/>
-                                                    </t>
-                                                    <h5 class="mt16">Share Link</h5>
-                                                    <input type="text" class="form-control" readonly="readonly" onclick="this.select();"
-                                                        t-att-value="channel.website_url"/>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div t-if="channel.can_upload" class="row justify-content-center mt8">
-                                    <a role="button" class="btn btn-primary oe_slide_js_upload col-10" title="Upload Presentation"
-                                        aria-label="Upload Presentation" href="#"
-                                        t-att-data-channel-id="channel.id"
-                                        t-att-data-can-upload="channel.can_upload"
-                                        t-att-data-can-publish="channel.can_publish">
-                                        <i class="fa fa-cloud-upload"></i> Upload
-                                    </a>
-                                </div>
                             </div>
                         </div>
-                        <t t-if="channel.channel_type == 'training'" t-call="website_slides.course_content_training"/>
-                        <t t-if="channel.channel_type == 'documentation'" t-call="website_slides.course_content_documentation"/>
                     </div>
                 </div>
             </div>
@@ -243,68 +151,168 @@
     </t>
 </template>
 
-<template id="course_content_training" name="Content of a training channel">
-    <div class="col-8 d-flex flex-column ml-4">
-        <div class="course-content oe_js_course_slides_list w-100 mt8">
-            <ul>
-                <t t-set="i" t-value="1"/>
-                <t t-set="j" t-value="0"/>
-                <t t-foreach="channel.category_ids" t-as="category">
-                    <li t-attf-class="#{'section-draggable' if user == user_id else ''}" t-attf-category_id="#{category.id}">
-                        <div t-attf-category_id="#{category.id}" class="course-section text-muted font-weight-bold pt-0 pb-0 pl-2 pr-2 d-flex justify-content-between align-items-center">
-                            <div style="width:50%;" class="d-flex align-items-center">
-                                <i t-if="channel.user_id == user" class="fa fa-arrows mr-3 text-muted"></i>
-                                <div class="mr-2">Section <span class="section-index" t-esc="i"/>:</div>
-                                <span t-field="category.name"/>
+<template id="course_sidebar" name="Course Sidebar (infos, CTA)">
+    <!-- Channel presentation, aka general information + CTAs -->
+    <div class="col-lg-4 col-xs-12 o_wslides_course_content_aside">
+        <div class="bg-white">
+            <div class="row justify-content-center o_wslides_js_course_join">
+                <a t-if="not channel.is_member and channel.enroll == 'public'" role="button"
+                    class="col-10 mt8 btn btn-primary o_wslides_js_course_join_link"
+                    title="Start Course" aria-label="Start Course Channel"
+                    t-att-href="'#'"
+                    t-att-data-channel-id="channel.id">
+                    <span class="cta-title text_small_caps">
+                        <t t-if="channel.channel_type == 'documentation'">Start Course</t>
+                        <t t-else="">Join Course</t>
+                    </span>
+                </a>
+                <t t-if="not channel.is_member and channel.enroll == 'invite'">
+                    <a role="button" class="col-10 mt8 btn btn-light" t-att-href="'#'">
+                        <span class="cta-title text_small_caps">Private Course</span>
+                    </a>
+                    <div t-if="channel.enroll_msg" t-field="channel.enroll_msg"/>
+                    <span t-if="not channel.enroll_msg">Contact website administrator.</span>
+                </t>
+                <span t-if="channel.is_member" class="col-10 mt8 btn btn-primary">
+                    <i class="fa fa-chevron-right"></i>
+                    <span class="cta-title text_small_caps">Already member</span>
+                </span>
+            </div>
+            <div class="row mt8">
+                <span class="col-5">Last Update</span>
+                <span class="col"><t t-esc="channel.slide_last_update" t-options="{'widget': 'date'}"/></span>
+            </div>
+            <div class="row mt8">
+                <span class="col-5">Members</span>
+                <span class="col" t-esc="channel.members_count"/>
+            </div>
+            <t t-if="channel.channel_type == 'documentation'">
+                <div class="row mt8"><div class="col"><hr/></div></div>
+                <t t-set="slide_type_keys" t-value="slide_types.keys()"/>
+                <t t-foreach="slide_type_keys" t-as="slide_type_key">
+                    <div class="row mt8 align-items-center">
+                        <span class="col-5">
+                            <t t-if="search_category">
+                                <a t-att-href="'/slides/%s/category/%s?%s' % (slug(channel), slug(search_category), keep_query('debug', slide_type=slide_type_key))"
+                                    t-att-class="'%s' % ('active' if search_slide_type == slide_type_key else '')">
+                                    <t t-esc="slide_types[slide_type_key]"/>
+                                </a>
+                            </t>
+                            <t t-else="">
+                                <a t-att-href="'/slides/%s?%s' % (slug(channel), keep_query('debug', slide_type=slide_type_key))"
+                                    t-att-class="'%s' % ('active' if search_slide_type == slide_type_key else '')">
+                                    <t t-esc="slide_types[slide_type_key]"/>
+                                </a>
+                            </t>
+                        </span>
+                        <span class="col">
+                            <t t-if="search_category">
+                                <span class="badge badge-pill badge-info" t-esc="search_category['nbr_%s' % slide_type_key]"/>
+                            </t>
+                            <t t-else="">
+                                <span class="badge badge-pill badge-info" t-esc="channel['nbr_%s' % slide_type_key]"/>
+                            </t>
+                        </span>
+                    </div>
+                </t>
+            </t>
+            <div class="row mt8"><div class="col"><hr/></div></div>
+            <div class="row justify-content-center mt8">
+                <button role="button" class="btn btn-primary col-10" title="Share Channel"
+                    aria-label="Share Channel"
+                    data-toggle="modal" data-target="#slideChannelShareModal">
+                    <i class="fa fa-share-square"></i> Share
+                </button>
+                <div class="modal fade" id="slideChannelShareModal" tabindex="-1" role="dialog" aria-labelledby="slideChannelShareModalLabel" aria-hidden="true">
+                    <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h5 class="modal-title" id="slideChannelShareModalLabel">
+                                    Share
+                                </h5>
+                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                    <span>&amp;times;</span>
+                                </button>
+                            </div>
+                            <div class="modal-body">
+                                <h5>Share on Social Networks</h5>
+                                <t t-call="website_slides.slides_share">
+                                    <t t-set="record" t-value="channel"/>
+                                </t>
+                                <h5 class="mt16">Share Link</h5>
+                                <input type="text" class="form-control" readonly="readonly" onclick="this.select();"
+                                    t-att-value="channel.website_url"/>
                             </div>
-                            <a  class="mr-2 oe_slide_js_upload"
-                                role="button"
-                                aria-label="Upload Presentation"
-                                href="#"
-                                style="font-size: 1.5rem;text-decoration: none;"
-                                t-att-data-channel-id="channel.id"
-                                t-att-data-category-id="category.id"
-                                t-att-data-can-upload="channel.can_upload"
-                                t-att-data-can-publish="channel.can_publish">+</a>
-                            <t t-set="i" t-value="i+1"/>
                         </div>
-                        <ul t-attf-category_id="#{category.id}" >
+                    </div>
+                </div>
+            </div>
+            <div t-if="channel.can_upload" class="row justify-content-center mt8">
+                <a role="button" class="btn btn-primary o_wslides_js_slide_upload col-10" title="Upload Presentation"
+                    aria-label="Upload Presentation" href="#"
+                    t-att-data-channel-id="channel.id"
+                    t-att-data-can-upload="channel.can_upload"
+                    t-att-data-can-publish="channel.can_publish">
+                    <i class="fa fa-cloud-upload"></i> Upload
+                </a>
+            </div>
+        </div>
+    </div>
+</template>
+
+<template id="course_slides_list" name="Training Course content: list">
+    <div class="row">
+        <t t-call="website_slides.course_sidebar"/>
+        <div class="col-lg-8 mt-3 mb-5 o_wslides_slides_list" t-att-data-channel-id="channel.id">
+            <ul class="o_wslides_slides_list_container">
+                <t t-set="j" t-value="0"/>
+                <li t-if="uncategorized_slides or channel.can_publish">
+                    <div class="text-muted font-weight-bold pt-0 pb-0 pl-2 pr-2 d-flex justify-content-between align-items-center">
+                        <t t-call="website_slides.course_slides_list_category"/>
+                    </div>
+                    <ul>
+                        <li t-att-class="('text-muted font-italic o_wslides_slides_list_slide o_wslides_empty_category justify-content-between align-items-center p-2 %s') % ('d-none' if uncategorized_slides else 'd-flex')">
+                            <div class="content-slide-infos ml-2">
+                                <span>Empty category</span>
+                            </div>
+                        </li>
+                        <li class="o_wslides_slides_list_slide o_not_editable"></li>
+                        <t t-foreach="uncategorized_slides" t-as="slide">
+                            <t t-call="website_slides.course_slides_list_slide" />
+                            <t t-set="j" t-value="j+1"/>
+                        </t>
+                    </ul>
+                </li>
+                <t t-foreach="channel.category_ids" t-as="category">
+                    <li t-if="category.slide_ids or channel.can_publish" class="o_wslides_slide_list_category" t-att-data-category-id="category.id">
+                        <div t-att-data-category-id="category.id"
+                            class="o_wslides_js_category text-muted font-weight-bold pt-0 pb-0 pl-2 pr-2 d-flex justify-content-between align-items-center">
+                            <t t-call="website_slides.course_slides_list_category" />
+                        </div>
+                        <ul t-att-data-category-id="category.id">
+                            <li t-att-class="('text-muted font-italic o_wslides_slides_list_slide o_wslides_empty_category justify-content-between align-items-center p-2 %s') % ('d-none' if category.slide_ids else 'd-flex')">
+                                <div class="content-slide-infos ml-2">
+                                    <span>Empty category</span>
+                                </div>
+                            </li>
+                            <li class="o_wslides_slides_list_slide o_not_editable"></li>
                             <t t-foreach="category.slide_ids" t-as="slide">
-                                <li t-att-index="j" t-attf-slide_id="#{slide.id}" t-attf-category_id="#{category.id}" t-attf-class="#{'content-slide slide-draggable d-flex justify-content-between align-items-center p-2' if channel.user_id == user else 'content-slide d-flex justify-content-between align-items-center p-2'}">
-                                    <div class="content-slide-infos ml-2">
-                                        <i t-if="channel.user_id == user" class="fa fa-arrows mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'document'" class="fa fa-file-pdf-o mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'infographic'" class="fa fa-file-picture-o mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'video'" class="fa fa-play-circle mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'link'" class="fa fa-file-code-o mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'webpage'" class="fa fa-file-text mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'quiz'" class="fa fa-question-circle mr-2 text-muted"></i>
-                                        <i t-if="slide.slide_type == 'certification'" class="fa fa-trophy mr-2 text-muted"></i>
-                                        <a class="link-to-slide" t-attf-href="/slides/slide/#{slug(slide)}"><span t-field="slide.name"/></a>
-                                    </div>
-                                    <div class="content-slide-controls mr-2">
-                                        <i t-if="not slide.id in user_progress or not user_progress[slide.id].completed" class="check-done fa fa-check-circle text-muted mr-1"></i>
-                                        <i t-if="slide.id in user_progress and user_progress[slide.id].completed" class="check-done text-primary fa fa-check-circle mr-1"></i>
-                                        <a t-if="channel.user_id == user and not slide.slide_type == 'webpage'" t-attf-href="/web#id=#{slide.id}&amp;action=#{slide_action}&amp;model=slide.slide&amp;view_type=form"><i class="fa fa-pencil text-muted mr-1"></i></a>
-                                        <a t-if="channel.user_id == user and slide.slide_type == 'webpage'" t-attf-href="/slides/slide/#{slug(slide)}?enable_editor=1"><i class="fa fa-pencil text-muted mr-1"></i></a>
-                                        <i t-if="channel.user_id == user" t-attf-slide_id="#{slide.id}" class="fa fa-trash text-muted oe_slide_js_delete_slide"></i>
-                                    </div>
-                                </li>
+                                <t t-call="website_slides.course_slides_list_slide" />
                                 <t t-set="j" t-value="j+1"/>
                             </t>
                         </ul>
                     </li>
                 </t>
             </ul>
-            <div t-if="channel.can_upload" class="content-actions">
-                <a  class="mr-2 oe_slide_js_upload"
+            <div t-if="channel.can_upload" class="o_wslides_content_actions">
+                <a  class="mr-2 o_wslides_js_slide_upload"
                     role="button"
                     aria-label="Upload Presentation"
                     href="#"
                     t-att-data-channel-id="channel.id"
                     t-att-data-can-upload="channel.can_upload"
                     t-att-data-can-publish="channel.can_publish">Add Content</a>
-                <a class="oe_slide_js_add_section" t-attf-channel_id="#{channel.id}" href="#"
+                <a class="o_wslides_js_slide_section_add" t-attf-channel_id="#{channel.id}" href="#"
                     groups="website.group_website_publisher">Add Section</a>
             </div>
         </div>
@@ -312,74 +320,110 @@
     </div>
 </template>
 
-<template id="course_content_documentation" name="Content of a training channel">
-    <div t-if="not search" class="col-md-8 col-xs-12 mt16 o_wslides_channel_content_promoted">
-         <div class="row align-items-center">
-            <div class="col">
-                <h5 class="m-0"> Featured lesson</h5>
-                <hr class="mt-2"/>
-            </div>
+<template id="course_slides_list_slide" name="Slide template for a training channel">
+    <li t-att-index="j" t-att-data-slide-id="slide.id" t-att-data-category-id="category.id if category else None"
+        class="o_wslides_slides_list_slide d-flex justify-content-between align-items-center p-2">
+        <div class="ml-2">
+            <i t-if="channel.can_publish" class="fa fa-arrows mr-2 text-muted"></i>
+            <t t-call="website_slides.slide_icon"/>
+            <a class="o_wslides_slides_list_slide_link" t-attf-href="/slides/slide/#{slug(slide)}"><span t-field="slide.name"/></a>
         </div>
-        <div class="row" t-if="slide_promoted">
-            <div class="col-4">
-                <img class="img img-fluid" style=""
-                    t-att-src="'/slides/slide/%s/get_image?field=image_large' % slide_promoted.id"
-                    t-att-alt="slide_promoted.name"/>
+        <div class="o_wslides_slides_list_slide_controls mr-2">
+            <i t-if="not slide.id in user_progress or not user_progress[slide.id].completed" class="check-done fa fa-check-circle text-muted mr-1"></i>
+            <i t-if="slide.id in user_progress and user_progress[slide.id].completed" class="check-done text-primary fa fa-check-circle mr-1"></i>
+            <a t-if="channel.can_publish and not slide.slide_type == 'webpage'" t-attf-href="/web#id=#{slide.id}&amp;action=#{slide_action}&amp;model=slide.slide&amp;view_type=form">
+                <i class="fa fa-pencil text-muted mr-1"></i>
+            </a>
+            <a t-if="channel.can_publish and slide.slide_type == 'webpage'" t-attf-href="/slides/slide/#{slug(slide)}?enable_editor=1">
+                <i class="fa fa-pencil text-muted mr-1"></i>
+            </a>
+            <i t-if="channel.can_publish" t-att-data-slide-id="slide.id" class="fa fa-trash text-muted o_wslides_js_slide_archive"></i>
+        </div>
+    </li>
+</template>
+
+<template id="course_slides_list_category" name="Category template for a training channel">
+    <div style="width:50%;" class="d-flex align-items-center">
+        <i t-if="channel.can_publish and category" class="fa fa-arrows mr-3 text-muted"></i>
+        <t t-if="category">
+            <span t-field="category.name"/>
+        </t>
+        <t t-else="">
+            <span>Uncategorized</span>
+        </t>
+    </div>
+    <a  t-if="channel.can_upload"
+        class="mr-2 o_wslides_js_slide_upload"
+        role="button"
+        aria-label="Upload Presentation"
+        href="#"
+        style="font-size: 1.5rem;text-decoration: none;"
+        t-att-data-channel-id="channel.id"
+        t-att-data-category-id="category.id if category else None"
+        t-att-data-can-upload="channel.can_upload"
+        t-att-data-can-publish="channel.can_publish">+</a>
+</template>
+
+<template id="course_slides_cards" name="Documentation Course content: cards / categories">
+    <div t-if="not search" class="row mb-5">
+        <t t-call="website_slides.course_sidebar"/>
+        <div class="col-lg-8">
+             <div class="row align-items-center mt-3">
+                <div class="col">
+                    <h5 class="m-0"> Featured lesson</h5>
+                    <hr class="mt-2"/>
+                </div>
             </div>
-            <div class="col-8">
-                <div class="row">
-                    <h3 class="col-6" t-att-title="slide_promoted.name">
-                        <t t-if="slide_promoted.is_preview or channel.is_member or is_slides_publisher">
-                            <a t-attf-href="/slides/slide/#{slug(slide_promoted)}" class="font-weight-bold text-muted" t-field="slide_promoted.name"/>
-                        </t>
-                        <t t-else="">
-                            <span class="font-weight-bold text-muted" t-field="slide_promoted.name"/>
-                        </t>
-                    </h3>
-                    <div class="col-12" t-field="slide_promoted.description"/>
+            <div class="row" t-if="slide_promoted">
+                <div class="col-4">
+                    <img class="img img-fluid" style=""
+                        t-att-src="'/slides/slide/%s/get_image?field=image_large' % slide_promoted.id"
+                        t-att-alt="slide_promoted.name"/>
+                </div>
+                <div class="col-8">
+                    <div class="row">
+                        <h3 class="col-6" t-att-title="slide_promoted.name">
+                            <t t-if="slide_promoted.is_preview or channel.is_member or is_slides_publisher">
+                                <a t-attf-href="/slides/slide/#{slug(slide_promoted)}" class="font-weight-bold text-muted" t-field="slide_promoted.name"/>
+                            </t>
+                            <t t-else="">
+                                <span class="font-weight-bold text-muted" t-field="slide_promoted.name"/>
+                            </t>
+                        </h3>
+                        <div class="col-12" t-field="slide_promoted.description"/>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-    <div t-if="search and not category_data" class="col-12">
-        <div class="row mt16 justify-content-end">
-            <div class="col-12">
-                <p class="text-center">No content was found using your search <span class="font-weight-bold" t-esc="search"/>.</p>
-            </div>
+    <div t-if="search and not category_data" class="row mt16 justify-content-end">
+        <div class="col-12">
+            <p class="text-center">No content was found using your search <span class="font-weight-bold" t-esc="search"/>.</p>
         </div>
     </div>
-    <div t-if="category_data" class="col-12">
-        <div class="tab-content mt16" id="slideChannelContent">
-            <div class="tab-pane active" role="tabpanel" aria-labelledby="profile-tab" id="slideChannelContentAbout">
-                <t t-foreach="category_data" t-as="category">
-                    <div class="row mt16 align-items-center">
-                        <div class="col">
-                            <t t-if="category['id']">
-                                <a t-att-href="'/slides/%s/category/%s' % (slug(channel), category['slug_name'])" class="float-right">View all</a>
-                            </t>
-                            <t t-else="">
-                                <a t-att-href="'/slides/%s?uncategorized=1' % (slug(channel))" class="float-right">View all</a>
-                            </t>
-                            <h5 class="m-0"><t t-esc="category['name']"/></h5>
-                            <hr class="mt-2"/>
-                        </div>
-                    </div>
-                    <t t-call="website_slides.course_lessons_grid">
-                        <t t-set="slides" t-value="category['slides']"/>
+    <t t-foreach="category_data" t-as="category">
+        <div class="mb-5">
+            <div class="row align-items-center">
+                <div class="col">
+                    <t t-if="category['id']">
+                        <a t-att-href="'/slides/%s/category/%s' % (slug(channel), category['slug_name'])" class="float-right">View all</a>
                     </t>
+                    <t t-else="">
+                        <a t-att-href="'/slides/%s?uncategorized=1' % (slug(channel))" class="float-right">View all</a>
+                    </t>
+                    <h5 class="m-0"><t t-esc="category['name']"/></h5>
+                    <hr class="mt-2"/>
+                </div>
+            </div>
+            <div class="row mx-n2 mt8">
+                <t t-foreach="category['slides']" t-as="slide">
+                    <div class="col-md-3 col-sm-6 px-2 col-xs-12 d-flex flex-grow-1" t-call="website_slides.lesson_card"/>
                 </t>
             </div>
         </div>
-        <div t-field="channel.description_html"/>
-    </div>
-</template>
-
-<!-- Embedded template: display a list of slides in a grid view -->
-<template id='course_lessons_grid' name="Course: Lessons Grid View">
-    <div class="row o_wslides_row mx-n2 mt8">
-        <t t-foreach="slides" t-as="slide">
-            <div class="col-md-3 col-sm-6 px-2 col-xs-12 d-flex flex-grow-1" t-call="website_slides.lesson_card"/>
-        </t>
+    </t>
+    <div class="row">
+        <div class="col" t-field="channel.description_html"/>
     </div>
 </template>
 
@@ -416,12 +460,12 @@
         <div class="card-footer border-top-0 text-600">
             <div class="d-flex align-items-center small">
                 <span class="font-weight-bold mr-auto" t-field="slide.completion_time" t-options='{"widget": "float_time"}'/>
-                <div class="o_wslides_like mr-2">
-                    <span class="o_wslides_like_up" tabindex="0" data-toggle="popover" t-att-data-slide-id="slide.id">
+                <div class="o_wslides_js_slide_like mr-2">
+                    <span class="o_wslides_js_slide_like_up" tabindex="0" data-toggle="popover" t-att-data-slide-id="slide.id">
                         <i class="fa fa-thumbs-up fa-1x" role="img" aria-label="Likes" title="Likes"></i>
                         <span t-esc="slide.likes"/>
                     </span>
-                    <span class="o_wslides_like_down" tabindex="0" data-toggle="popover" t-att-data-slide-id="slide.id">
+                    <span class="o_wslides_js_slide_like_down" tabindex="0" data-toggle="popover" t-att-data-slide-id="slide.id">
                         <i class="fa fa-thumbs-down fa-1x" role="img" aria-label="Dislikes" title="Dislikes"></i>
                         <span t-esc="slide.dislikes"/>
                     </span>
@@ -434,4 +478,13 @@
     </div>
 </template>
 
+<template id="slide_icon">
+    <i t-if="slide.slide_type == 'document'" class="fa fa-file-pdf-o mr-2 text-muted"></i>
+    <i t-if="slide.slide_type == 'infographic'" class="fa fa-file-picture-o mr-2 text-muted"></i>
+    <i t-if="slide.slide_type == 'video'" class="fa fa-play-circle mr-2 text-muted"></i>
+    <i t-if="slide.slide_type == 'link'" class="fa fa-file-code-o mr-2 text-muted"></i>
+    <i t-if="slide.slide_type == 'webpage'" class="fa fa-file-text mr-2 text-muted"></i>
+    <i t-if="slide.slide_type == 'quiz'" class="fa fa-question-circle mr-2 text-muted"></i>
+</template>
+
 </data></odoo>
diff --git a/addons/website_slides/views/website_slides_templates_homepage.xml b/addons/website_slides/views/website_slides_templates_homepage.xml
index cad54cf323d..145120c2b5d 100644
--- a/addons/website_slides/views/website_slides_templates_homepage.xml
+++ b/addons/website_slides/views/website_slides_templates_homepage.xml
@@ -55,7 +55,7 @@
                                         <hr class="mt-2"/>
                                     </div>
                                 </div>
-                                <div class="row o_wslides_row mx-n2 mt8">
+                                <div class="row mx-n2 mt8">
                                     <t t-foreach="channels_my[:3]" t-as="channel">
                                         <div class="col-md-4 col-sm-6 px-2 col-xs-12 d-flex flex-grow-1" t-call="website_slides.course_card"/>
                                     </t>
@@ -70,7 +70,7 @@
                                     <hr class="mt-2"/>
                                 </div>
                             </div>
-                            <div class="row o_wslides_row mx-n2 mt8">
+                            <div class="row mx-n2 mt8">
                                 <t t-foreach="channels_popular[:3]" t-as="channel">
                                     <div class="col-md-4 col-sm-6 px-2 col-xs-12 d-flex flex-grow-1" t-call="website_slides.course_card"/>
                                 </t>
@@ -84,7 +84,7 @@
                                     <hr class="mt-2"/>
                                 </div>
                             </div>
-                            <div class="row o_wslides_row mx-n2 mt8">
+                            <div class="row mx-n2 mt8">
                                 <t t-foreach="channels_newest[:3]" t-as="channel">
                                     <div class="col-md-4 col-sm-6 px-2 col-xs-12 d-flex flex-grow-1" t-call="website_slides.course_card"/>
                                 </t>
diff --git a/addons/website_slides/views/website_slides_templates_lesson.xml b/addons/website_slides/views/website_slides_templates_lesson.xml
index 6c3c9c9f54b..98f7577b848 100644
--- a/addons/website_slides/views/website_slides_templates_lesson.xml
+++ b/addons/website_slides/views/website_slides_templates_lesson.xml
@@ -8,71 +8,44 @@
             <t t-call="website_slides.course_nav">
                 <t t-set="channel" t-value="slide.channel_id"/>
             </t>
-            <div class="slide-header">
-                <div class="slide-header-container">
-                    <div class="slide-header-box">
+            <div class="o_wslides_slide_header">
+                <div class="o_wslides_slide_header_container">
+                    <div class="o_wslides_slide_header_box">
                         <a t-attf-href="/slides/#{slug(slide.channel_id)}" t-field="slide.channel_id.name"/>
+
                         <div t-if="slide.channel_id.channel_type == 'training'" class="d-flex align-items-end">
-                            <div class="course-progress-bar">
-                                <div class="progress-gauge m-0 oe_slide_js_progress_bar" t-attf-channel_completion="#{slide.channel_id.completion}"/>
+                            <div class="progress">
+                                <div class="progress-bar" role="progressbar"
+                                    t-att-aria-valuenow="slide.channel_id.completion" aria-valuemin="0" aria-valuemax="100"
+                                    t-att-style="'width: %s' % (slide.channel_id.completion)"/>
                             </div>
                             <i class="fa fa-trophy ml-2 mb-0 p-0" style="font-size:1.8rem; color: #cdcdcd;"></i>
                         </div>
                     </div>
                 </div>
             </div>
-            <div t-if="slide.channel_id.channel_type == 'training'" class="sidebar-list oe_js_side_bar_list slide-content-list">
-                <ul class="slide-list">
+            <div t-if="slide.channel_id.channel_type == 'training'" class="o_wslides_slide_content_list">
+                <ul class="o_wslides_slide_list">
                     <li>
-                        <div class="slide-content-list-header">
+                        <div class="o_wslides_slide_content_list_header">
                             Course content
                         </div>
                     </li>
                     <t t-set="i" t-value="0"/>
+                    <t t-if="uncategorized_slides" t-call="website_slides.slide_detail_list_category_view">
+                        <t t-set="category_slide_ids" t-value="uncategorized_slides" />
+                    </t>
                     <t t-foreach="slide.channel_id.category_ids" t-as="category">
-                        <a data-toggle="collapse" t-attf-href="#collapse-#{category.id}" role="button" aria-expanded="false" t-attf-aria-controls="collapse-#{category.id}">
-                            <li class="slide-content-list-section">
-                                <span t-field="category.name"/>
-                            </li>
-                        </a>
-                        <ul class="collapse p-0 m-0" t-attf-id="collapse-#{category.id}" >
-                            <t t-foreach="category.slide_ids" t-as="course_slide">
-                                <li class="slide-content-list-slide">
-                                    <a t-attf-href="/slides/slide/#{slug(course_slide)}" t-att-index="i" t-att-slide_id="course_slide.id">
-                                        <div  t-attf-index="#{i}" t-attf-slide_id="#{course_slide.id}"  t-attf-class="#{'active' if slide.id == course_slide.id else ''} d-flex justify-content-between">
-                                            <div>
-                                                <i t-if="course_slide.slide_type == 'presentation'" class="fa fa-file-pdf-o mr-2 text-muted"></i>
-                                                <i t-if="course_slide.slide_type == 'infographic'" class="fa fa-file-picture-o mr-2 text-muted"></i>
-                                                <i t-if="course_slide.slide_type == 'video'" class="fa fa-play-circle mr-2 text-muted"></i>
-                                                <i t-if="course_slide.slide_type == 'link'" class="fa fa-file-code-o mr-2 text-muted"></i>
-                                                <i t-if="course_slide.slide_type == 'webpage'" class="fa fa-file-text mr-2 text-muted"></i>
-                                                <i t-if="course_slide.slide_type == 'quiz'" class="fa fa-question-circle mr-2 text-muted"></i>
-                                                <t t-esc="course_slide.name"/>
-                                            </div>
-                                            <div class="content-slide-controls mr-2">
-                                                <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and not user_progress[course_slide.id].completed" class="check-done fa fa-check-circle text-muted mr-1"></i>
-                                                <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and user_progress[course_slide.id].completed" class="check-done text-primary fa fa-check-circle mr-1"></i>
-                                            </div>
-                                        </div>
-                                    </a>
-                                    <ul t-if="course_slide.link_ids" class="list-group slide-resources">
-                                        <t t-foreach="course_slide.link_ids" t-as="resource">
-                                            <a t-attf-href="#{resource.link}" target="new">
-                                                <li><div class="slide-resource"><i class="fa fa-link"></i><span t-field="resource.link"/></div></li>
-                                            </a>
-                                        </t>
-                                    </ul>
-                                </li>
-                                <t t-set="i" t-value="i+1"/>
-                            </t>
-                        </ul>
+                        <t t-call="website_slides.slide_detail_list_category_view">
+                            <t t-set="category_slide_ids" t-value="category.slide_ids"/>
+                        </t>
                     </t>
                 </ul>
             </div>
-            <div class="slide-header-container d-flex justify-content-between mt-4 mb-3">
-                <div class="slide-title">
+            <div class="o_wslides_slide_header_container d-flex justify-content-between mt-4 mb-3">
+                <div class="o_wslides_slide_title">
                     <h1 t-field="slide.name"/>
-                    <span t-if="slide.question_ids" t-attf-class="slide-points ml-2 #{'quiz-points-won' if slide.id in user_progress and user_progress[slide.id].completed else ''}">
+                    <span t-if="slide.question_ids" t-attf-class="o_wslides_slide_points ml-2 #{'quiz-points-won' if slide.id in user_progress and user_progress[slide.id].completed else ''}">
                         <span t-if="slide.id in user_progress and user_progress[slide.id].quiz_attempts_count == 0" id="quiz-points" t-esc="slide.quiz_first_attempt_reward"/>
                         <span t-if="slide.id in user_progress and user_progress[slide.id].quiz_attempts_count == 1" id="quiz-points" t-esc="slide.quiz_second_attempt_reward"/>
                         <span t-if="slide.id in user_progress and user_progress[slide.id].quiz_attempts_count == 2" id="quiz-points" t-esc="slide.quiz_third_attempt_reward"/>
@@ -80,18 +53,20 @@
                         points
                     </span>
                 </div>
-                <div class="course-nav-links">
+                <div>
                     <t t-if="previous_slide">
-                        <a class="slide-button" t-attf-href="/slides/slide/#{previous_slide}">Prev</a>
+                        <a class="o_wslides_slide_button" t-attf-href="/slides/slide/#{previous_slide}">Prev</a>
                     </t>
-                    <a t-if="slide.slide_type in ('webpage', 'video', 'document', 'iconographic') and not slide.question_ids and (slide.id in user_progress and  not user_progress[slide.id].completed)" t-attf-href="/slide/completed/#{slide.id}?next_slide=#{next_slide}&amp;course=#{slug(slide.channel_id)}" class="slide-button-done">Set Done</a>
+                    <a t-if="slide.slide_type in ('webpage', 'video', 'document', 'iconographic') and not slide.question_ids and (slide.id in user_progress and  not user_progress[slide.id].completed)" 
+                        t-att-href="'/slides/slide/%s/set_completed?%s' % (slide.id, 'next_slide=%s' % next_slide if next_slide else '')"
+                        class="o_wslides_slide_button_done">Set Done</a>
                     <t t-if="next_slide">
-                        <a class="slide-button" t-attf-href="/slides/slide/#{next_slide}">Next</a>
+                        <a class="o_wslides_slide_button" t-attf-href="/slides/slide/#{next_slide}">Next</a>
                     </t>
-                    <a t-if="slide.channel_id.channel_type == 'training'" t-attf-href="/slides/slide/#{slug(slide)}?fullscreen=1" class="slide-button-fullscreen ml-2"><i class="fa fa-desktop mr-2"></i>fullscreen</a>
+                    <a t-if="slide.channel_id.channel_type == 'training'" t-attf-href="/slides/slide/#{slug(slide)}?fullscreen=1" class="o_wslides_slide_button_fullscreen ml-2"><i class="fa fa-desktop mr-2"></i>fullscreen</a>
                 </div>
             </div>
-        <div class="slide-header-container mt16">
+        <div class="o_wslides_slide_header_container mt16">
             <div class="row">
                 <div style="width:100%;">
                     <div class="o_w_slides_slide_detail_container" style="width: 100%;">
@@ -108,7 +83,7 @@
                             <div t-field="slide.html_content"/>
                         </div>
                         <div t-if="slide.question_ids">
-                            <div class=".o_wslides_fullscreen_quiz o_w_slides_quiz_no_fullscreen mt-2"
+                            <div class=".o_wslides_fs_quiz o_w_slides_quiz_no_fullscreen mt-2"
                                 t-attf-slide_id="#{slide.id}"
                                 t-attf-slide_done="#{slide.id in user_progress and user_progress[slide.id].completed}"
                                 t-attf-nb_attempts="#{user_progress[slide.id].quiz_attempts_count if slide.id in user_progress else ''}"
@@ -218,9 +193,9 @@
 
                                 <!-- LikeButton widget -->
                                 <div t-if="slide.channel_id.channel_type == 'documentation' and slide.channel_id.allow_comment" class="text-muted mt4">
-                                    <div class="float-right mb16 text-right o_wslides_like">
+                                    <div class="float-right mb16 text-right o_wslides_js_slide_like">
                                         <span
-                                            class="o_wslides_like_up"
+                                            class="o_wslides_js_slide_like_up"
                                             t-att-data-slide-id="slide.id"
                                             tabindex="0"
                                             data-toggle="popover">
@@ -228,7 +203,7 @@
                                             <span t-esc="slide.likes"/>
                                         </span>
                                         <span
-                                            class="o_wslides_like_down"
+                                            class="o_wslides_js_slide_like_down"
                                             t-att-data-slide-id="slide.id"
                                             tabindex="0"
                                             data-toggle="popover">
@@ -444,102 +419,45 @@
     </t>
 </template>
 
-<!-- Slide template for the fullscreen mode -->
-<template id="slide_fullscreen" name="Fullscreen">
-    <t t-call="website.layout">
-        <div class="o_wslides">
-            <div class="o_wslides_slide_fullscreen_header">
-                <div>
-                    <a id="fullscreen_sidebar_button" href="#" class="active o_wslides_fullscreen_toggle_sidebar"><i class="fa fa-bars"></i>Lessons</a>
-                    <a class="o_wslides_small_screen" t-attf-href="/slides/slide/#{slug(slide)}" target="new"><i class="fa fa-pencil"></i>write a review</a>
-                    <div class="o_wslides_fullscreen_slide_title"/>
-                </div>
-                <div>
-                    <a t-attf-href="/slides/">back to courses</a>
-                </div>
-            </div>
-            <div class="o_wslides_fullscreen_container">
-                <div class="oe_js_side_bar_list o_wslides_fullscreen_sidebar">
-                    <ul>
-                        <li>
-                            <div class="o_wslides_fullscreen_sidebar_header">
-                                <a t-attf-href="/slides/#{slug(slide.channel_id)}">
-                                    <span t-field="slide.channel_id.name"/>
-                                </a>
-                                <div class="o_wslides_slide_fullscreen_progress_box">
-                                    <div class="o_wslides_fullscreen_sidebar_progressbar">
-                                        <div class="o_wslides_fullscreen_sidebar_progress_gauge oe_slide_js_progress_bar" t-attf-channel_completion="#{slide.channel_id.completion}"/>
-                                    </div>
-                                    <span><span class="o_wslides_progress_percentage" t-esc="slide.channel_id.completion"/>%</span>
-                                </div>
-                            </div>
-                        </li>
-                        <t t-set="i" t-value="0"/>
-                        <t t-foreach="slide.channel_id.category_ids" t-as="category">
-                            <div class="o_wslides_fullscreen_sidebar_section">
-                                <a data-toggle="collapse" t-attf-href="#collapse-#{category.id}" role="button" aria-expanded="true" t-attf-aria-controls="collapse-#{category.id}">
-                                    <li class="o_wslides_fullscreen_sidebar_section_tab">
-                                        <span t-field="category.name"/>
-                                    </li>
-                                </a>
-                                <ul class="o_wslides_fullscreen_sidebar_section_slides collapsed p-0 m-0" t-attf-id="collapse-#{category.id}" >
-                                    <t t-foreach="category.slide_ids" t-as="course_slide">
-                                        <li t-att-index="i" t-att-slide_id="course_slide.id" t-attf-class="#{'active' if slide.id == course_slide.id else ''}">
-                                            <span class="o_wslides_fullscreen_slide_tab_line">
-                                                <span class="o_wslides_top_line"></span>
-                                                <i t-attf-id="check-#{course_slide.id}" t-if="not course_slide.id in user_progress or not user_progress[course_slide.id].completed" class="check-done fa fa-circle-thin"></i>
-                                                <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and user_progress[course_slide.id].completed" class="check-done o_wslides_slide_completed fa fa-check-circle"></i>
-                                                <span class="o_wslides_bottom_line"></span>
-                                            </span>
-                                            <a t-att-index="i" t-att-slide_id="course_slide.id">
-                                                <div t-attf-index="#{i}"
-                                                    t-attf-slide_slug="#{slug(course_slide)}"
-                                                    t-attf-done="#{course_slide.id in user_progress and user_progress[course_slide.id].completed}"
-                                                    t-attf-slide_id="#{course_slide.id}"
-                                                    t-attf-slide_name="#{course_slide.name}"
-                                                    t-attf-quiz="#{True if course_slide.question_ids else False}"
-                                                    t-attf-slide_type="#{course_slide.slide_type}"
-                                                    t-attf-slide_embed_code="#{course_slide.embed_code}"
-                                                    t-attf-class="o_wslides_fullscreen_sidebar_slide_tab #{'active' if slide.id == course_slide.id else ''} d-flex justify-content-between">
-                                                    <div>
-                                                        <i t-if="course_slide.slide_type == 'document'" class="fa fa-file-pdf-o mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'infographic'" class="fa fa-file-picture-o mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'video'" class="fa fa-play-circle mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'link'" class="fa fa-file-code-o mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'webpage'" class="fa fa-file-text mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'quiz'" class="fa fa-question-circle mr-2 text-muted"></i>
-                                                        <i t-if="course_slide.slide_type == 'certification'" class="fa fa-trophy mr-2 text-muted"></i>
-                                                        <t t-esc="course_slide.name"/>
-                                                    </div>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <t t-if="course_slide.link_ids" t-foreach="course_slide.link_ids" t-as="link">
-                                            <li>
-                                                <span class="o_wslides_fullscreen_slide_tab_line">
-                                                    <span class="o_wslides_full_line"/>
-                                                </span>
-                                                <a class="o_wslides_slide_link" t-att-href="link.link" target="new"><i class="fa fa-link"></i><span t-esc="link.name"/></a>
-                                            </li>
-                                        </t>
-                                        <li t-att-index="i" t-if="course_slide.question_ids and not course_slide.slide_type =='quiz'">
-                                            <span class="o_wslides_fullscreen_slide_tab_line">
-                                                <span class="o_wslides_full_line"/>
-                                            </span>
-                                            <span class="o_wslides_slide_quiz" t-att-index="i"><i class="fa fa-flag-checkered"></i>Quiz: <span t-esc="course_slide.name"/></span>
-                                        </li>
-                                        <t t-set="i" t-value="i+1"/>
-                                    </t>
-                                </ul>
-                            </div>
-                        </t>
-                    </ul>
-                </div>
-                <div class="oe_js_course_slide" t-attf-user_id="#{user.id}" t-attf-course_name="#{slide.channel_id.name}" t-attf-course_id="#{slide.channel_id.id}" t-attf-course_slug="#{slug(slide.channel_id)}" t-attf-slide_id="#{slide.id}"/>
-                <div class="o_wslides_fullscreen_player"/>
-            </div>
-        </div>
-    </t>
+<template id="slide_detail_list_category_view" name="Category item for the slide detailed view list">
+    <a data-toggle="collapse" t-att-href="('#collapse-%s') % (category.id if category else 0)" role="button" aria-expanded="true" t-att-aria-controls="('collapse-%s') % (category.id if category else 0)">
+        <li class="o_wslides_slide_content_list_section">
+            <t t-if="category">
+                <span t-field="category.name"/>
+            </t>
+            <t t-else="">
+                <span>Uncategorized</span>
+            </t>
+        </li>
+    </a>
+    <ul class="collapse show p-0 m-0" t-att-id="('collapse-%s') % (category.id if category else 0)" >
+        <t t-foreach="category_slide_ids" t-as="course_slide">
+            <li class="o_wslides_slide_content_list_slide">
+                <a t-attf-href="/slides/slide/#{slug(course_slide)}" t-att-index="i" t-att-slide_id="course_slide.id">
+                    <div  t-attf-index="#{i}" t-attf-slide_id="#{course_slide.id}"  t-attf-class="#{'active' if slide.id == course_slide.id else ''} d-flex justify-content-between">
+                        <div>
+                            <t t-call="website_slides.slide_icon">
+                                <t t-set="slide" t-value="course_slide" />
+                            </t>
+                            <t t-esc="course_slide.name"/>
+                        </div>
+                        <div class="o_wslides_slides_list_slide_controls mr-2">
+                            <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and not user_progress[course_slide.id].completed" class="check-done fa fa-check-circle text-muted mr-1"></i>
+                            <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and user_progress[course_slide.id].completed" class="check-done text-primary fa fa-check-circle mr-1"></i>
+                        </div>
+                    </div>
+                </a>
+                <ul t-if="course_slide.link_ids" class="list-group">
+                    <t t-foreach="course_slide.link_ids" t-as="resource">
+                        <a t-attf-href="#{resource.link}" target="new">
+                            <li><div><i class="fa fa-link"></i><span t-field="resource.link"/></div></li>
+                        </a>
+                    </t>
+                </ul>
+            </li>
+            <t t-set="i" t-value="i+1"/>
+        </t>
+    </ul>
 </template>
 
 <!-- Slide sub-template: display an item in a list of related slides (Related, Most Viewed, ...) -->
diff --git a/addons/website_slides/views/website_slides_templates_lesson_fullscreen.xml b/addons/website_slides/views/website_slides_templates_lesson_fullscreen.xml
new file mode 100644
index 00000000000..8b7a649d107
--- /dev/null
+++ b/addons/website_slides/views/website_slides_templates_lesson_fullscreen.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" ?>
+<odoo><data>
+
+<!-- Slide template for the fullscreen mode -->
+<template id="slide_fullscreen" name="Fullscreen">
+    <t t-call="website.layout">
+        <div class="o_wslides_fs_main"
+            t-att-data-user-id="user.id"
+            t-att-data-course-name="slide.channel_id.name"
+            t-att-data-course-id="slide.channel_id.id"
+            t-att-data-course-slug="slug(slide.channel_id)"
+            t-att-data-slide-id="slide.id">
+            <div class="o_wslides_slide_fs_header">
+                <div>
+                    <a id="fullscreen_sidebar_button" href="#" class="active o_wslides_fs_toggle_sidebar"><i class="fa fa-bars"></i>Lessons</a>
+                    <a class="o_wslides_small_screen" t-attf-href="/slides/slide/#{slug(slide)}" target="new"><i class="fa fa-pencil"></i>write a review</a>
+                    <div class="o_wslides_fs_slide_title"/>
+                </div>
+                <div>
+                    <a t-attf-href="/slides/">back to courses</a>
+                </div>
+            </div>
+            <div class="o_wslides_fs_container">
+                <div class="o_wslides_fs_sidebar">
+                    <ul>
+                        <li>
+                            <div class="o_wslides_fs_sidebar_header">
+                                <a t-attf-href="/slides/#{slug(slide.channel_id)}">
+                                    <span t-field="slide.channel_id.name"/>
+                                </a>
+                                <div class="o_wslides_slide_fs_progress_box">
+                                    <div class="progress o_wslides_fs_sidebar_progressbar">
+                                        <div class="progress-bar" role="progressbar"
+                                            t-att-aria-valuenow="slide.channel_id.completion" aria-valuemin="0" aria-valuemax="100"
+                                            t-att-style="'width: %s' % (slide.channel_id.completion)"/>
+                                    </div>
+                                    <div><span class="o_wslides_progress_percentage" t-esc="slide.channel_id.completion"/>%</div>
+                                </div>
+                            </div>
+                        </li>
+                        <t t-if="uncategorized_slides" t-call="website_slides.slide_fullscreen_sidebar_category">
+                            <t t-set="category_slide_ids" t-value="uncategorized_slides" />
+                        </t>
+                        <t t-foreach="slide.channel_id.category_ids" t-as="category">
+                            <t t-call="website_slides.slide_fullscreen_sidebar_category">
+                                <t t-set="category_slide_ids" t-value="category.slide_ids" />
+                            </t>
+                        </t>
+                    </ul>
+                </div>
+                <div class="o_wslides_fs_player"/>
+            </div>
+        </div>
+    </t>
+</template>
+
+<template id="slide_fullscreen_sidebar_category" name="Slides category template for fullscreen view side bar">
+    <div class="o_wslides_fs_sidebar_section">
+        <a data-toggle="collapse" t-att-href="('#collapse-%s') % (category.id if category else 0)" role="button" aria-expanded="true" t-att-aria-controls="('collapse-%s') % (category.id if category else 0)">
+            <li>
+                <t t-if="category">
+                    <span t-field="category.name"/>
+                </t>
+                <t t-else="">
+                    <span>Uncategorized</span>
+                </t>
+            </li>
+        </a>
+        <ul class="o_wslides_fs_sidebar_section_slides collapse show p-0 m-0" t-att-id="('collapse-%s') % (category.id if category else 0)" >
+            <t t-foreach="category_slide_ids" t-as="course_slide">
+                <!-- AWA FIXME: remove that index crap but right now fullscreen JS uses it too much -->
+                <t t-set="i" t-value="list(slide.channel_id.slide_ids).index(course_slide)"/>
+                <li t-att-index="i" t-att-data-slide-id="course_slide.id" t-attf-class="#{'active' if slide.id == course_slide.id else ''}">
+                    <span>
+                        <span class="o_wslides_top_line"></span>
+                        <i t-attf-id="check-#{course_slide.id}" t-if="not course_slide.id in user_progress or not user_progress[course_slide.id].completed" class="check-done fa fa-circle-thin"></i>
+                        <i t-attf-id="check-#{course_slide.id}" t-if="course_slide.id in user_progress and user_progress[course_slide.id].completed" class="check-done o_wslides_slide_completed fa fa-check-circle"></i>
+                        <span class="o_wslides_bottom_line"></span>
+                    </span>
+                    <a t-att-index="i" t-att-data-slide-id="course_slide.id">
+                        <div t-attf-index="#{i}"
+                            t-att-data-slug="slug(course_slide)"
+                            t-att-data-done="course_slide.id in user_progress and user_progress[course_slide.id].completed"
+                            t-att-data-id="course_slide.id"
+                            t-att-data-name="course_slide.name"
+                            t-attf-data-has_quiz="#{True if course_slide.question_ids else False}"
+                            t-att-data-slide_type="course_slide.slide_type"
+                            t-att-data-embed_code="course_slide.embed_code"
+                            t-attf-class="o_wslides_fs_sidebar_slide_tab #{'active' if slide.id == course_slide.id else ''} d-flex justify-content-between">
+                            <div>
+                                <t t-call="website_slides.slide_icon">
+                                    <t t-set="slide" t-value="course_slide" />
+                                </t>
+                                <t t-esc="course_slide.name"/>
+                            </div>
+                        </div>
+                    </a>
+                </li>
+                <t t-if="course_slide.link_ids" t-foreach="course_slide.link_ids" t-as="link">
+                    <li>
+                        <span>
+                            <span class="o_wslides_fs_full_line"/>
+                        </span>
+                        <a class="o_wslides_fs_slide_link" t-att-href="link.link" target="new"><i class="fa fa-link"></i><span t-esc="link.name"/></a>
+                    </li>
+                </t>
+                <li t-att-index="i" t-if="course_slide.question_ids and not course_slide.slide_type =='quiz'">
+                    <span>
+                        <span class="o_wslides_fs_full_line"/>
+                    </span>
+                    <span class="o_wslides_fs_slide_quiz" t-att-index="i"><i class="fa fa-flag-checkered"></i>Quiz: <span t-esc="course_slide.name"/></span>
+                </li>
+            </t>
+        </ul>
+    </div>
+</template>
+
+</data></odoo>
diff --git a/addons/website_slides_forum/views/website_slides_templates.xml b/addons/website_slides_forum/views/website_slides_templates.xml
index f2f79731725..554d5b18978 100644
--- a/addons/website_slides_forum/views/website_slides_templates.xml
+++ b/addons/website_slides_forum/views/website_slides_templates.xml
@@ -2,7 +2,7 @@
 <odoo><data>
     <template id='course_main' inherit_id="website_slides.course_main">
         <!-- Channel main template: add link to forum -->
-        <xpath expr="//li[hasclass('o_wslides_nav_tabs_item_home')]" position="after">
+        <xpath expr="//li[hasclass('o_wlides_course_header_nav_home')]" position="after">
             <li class="nav-item" t-if="channel.forum_id">
                 <a t-att-href="'/forum/%s' % (slug(channel.forum_id))"
                     t-att-class="'nav-link'" target="new">Forum</a>
diff --git a/addons/website_slides_survey/__manifest__.py b/addons/website_slides_survey/__manifest__.py
index 93c6b3159dd..71d793d7e6a 100644
--- a/addons/website_slides_survey/__manifest__.py
+++ b/addons/website_slides_survey/__manifest__.py
@@ -13,6 +13,7 @@
         'views/assets.xml',
         'views/slide_channel_views.xml',
         'views/slide_slide_views.xml',
+        'views/website_slides_templates_course.xml',
         'views/website_slides_templates.xml',
         'views/website_slides_templates_homepage.xml',
         'views/survey_templates.xml',
diff --git a/addons/website_slides_survey/static/src/scss/website_slides.scss b/addons/website_slides_survey/static/src/scss/website_slides.scss
index 3cef87764d8..84a24ede56f 100644
--- a/addons/website_slides_survey/static/src/scss/website_slides.scss
+++ b/addons/website_slides_survey/static/src/scss/website_slides.scss
@@ -1,4 +1,4 @@
-.o_wslides_fullscreen_certification {
+.o_wslides_fs_certification {
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
index c56cf727dfc..97f35fc3a32 100644
--- a/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
+++ b/addons/website_slides_survey/static/src/xml/website_slides_fullscreen.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-extend="website.slides.fullscreen">
-        <t t-jquery=".o_wslides_fullscreen_content" t-operation="append">
-            <div class="o_wslides_fullscreen_certification" t-if="slide.slide_type == 'certification'">
+        <t t-jquery=".o_wslides_fs_content" t-operation="append">
+            <div class="o_wslides_fs_certification" t-if="slide.slide_type == 'certification'">
                 <a class="btn btn-primary" t-att-href="'/slides/slide/' + slide.slug" target="new"><i class="fa fa-trophy"/> Pass Certification</a>
             </div>
         </t>
     </t>
 
     <t t-extend="website.course.fullscreen.title">
-        <t t-jquery=".o_wslides_fullscreen_slide_title_span" t-operation="before">
+        <t t-jquery=".o_wslides_fs_slide_title_span" t-operation="before">
             <i t-if="slide.slide_type == 'certification'" class="fa fa-trophy mr-2 text"></i>
         </t>
     </t>
diff --git a/addons/website_slides_survey/views/website_slides_templates_course.xml b/addons/website_slides_survey/views/website_slides_templates_course.xml
new file mode 100644
index 00000000000..95cef917fbd
--- /dev/null
+++ b/addons/website_slides_survey/views/website_slides_templates_course.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="slide_icon_inherit_survey" inherit_id="website_slides.slide_icon">
+            <xpath expr="//i[last()]" position="after">
+                <i t-if="slide.slide_type == 'certification'" class="fa fa-trophy mr-2 text-muted"></i>
+            </xpath>
+        </template>
+    </data>
+</odoo>
diff --git a/odoo/addons/base/i18n/nl.po b/odoo/addons/base/i18n/nl.po
index 5390bdc5725..994f575b77d 100644
--- a/odoo/addons/base/i18n/nl.po
+++ b/odoo/addons/base/i18n/nl.po
@@ -12,7 +12,7 @@
 # Cas Vissers <casvissers@brahoo.nl>, 2018
 # Eric Geens <ericgeens@yahoo.com>, 2018
 # Cas Vissers <c.vissers@brahoo.nl>, 2018
-# Erwin van der Ploeg <erwin@odooexperts.nl>, 2019
+# Erwin van der Ploeg <erwin@odooexperts.nl>, 2018
 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2019
 # 
 msgid ""
@@ -1387,13 +1387,6 @@ msgid ""
 " - To generate the IRAS Audit File, go to Accounting -> Reporting -> IRAS Audit File\n"
 "    "
 msgstr ""
-"\n"
-"Accounting reports for Singapore\n"
-"================================\n"
-"This module allow to generate the GST Return (F5) and the IRAS Audit File.\n"
-" - To generate the GST Return, go to Accounting -> Reporting -> GST Return\n"
-" - To generate the IRAS Audit File, go to Accounting -> Reporting -> IRAS Audit File\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_th_reports
@@ -4632,8 +4625,8 @@ msgstr ""
 "Kwaliteitsbeheer\n"
 "=============== \n"
 "\n"
-"* Definieer kwaliteitscontrolepunten die kwaliteitscontroles zullen genereren, bij    productieorders of werkorders (quality_mrp).\n"
-"* Kwaliteitswaarschuwingen kunnen onafhankelijk worden gemaakt of gerelateerd aan kwaliteitscontroles\n"
+"* Definieer kwaliteitscontrolepunten die kwaliteitscontroles zullen genereren, bij productieorders of werkorders (quality_mrp).\n"
+"* Kwaliteitswaarschuwingen kunnen onafhankelijk worden gemaakt of gerelateerd zijn aan kwaliteitscontroles\n"
 "* Mogelijkheid om een meting toe te voegen aan de kwaliteitscontrole met een minimale / maximale tolerantie\n"
 "* Definieer uw fasen voor de kwaliteitswaarschuwingen\n"
 
@@ -4867,16 +4860,6 @@ msgid ""
 "\n"
 "    "
 msgstr ""
-"\n"
-"Singapore accounting chart and localization.\n"
-"=======================================================\n"
-"\n"
-"This module add, for accounting:\n"
-" - The Chart of Accounts of Singapore\n"
-" - Field UEN (Unique Entity Number) on company and partner\n"
-" - Field PermitNo and PermitNoDate on invoice\n"
-"\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_es
@@ -5005,24 +4988,6 @@ msgid ""
 "    - Clicking the 'Send by mail' button will attach two files to your draft mail : the invoice, and the corresponding ISR.\n"
 "    "
 msgstr ""
-"\n"
-"Swiss localization\n"
-"==================\n"
-"This module defines a chart of account for Switzerland (Swiss PME/KMU 2015), taxes and enables the generation of ISR when you print an invoice or send it by mail.\n"
-"\n"
-"An ISR will be generated if you specify the information it needs :\n"
-"    - The bank account you expect to be paid on must be set, and have a valid postal reference.\n"
-"    - Your invoice must have been set assigned a bank account to receive its payment\n"
-"      (this can be done manually, but a default value is automatically set if you have defined a bank account).\n"
-"    - You must have set the postal references of your bank.\n"
-"    - Your invoice must be in EUR or CHF (as ISRs do not accept other currencies)\n"
-"\n"
-"The generation of the ISR is automatic if you meet the previous criteria.\n"
-"\n"
-"Here is how it works:\n"
-"    - Printing the invoice will trigger the download of two files: the invoice, and its ISR\n"
-"    - Clicking the 'Send by mail' button will attach two files to your draft mail : the invoice, and the corresponding ISR.\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_yodlee
@@ -5208,21 +5173,6 @@ msgid ""
 "\n"
 "    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 msgstr ""
-"\n"
-"This add-on brings the technical requirements of the French regulation CGI art. 286, I. 3° bis that stipulates certain criteria concerning the inalterability, security, storage and archiving of data related to sales to private individuals (B2C).\n"
-"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
-"\n"
-"Install it if you use the Point of Sale app to sell to individuals.\n"
-"\n"
-"The module adds following features:\n"
-"\n"
-"    Inalterability: deactivation of all the ways to cancel or modify key data of POS orders, invoices and journal entries\n"
-"\n"
-"    Security: chaining algorithm to verify the inalterability\n"
-"\n"
-"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
-"\n"
-"    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_certification
@@ -5241,19 +5191,6 @@ msgid ""
 "\n"
 "    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 msgstr ""
-"\n"
-"This add-on brings the technical requirements of the French regulation CGI art. 286, I. 3° bis that stipulates certain criteria concerning the inalterability, security, storage and archiving of data related to sales to private individuals (B2C).\n"
-"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
-"\n"
-"The module adds following features:\n"
-"\n"
-"    Inalterability: deactivation of all the ways to cancel or modify key data, invoices and journal entries\n"
-"\n"
-"    Security: chaining algorithm to verify the inalterability\n"
-"\n"
-"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
-"\n"
-"    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_pos_cache
@@ -5860,14 +5797,6 @@ msgid ""
 "    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
 "\n"
 msgstr ""
-"\n"
-"This module adds support for automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
-"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
-"\n"
-"The module adds following features:\n"
-"\n"
-"    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
-"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_barcode
@@ -6011,18 +5940,6 @@ msgid ""
 "- Check on bottom: ADP standard\n"
 "    "
 msgstr ""
-"\n"
-"This module allows to print your payments on pre-printed checks.\n"
-"You can configure the output (layout, stubs, paper format, etc.) in company settings, and manage the\n"
-"checks numbering (if you use pre-printed checks without numbers) in journal settings.\n"
-"As per Canadian Payment Association (https://www.payments.ca/sites/default/files/standard_006_complete_0.pdf)\n"
-"\n"
-"Supported formats\n"
-"-----------------\n"
-"- Check on top : Quicken / QuickBooks standard\n"
-"- Check on middle: Peachtree standard\n"
-"- Check on bottom: ADP standard\n"
-"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_anonymization
@@ -13287,58 +13204,6 @@ msgid ""
 "With this plugin, you can synchronize your Odoo calendar with Google Calendar.\n"
 "\n"
 msgstr ""
-"Google Calendar\n"
-"---------------\n"
-"\n"
-"Get your meetings, your leaves... Get your calendar anywhere and never\n"
-"forget an event, fully synchronized with the Odoo <a href=\"https://www.odoo.com/page/crm\">Open Source CRM</a>.\n"
-"\n"
-"Keep an eye on your events\n"
-"--------------------------\n"
-"\n"
-"See easily the purpose of the meeting, the start time and also the\n"
-"attendee(s)... All that without click on anything...\n"
-"\n"
-"Create so easily an event\n"
-"-------------------------\n"
-"\n"
-"In just one click you can create an event...  You can drag and drop your event\n"
-"if you want moved it to another timing.  You can shrink or extend the event if\n"
-"you need to change the start's hours or the duration of your meeting.\n"
-"\n"
-"Create recurrent event\n"
-"----------------------\n"
-"\n"
-"You can also create recurrent events with only one event.  You need to create\n"
-"an event each monday of the week ? With only one it's possible, you could\n"
-"specify the recurrence and if one of this event is moved, or deleted, it's not\n"
-"a problem, you can untie your event from the others recurrences.\n"
-"\n"
-"See all events you wants\n"
-"------------------------\n"
-"\n"
-"See in your calendar, the event from others peoples where your are attendee,\n"
-"but also their events by simply adding your favorites coworkers.  Every\n"
-"coworker will have their own color in your calendar, and every attendee will\n"
-"have their avatar in the event...\n"
-"\n"
-"Get an email\n"
-"------------\n"
-"\n"
-"You will receive an email at creation of an event where you are attendee, but\n"
-"also when this event is updated for some fields as date start, ...\n"
-"\n"
-"Be notified\n"
-"-----------\n"
-"\n"
-"You can ask to have a alarm of type 'notification' in your Odoo.  You will have\n"
-"a notification in you Odoo which ever the page you are.\n"
-"\n"
-"Google Calendar\n"
-"---------------\n"
-"\n"
-"With this plugin, you can synchronize your Odoo calendar with Google Calendar.\n"
-"\n"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_google_drive
@@ -17764,17 +17629,17 @@ msgstr ""
 "-----------------\n"
 "\n"
 "Verstuur eenvoudig bulk-mailing naar uw leads, prospects of klanten\n"
-"met Odoo Mass-mailing. spoor\n"
+"met Odoo Mass-mailing. Volg\n"
 "prestaties van marketingcampagnes om de conversieratio's te verbeteren. Ontwerp\n"
 "professionele e-mails en hergebruik sjablonen in een paar klikken.\n"
 "\n"
 "Stuur professionele e-mails\n"
 "------------------------\n"
 "\n"
-"Importeer een database van prospects of filter op bestaande leads, opportunities en\n"
+"Importeer een database van prospects of filter op bestaande leads, opportuniteiten en\n"
 "klanten in slechts een paar klikken.\n"
 "\n"
-"Definieer e-mailsjablonen om inhoud of specifiek ontwerp voor uw nieuwsbrief te hergebruiken.\n"
+"Definieer e-mailsjablonen om inhoud of een specifiek ontwerp voor uw nieuwsbrief te hergebruiken.\n"
 "Stel verschillende e-mailservers in met hun eigen IP / domein om de openingspercentages te optimaliseren.\n"
 "\n"
 "Organiseer marketingcampagnes\n"
@@ -17782,8 +17647,7 @@ msgstr ""
 "\n"
 "Ontwerp, verzend, volg met campagnes met onze app Lead Automation.\n"
 "\n"
-"Ontvang realtime statistieken over de prestaties van campagnes om uw conversie te verbeteren\n"
-"rate. Volgen van mails verzonden, ontvangen, geopend en beantwoord.\n"
+"Ontvang realtime statistieken over de prestaties van campagnes om uw conversie te verbeteren. Volg de mailstatus op: verzonden, ontvangen, geopend en beantwoord.\n"
 "\n"
 "Beheer eenvoudig uw marketingcampagnes, discussiegroepen, leads en\n"
 "mogelijkheden in een eenvoudig en krachtig platform.\n"
@@ -17802,18 +17666,18 @@ msgstr ""
 "Antwoorden op uw e-mails verschijnen automatisch in de geschiedenis van elk document\n"
 "met de sociale netwerkmodule.\n"
 "\n"
-"Reinig uw leaddatabase\n"
+"Schoon uw lead database op\n"
 "------------------------\n"
 "\n"
 "Krijg een schone lead-database die in de loop van de tijd verbetert met de prestaties van\n"
-"uw mails. Odoo verwerkt bounce mails efficiënt, markeer foutieve leads\n"
+"uw mails. Odoo verwerkt bounce mails efficiënt, markeert foutieve leads\n"
 "en geeft je statistieken over de kwaliteit van je leads.\n"
 "\n"
 "E-mailberichten verzenden met één klik\n"
 "---------------------\n"
 "\n"
-"De marketingafdeling zal graag aan campagnes werken. Maar je kunt ook geven\n"
-"een bulk-mailfaciliteit met één klik voor alle andere gebruikers op hun eigen prospects of\n"
+"De marketingafdeling zal graag aan campagnes werken. Maar je kunt ook een\n"
+"bulk-mailfaciliteit opgeven met één klik voor alle andere gebruikers op hun eigen prospects of\n"
 "documenten.\n"
 "\n"
 "Selecteer een paar documenten (bijvoorbeeld leads, supporttickets, leveranciers, aanvragers,\n"
@@ -17824,36 +17688,36 @@ msgstr ""
 "--------------------\n"
 "\n"
 "Met de chatter-functie kunt u sneller en efficiënter communiceren\n"
-"uw klant. Maak documenten automatisch aangemaakt (leads, kansen,\n"
-"taken, ...) op basis van antwoorden op uw bulkmailcampagnes Volg de\n"
+"met uw klant. Maak documenten automatisch aan (leads, kansen,\n"
+"taken, ...) op basis van antwoorden op uw bulkmailcampagnes. Volg en\n"
 "bespreek direct de zakelijke documenten binnen Odoo of via e-mail.\n"
 "\n"
-"Zorg dat alle onderhandelingen en discussies zijn gekoppeld aan het juiste document en\n"
-"relevante managers op de hoogte gebracht van specifieke evenementen.\n"
+"Zorg dat alle onderhandelingen en discussies zijn gekoppeld aan het juiste document zodat\n"
+"relevante managers op de hoogte worden gebracht van specifieke evenementen.\n"
 "\n"
 "Campagnes Dashboard\n"
 "-------------------\n"
 "\n"
 "Krijg de inzichten die u nodig hebt om een ​​slimmere marketingcampagne te maken. Statistieken bijhouden\n"
 "per campagne: bouncepercentages, verzonden e-mails, beste inhoud, etc. De duidelijke dashboards\n"
-"geeft u een direct overzicht van uw campagneprestaties.\n"
+"geven u een direct overzicht van uw campagne prestaties.\n"
 "\n"
 "Volledig geïntegreerd met andere apps\n"
 "---------------------------------\n"
 "\n"
 "Definieer geautomatiseerde acties (vraag bijvoorbeeld aan een verkoper om te bellen, een e-mail te sturen, ...)\n"
-"gebaseerd op triggers (geen activiteit sinds 20 dagen, antwoordde een promotionele e-mail,\n"
+"gebaseerd op triggers (geen activiteit sinds 20 dagen, antwoord op een promotionele e-mail,\n"
 "enz.)\n"
 "\n"
 "Optimaliseer campagnes van lead tot close, op elk kanaal. Maak slimmere beslissingen\n"
 "over waar te beleggen en laat de impact van uw marketingactiviteiten op uw\n"
 "de bedrijfsresultaten van het bedrijf.\n"
 "\n"
-"Integreer eenvoudig een contactformulier in uw website. Formulieren-inzendingen creëren leads\n"
-"automatisch in Odoo CRM. Leads kunnen worden gebruikt in marketingcampagnes.\n"
+"Integreer eenvoudig een contactformulier in uw website. Formulieren-inzendingen creëren automatisch\n"
+"leads in Odoo CRM. Leads kunnen worden gebruikt in marketingcampagnes.\n"
 "\n"
-"Beheer uw verkooptrechter met nee\n"
-"inspanning. Trek leads aan, volg telefoontjes op en ontmoet vergaderingen. Analyseer de\n"
+"Beheer uw verkooptrechter zonder\n"
+"inspanning. Trek leads aan, volg telefoontjes op en plan vergaderingen. Analyseer de\n"
 "kwaliteit van uw leads om weloverwogen beslissingen te nemen en tijd te besparen door integratie\n"
 "e-mails direct in de applicatie.\n"
 
@@ -17939,64 +17803,6 @@ msgid ""
 "The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.\n"
 "\n"
 msgstr ""
-"Odoo Notes\n"
-"----------\n"
-"\n"
-"Organize yourself with efficient <a href=\"https://www.odoo.com/page/notes\">todo lists and notes</a>.\n"
-"From personal tasks to collaborative meeting minutes, increase your user's\n"
-"productivity by giving them the tools to prioritize their work, share their\n"
-"ideas and collaborate on documents.\n"
-"\n"
-"Personal to-do lists that works\n"
-"-------------------------------\n"
-"\n"
-"Quickly create to-dos, organize horizontally for the mid-term (today, this week, this month, ...), prioritize vertically for the short term and group by assigning colors. The kanban approach allows a simple visual organization of your to-dos.\n"
-"\n"
-"### Beat Work Overload\n"
-"\n"
-"Feel how good it is to rely on a structured way to organize your work instead of keeping everything in memory. Use notes to [Get Things Done](http://en.wikipedia.org/wiki/Getting_Things_Done).\n"
-"\n"
-"### Prioritize Efficiently\n"
-"\n"
-"Most people are lost in the flow of urgent daily tasks and have difficulties to work on important, long-term tasks. Notes gives you a simple way to allocate time very day to do important, but less urgent tasks.\n"
-"\n"
-"### Find Motivation to Close Tasks\n"
-"\n"
-"People used to work on tasks they like and not on important tasks. Start feeling good by checking tasks as done.\n"
-"\n"
-"Adapts to Your Creative Process\n"
-"-------------------------------\n"
-"\n"
-"### Customize to your own workflow\n"
-"\n"
-"Everyone has their own way to organize activities. Odoo Notes' smart kanban approach allows every user to customize their own steps to process it's to-dos and notes.\n"
-"\n"
-"### A Creative Person\n"
-"\n"
-"A creative person will organize notes based on idea's maturity level: Draft Ideas ** Mature Ideas ** Specified **To Do\n"
-"\n"
-"### A Frequent Traveler\n"
-"\n"
-"An employee travelling a lot can organize their tasks based on the context to perform the task: U.S. Office | London's Office | To Review during Flights | At Home\n"
-"\n"
-"### A Manager\n"
-"\n"
-"A manager will organize their high number of tasks based on prioritizations: Todo Today | This Week | This Month | Later\n"
-"\n"
-"Personnal Notes\n"
-"---------------\n"
-"\n"
-"### Notes are private but can be shared\n"
-"\n"
-"Write down your ideas in pads, keep your notes at your finger tips, attach related documents and use tags and colors to organize the information. Once your ideas are mature, you can share them to others users, start discussing it and collaborate by improving the specification in the pad.\n"
-"\n"
-"Collaborative Meeting Minutes\n"
-"-----------------------------\n"
-"\n"
-"### Real-time sharing and edition of notes\n"
-"\n"
-"The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.\n"
-"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_point_of_sale
@@ -19325,121 +19131,6 @@ msgid ""
 "\n"
 "Create a great \"About us\" page by presenting your team efficiently.\n"
 msgstr ""
-"Organize Events, Trainings & Webinars\n"
-"-------------------------------------\n"
-"\n"
-"### Schedule, Promote, Sell, Organize\n"
-"\n"
-"Organize, promote and sell events online. Whether you organize meetings, conferences, trainings or webinars, Odoo gives you all the features you need to manage your events.\n"
-"\n"
-"Create Awesome Event Pages\n"
-"--------------------------\n"
-"\n"
-"### Get rid of old WYSIWYG editors\n"
-"\n"
-"Create beautiful event pages by drag & droping well designed *'Building Blocks'*. Publish event photos, speakers, schedule, etc.\n"
-"\n"
-"Odoo's unique *'edit inline'* approach makes website creation surprisingly easy. \"Want to introduce a speaker? to change the price of a ticket? to update a banner? promote sponsors?\" just click and change.\n"
-"\n"
-"Sell Tickets Online\n"
-"-------------------\n"
-"\n"
-"### Automate the registration and payment process\n"
-"\n"
-"Sell registrations to your event with the multi-ticketing feature. Events can be free or for a fee. Attendees can pay online with a credit card or on invoice, based on your configuration.\n"
-"\n"
-"Boost your sales with early-bird prices, special conditions for members, or extra services with multiple tickets.\n"
-"\n"
-"A Clean Google Analytics Integration\n"
-"------------------------------------\n"
-"\n"
-"### Control your sales funnel with Google Analytics\n"
-"\n"
-"Get a clear visibility of your sales funnel. Odoo's Google Analytics trackers are configured by default to track all kind of events related to shopping carts, call-to-actions, etc.\n"
-"\n"
-"As Odoo marketing tools (mass mailing, campaigns, etc) are also linked with Google Analytics, you get a full view of your business.\n"
-"\n"
-"Promote Events Efficiently\n"
-"--------------------------\n"
-"\n"
-"### Mass Mailing & Social Media\n"
-"\n"
-"Use the segmentation, the social network integration and mass mailing features to promote your events to the right audience. Setup automated emails to attendees to send them last minute details.\n"
-"\n"
-"Designer-Friendly Themes\n"
-"------------------------\n"
-"\n"
-"### Designers love working on Odoo\n"
-"\n"
-"Themes are awesome and easy to design. You don't need to develop to create new pages, themes or building blocks. We use a clean HTML structure, a [bootstrap](http://getbootstrap.com/) CSS and our modularity allows to distribute your themes easily.\n"
-"\n"
-"The building block approach allows the website to stay clean after the end-users start creating new contents.\n"
-"\n"
-"Make Your Event More Visible\n"
-"----------------------------\n"
-"\n"
-"### SEO tools at your finger tips\n"
-"\n"
-"SEO tools are ready to use, with no configuration required. Odoo suggests keywords according to Google most searched terms, Google Analytics tracks your shopping cart events and sitemap are created automatically.\n"
-"\n"
-"We even do structured content automatically to promote your events and products efficiently in Google.\n"
-"\n"
-"Leverage Social Media\n"
-"---------------------\n"
-"\n"
-"### Optimize: from Ads to Conversions\n"
-"\n"
-"Create new landing pages easily with the Odoo inline edition feature. Send visitors of your different marketing campaigns to event landing pages to optimize conversions.\n"
-"\n"
-"And Much More...\n"
-"----------------\n"
-"\n"
-"### Schedule\n"
-"\n"
-"-   Calendar of Events\n"
-"-   Publish related documents\n"
-"-   Ressources allocation\n"
-"-   Automate purchases (catering...)\n"
-"-   Multiple locations and organizers\n"
-"-   Mobile Interface\n"
-"\n"
-"### Sell\n"
-"\n"
-"-   Online or offline sales\n"
-"-   Automated invoicing\n"
-"-   Cancellation policies\n"
-"-   Specific prices for members\n"
-"-   Dashboards and reporting\n"
-"\n"
-"### Organize\n"
-"\n"
-"-   Advanced Planification\n"
-"-   Print Badges\n"
-"-   Automate Follow-up Emails\n"
-"-   Min/Max capacities\n"
-"-   Manage classes and ressources\n"
-"-   Create group of attendees\n"
-"-   Automate statisfaction surveys\n"
-"\n"
-"Fully Integrated With Others Apps\n"
-"---------------------------------\n"
-"\n"
-"### Get hundreds of open source apps for free\n"
-"\n"
-"\n"
-"### eCommerce\n"
-"\n"
-"Promote products, sell online, optimize visitors' shopping experiences.\n"
-"\n"
-"\n"
-"### Blogs\n"
-"\n"
-"Write news, attract new visitors, build customer loyalty.\n"
-"\n"
-"\n"
-"### Our Team\n"
-"\n"
-"Create a great \"About us\" page by presenting your team efficiently.\n"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_report_paperformat__orientation
diff --git a/odoo/addons/base/i18n/ro.po b/odoo/addons/base/i18n/ro.po
index 406bf385e0f..5f7f82fd352 100644
--- a/odoo/addons/base/i18n/ro.po
+++ b/odoo/addons/base/i18n/ro.po
@@ -7,8 +7,8 @@
 # Iulian Cutui <iulian.cutui@gmail.com>, 2018
 # Martin Trigaux, 2018
 # Cozmin Candea <office@terrabit.ro>, 2018
-# Dorin Hongu <dhongu@gmail.com>, 2019
 # sharkutz <sharkutz4life@yahoo.com>, 2019
+# Dorin Hongu <dhongu@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-02 10:02+0000\n"
 "PO-Revision-Date: 2016-08-05 12:54+0000\n"
-"Last-Translator: sharkutz <sharkutz4life@yahoo.com>, 2019\n"
+"Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -8405,7 +8405,7 @@ msgstr "Creeaza drept de acces"
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "Create Contextual Action"
-msgstr ""
+msgstr "Creare acțiune contextuală"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_logging__create_date
@@ -8973,7 +8973,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "Data to Write"
-msgstr ""
+msgstr "Date de scris"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.ir_logging_search_view
@@ -11142,7 +11142,7 @@ msgstr "Grilă"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_grid
 msgid "Grid View"
-msgstr ""
+msgstr "Vizualizare tabel"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_access__group_id
@@ -21298,6 +21298,9 @@ msgid ""
 "Write Python code that the action will execute. Some variables are available"
 " for use; help about pyhon expression is given in the help tab."
 msgstr ""
+"Scrieți codul Python pe care acțiunea îl va executa. Unele variabile sunt "
+"disponibile pentru utilizare; ajutorul despre expresia pyhon este dat în "
+"pagina de ajutor."
 
 #. module: base
 #: model:res.country,name:base.ye
diff --git a/odoo/addons/base/i18n/ru.po b/odoo/addons/base/i18n/ru.po
index 4016d1eaab9..93ad4fd285b 100644
--- a/odoo/addons/base/i18n/ru.po
+++ b/odoo/addons/base/i18n/ru.po
@@ -31,6 +31,7 @@
 # Denis Trepalin <zekarious@gmail.com>, 2018
 # Viktor Pogrebniak <vp@aifil.ru>, 2018
 # Русский «kolobok2048» Ивашка <kolobok2048@gmail.com>, 2018
+# Vasiliy Korobatov <korobatov@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -38,7 +39,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-02 10:02+0000\n"
 "PO-Revision-Date: 2016-08-05 12:54+0000\n"
-"Last-Translator: Русский «kolobok2048» Ивашка <kolobok2048@gmail.com>, 2018\n"
+"Last-Translator: Vasiliy Korobatov <korobatov@gmail.com>, 2019\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"
@@ -183,6 +184,73 @@ msgid ""
 "11010101 Caja General\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"Модуль локализации для Доминиканской Республики\n"
+"===========================================\n"
+"\n"
+"Catálogo de Cuentas e Impuestos para República Dominicana, Compatible para\n"
+"**Internacionalización** con **NIIF** y alineado a las normas y regulaciones\n"
+"de la Dirección General de Impuestos Internos (**DGII**).\n"
+"\n"
+"**Este módulo consiste de:**\n"
+"\n"
+"- Catálogo de Cuentas Estándar (alineado a DGII y NIIF)\n"
+"- Catálogo de Impuestos con la mayoría de Impuestos Preconfigurados\n"
+"        - ITBIS para compras y ventas\n"
+"        - Retenciones de ITBIS\n"
+"        - Retenciones de ISR\n"
+"        - Grupos de Impuestos y Retenciones:\n"
+"                - Telecomunicaiones\n"
+"                - Proveedores de Materiales de Construcción\n"
+"                - Personas Físicas Proveedoras de Servicios\n"
+"        - Otros impuestos\n"
+"- Secuencias Preconfiguradas para manejo de todos los NCF\n"
+"        - Facturas con Valor Fiscal (para Ventas)\n"
+"        - Facturas para Consumidores Finales\n"
+"        - Notas de Débito y Crédito\n"
+"        - Registro de Proveedores Informales\n"
+"        - Registro de Ingreso Único\n"
+"        - Registro de Gastos Menores\n"
+"        - Gubernamentales\n"
+"- Posiciones Fiscales para automatización de impuestos y retenciones\n"
+"        - Cambios de Impuestos a Exenciones (Ej. Ventas al Estado)\n"
+"        - Cambios de Impuestos a Retenciones (Ej. Compra Servicios al Exterior)\n"
+"        - Entre otros\n"
+"\n"
+"**Nota:**\n"
+"Esta localización, aunque posee las secuencias para NCF, las mismas no pueden\n"
+"ser utilizadas sin la instalación de módulos de terceros o desarrollo\n"
+"adicional.\n"
+"\n"
+"Estructura de Codificación del Catálogo de Cuentas:\n"
+"===================================================\n"
+"\n"
+"**Un dígito** representa la categoría/tipo de cuenta del del estado financiero.\n"
+"**1** - Activo        **4** - Cuentas de Ingresos y Ganancias\n"
+"**2** - Pasivo        **5** - Costos, Gastos y Pérdidas\n"
+"**3** - Capital       **6** - Cuentas Liquidadoras de Resultados\n"
+"\n"
+"**Dos dígitos** representan los rubros de agrupación:\n"
+"11- Activo Corriente\n"
+"21- Pasivo Corriente\n"
+"31- Capital Contable\n"
+"\n"
+"**Cuatro dígitos** se asignan a las cuentas de mayor: cuentas de primer orden\n"
+"1101- Efectivo y Equivalentes de Efectivo\n"
+"2101- Cuentas y Documentos por pagar\n"
+"3101- Capital Social\n"
+"\n"
+"**Seis dígitos** se asignan a las sub-cuentas: cuentas de segundo orden\n"
+"110101 - Caja\n"
+"210101 - Proveedores locales\n"
+"\n"
+"**Ocho dígitos** son para las cuentas de tercer orden (las visualizadas\n"
+"en Odoo):\n"
+"1101- Efectivo y Equivalentes\n"
+"110101- Caja\n"
+"11010101 Caja General\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_jp
@@ -539,6 +607,11 @@ msgid ""
 "        This module will be auto installed if account module and enterprise edition are present\n"
 "    "
 msgstr ""
+"\n"
+"        Адаптация базового модуля учета для Enterprise Edition.\n"
+"\n"
+"        Данный модуль будет автоматически установлен при наличии модуля учетна и корпоративной версии\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_voip
@@ -592,6 +665,9 @@ msgid ""
 "        Compute sales tax automatically using TaxCloud based on customer address in United States.\n"
 "    "
 msgstr ""
+"\n"
+"        Налог с продаж рассчитывается автоматически с использованием TaxCloud на основании адреса клиента в США.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,summary:base.module_l10n_mx_reports
@@ -620,6 +696,9 @@ msgid ""
 "        Enable the SEPA features in the payments of expenses\n"
 "    "
 msgstr ""
+"\n"
+"        Включите функции SEPA при оплате расходов\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,summary:base.module_l10n_mx_edi_customs
@@ -640,6 +719,12 @@ msgid ""
 "        For more informations about the SEPA standards : http://www.iso20022.org/ and http://www.europeanpaymentscouncil.eu/\n"
 "    "
 msgstr ""
+"\n"
+"        Генерировать платежные поручения в соответствии с рекомендациями стандарта SEPA, благодаря сообщениям pain.001. Поддерживаются следующие болевые варианты (страны): pain.001.001.03 (общий), pain.001.001.03.ch.02 (Швейцария) и pain.001.003.03 (Германия). Сгенерированный XML файл может быть загружен в ваш банк.\n"
+"\n"
+"        Настоящий модуль составлен в соответствии с инструкциями Европейского платежного совета по внедрению.\n"
+"        Для получения более подробной информации о стандартах SEPA : http://www.iso20022.org/ and http://www.europeanpaymentscouncil.eu/\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,summary:base.module_voip
@@ -839,6 +924,10 @@ msgid ""
 "        linked to an SO, or only the validated timesheets\n"
 "    "
 msgstr ""
+"\n"
+"        При составлении табелей учета рабочего времени позволяет выставлять счета либо по всем табелям учета рабочего времени,\n"
+"        привязанным к Заказам продаж, либо только по утвержденным табелям учета рабочего времени.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_multilang
@@ -871,6 +960,8 @@ msgid ""
 "\n"
 "    Adds workcenters to Quality Control\n"
 msgstr ""
+"\n"
+"    Добавляет рабочие центры к системе контроля качества\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_test_documentation_examples
@@ -916,6 +1007,13 @@ msgid ""
 "    * The new lock date for advisors must be set after the previous lock date.\n"
 "    "
 msgstr ""
+"\n"
+"    Сделать дату блокировки необратимой:\n"
+"\n"
+"    * Вы не можете определить более строгие условия на консультантов, чем на пользователей. Затем дата блокировки на консультанте должна быть установлена перед датой блокировки для пользователей.\n"
+"    * Вы не можете заблокировать период, который еще не завершен. Затем, дата блокировки для консультантов должна быть установлена до последнего дня предыдущего месяца.\n"
+"    * Новая дата блокировки для консультантов должна быть установлена после предыдущей даты блокировки.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_attendance
@@ -1459,6 +1557,11 @@ msgid ""
 "\n"
 "* Cost structure report\n"
 msgstr ""
+"\n"
+"Аналитический учет в MRP\n"
+"==========================\n"
+"\n"
+"* Отчет о структуре расходов\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ar
@@ -1576,6 +1679,12 @@ msgid ""
 "GST Reporting for Australian Accounting.\n"
 "    "
 msgstr ""
+"\n"
+"Австралийские бухгалтерские отчеты\n"
+"=============================\n"
+"\n"
+"GST Отчетность по австралийскому бухгалтерскому учету.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_vat_autocomplete
@@ -1746,6 +1855,13 @@ msgid ""
 "When you proceed with the reconciliation, simply select the corresponding batch deposit to reconcile the payments.\n"
 "    "
 msgstr ""
+"\n"
+"Пакетное внесение\n"
+"=============\n"
+"Пакетные депозиты позволяют группировать полученные чеки до их депонирования в банк.\n"
+"Сумма, внесенная в банк, будет отображаться в выписке с банковского счета как единичная транзакция.\n"
+"Когда вы приступите к сверке, просто выберите соответствующий пакетный депозит для сверки платежей.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_hr_payroll
@@ -1788,6 +1904,24 @@ msgid ""
 "No modified version is certified and supported by Odoo SA.\n"
 "    "
 msgstr ""
+"\n"
+"Бельгийская Регистрационная Касса\n"
+"================================\n"
+"\n"
+"Этот модуль превращает модуль Точек продаж в сертифицированный бельгийский кассовый аппарат.\n"
+"\n"
+"Больше информации:\n"
+"  * http://www.systemedecaisseenregistreuse.be/\n"
+"  * http://www.geregistreerdkassasysteem.be/\n"
+"\n"
+"Правовое поле\n"
+"-----\n"
+"**Использование источников pos_blackbox_be сертифицировано только на платформе odoo.com SaaS\n"
+"версии 9.0.**\n"
+"Обфусцированная и сертифицированная версия pos_blackbox_be может быть представлена на странице \n"
+"запросы на локальные установки.\n"
+"Никакая модифицированная версия не сертифицирована и не поддерживается компанией Odoo SA.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_bo
@@ -2180,6 +2314,9 @@ msgid ""
 "Design gorgeous mails\n"
 "    "
 msgstr ""
+"\n"
+"Дизайн великолепных писем\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_de
@@ -2557,6 +2694,14 @@ msgid ""
 "**Configure your API keys from General Setting**\n"
 "    "
 msgstr ""
+"\n"
+"Интеграция с Google Firebase Messaging\n"
+"=====================================\n"
+"Этот модуль позволяет отправлять push-уведомления FCM на зарегистрированные мобильные телефоны\n"
+"для каждого сообщения в чате..\n"
+"\n"
+"**Настройте ключи API из общих настроек**\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_hw_proxy
@@ -2603,6 +2748,24 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Служба поддержки - Приложение для управления тикетами\n"
+"================================\n"
+"\n"
+"Особенности:\n"
+"\n"
+"    - Обработка заявок на различных этапах для их решения.\n"
+"    - Добавление приоритетов, типов, описаний и тегов для определения ваших билетов.\n"
+"    - Использование разговора для передачи дополнительной информации и опроса сотрудников по билетам.\n"
+"    - Наслаждайтесь использованием адаптированной приборной панели и удобным видом на кабан для обработки Ваших билетов.\n"
+"    - Проведите углубленный анализ ваших билетов с помощью поворотного окна в меню отчетов.\n"
+"    - Создание команды и определение ее членов, использование автоматического метода назначения, если хотите.\n"
+"    - Использование почтового псевдонима для автоматического создания билетов и общения с клиентами.\n"
+"    - Автоматическое добавление крайних сроков действия Соглашения об уровне обслуживания к вашим билетам.\n"
+"    - Получение отзывы клиентов, с помощью рейтингов.\n"
+"    - Установка дополнительных функций с помощью командного вида.\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_base_import_module
@@ -2638,6 +2801,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Включая следующие данные в Стандарты бухгалтерского учета для коммерческих предприятий\n"
+"包含企业会计准则以下数据\n"
+"\n"
+"* План счетов\n"
+"* 科目表模板\n"
+"\n"
+"* Шаблоны счетов\n"
+"* 科目模板\n"
+"\n"
+"* Шаблоны налогов\n"
+"* 税金模板\n"
+"\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_in
@@ -2684,6 +2861,18 @@ msgid ""
 "Sheet, now only Vertical format has been permitted Which is Supported By OpenERP.\n"
 "  "
 msgstr ""
+"\n"
+"Индийская бухгалтерия: План счета.\n"
+"====================================\n"
+"\n"
+"Индийская бухгалтерская карта и локализация.\n"
+"\n"
+"Таблица VI плана счетов для индийского бухгалтерского учета.\n"
+"\n"
+"Примечание: Таблица VI была пересмотрена MCA и применима ко всему Балансовому отчету, составленному после\n"
+"31 марта 2011 года. Формат отменил два предыдущих варианта форматирования Баланса\n"
+", теперь разрешен только вертикальный формат, который поддерживается OpenERP.\n"
+"  "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_in_hr_payroll
@@ -2837,6 +3026,14 @@ msgid ""
 "* Equipments related to workcenters\n"
 "* MTBF, MTTR, ...\n"
 msgstr ""
+"\n"
+"Техническое обслуживание в MRP\n"
+"==================\n"
+"* Профилактическое и корректирующее техобслуживание\n"
+"* Определение различных этапов для запросов на техническое обслуживание\n"
+"* Запросы на техническое обслуживание (также повторяющиеся в профилактических целях)\n"
+"* Оборудование, связанное с рабочими центрами\n"
+"* Средняя наработка на отказ, Среднее время до восстановления работоспособности, ...\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_3way_match
@@ -3176,6 +3373,21 @@ msgid ""
 "of recall defined. You can define different policies for different companies. \n"
 "\n"
 msgstr ""
+"\n"
+"Модуль для автоматизации писем по неоплаченным счетам с многоуровневым вызовом.\n"
+"=========================================================================\n"
+"\n"
+"Вы можете определить несколько уровней вызова через меню:\n"
+"---------------------------------------------------------------\n"
+"    Настройка / Отслеживание / Последующие уровни\n"
+"    \n"
+"После того, как он определен, вы можете автоматически распечатывать вызовы каждый день, просто щелкнув по меню:\n"
+"------------------------------------------------------------------------------------------------------\n"
+"    Слежение за платежами / Отправка электронной почты и писем\n"
+"\n"
+"Он будет генерировать PDF / отправить электронную почту / набор ручных действий в соответствии с различными уровнями \n"
+"определённого вызова. Вы можете определить различные политики для разных компаний. \n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_import_camt
@@ -3187,6 +3399,12 @@ msgid ""
 "Improve the import of bank statement feature to support the SEPA recommanded Cash Management format (CAMT.053).\n"
 "    "
 msgstr ""
+"\n"
+"Модуль для импорта CAMT выписок банковских счетов.\n"
+"======================================\n"
+"\n"
+"Усовершенствуйте функцию импорта банковских выписок для поддержки рекомендованного SEPA формата управления денежными средствами (CAMT.053).\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_be_coda
@@ -3238,6 +3456,52 @@ msgid ""
 "V2.2 specifications.\n"
 "If required, you can manually adjust the descriptions via the CODA configuration menu.\n"
 msgstr ""
+"\n"
+"Модуль для импорта CODA выписок банковских счетов.\n"
+"======================================\n"
+"\n"
+"Поддерживаются обычные файлы CODA в формате V2 с банковских счетов Бельгии.\n"
+"----------------------------------------------------------------------\n"
+"    * Поддержка CODA v1.\n"
+"    * Поддержка CODA v2.2.\n"
+"    * Поддержка в иностранной валюте.\n"
+"    * Поддержка всех типов записей данных (0, 1, 2, 3, 4, 8, 9).\n"
+"    * Обработка и регистрация всех кодов транзакций и структурированного формата\n"
+"      связи.\n"
+"    * Автоматическое назначение финансового журнала через параметры конфигурации CODA.\n"
+"    * Поддержка нескольких журналов на номер банковского счета.\n"
+"    * Поддержка нескольких выписок с разных банковских счетов в одном\n"
+"      CODA файле.\n"
+"    * Поддержка для 'только обработка' банковских счетов CODA (определяется как type='info' в\n"
+"      записях конфигурации банковского счета CODA).\n"
+"    * Многоязычный анализ CODA, разбор конфигурационных данных для EN,\n"
+"      NL, FR.\n"
+"\n"
+"Машинно-считываемые файлы CODA анализируются и хранятся в удобочитаемом для человека формате в\n"
+"выписке из банка CODA. Также генерируются выписки банка, содержащие подмножество\n"
+"информация CODA (только те строки транзакции, которые требуются для\n"
+"создание финансовой отчетности). Выписка банка CODA является\n"
+"«только для чтения», следовательно, остается надежным представлением оригинала\n"
+"файла CODA, в то время как банковская выписка будет изменена в соответствии с требованиями бухгалтерского учета\n"
+"бизнес процесса.\n"
+"\n"
+"Счета в банке CODA, настроенные как тип «Информация», будут генерировать только выписки из банка CODA.\n"
+"\n"
+"Удаление одного объекта в обработке CODA приводит к удалению\n"
+"связанных объектов. Удаление файла CODA, содержащего несколько банкских\n"
+"выписок  также удалит эти связанные выписки.\n"
+"\n"
+"Вместо ручной настройки сгенерированных банковских выписок вы также можете\n"
+"повторно импортировать CODA после обновления базы данных OpenERP информацией, которая\n"
+"отсутствовала, чтобы позволить автоматическое согласование.\n"
+"\n"
+"Замечание по поддержке CODA V1:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"В некоторых случаях код транзакции, тип транзакции или структурированный\n"
+"код связи получил новое или более четкое описание в CODA V2.\n"
+"описание, предоставленное таблицами конфигурации CODA, основано на CODA\n"
+"cпецификации V2.2.\n"
+"При необходимости вы можете вручную настроить описания в меню конфигурации CODA.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_import_csv
@@ -3254,6 +3518,17 @@ msgid ""
 "Because of the CSV format limitation, we cannot ensure the same transactions aren't imported several times or handle multicurrency.\n"
 "Whenever possible, you should use a more appropriate file format like OFX.\n"
 msgstr ""
+"\n"
+"Модуль для импорта банковских выписок CSV.\n"
+"======================================\n"
+"\n"
+"Этот модуль позволяет импортировать файлы CSV в Odoo: они анализируются и хранятся в удобочитаемом формате в\n"
+"Бухгалтерский учет \\ Банки и Наличные \\ Банковские выписки.\n"
+"\n"
+"Важное замечание\n"
+"---------------------------------------------\n"
+"Из-за ограничения формата CSV мы не можем гарантировать, что одни и те же транзакции не импортируются несколько раз или не обрабатывают мультивалютность.\n"
+"По возможности, вы должны использовать более подходящий формат файла, такой как OFX.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_import_ofx
@@ -3269,6 +3544,16 @@ msgid ""
 "creation of the Financial Accounting records).\n"
 "    "
 msgstr ""
+"\n"
+"Модуль для импорта банковских выписок OFX.\n"
+"======================================\n"
+"\n"
+"Этот модуль позволяет импортировать машиночитаемые файлы OFX в Odoo: они анализируются и хранятся в удобочитаемом формате в\n"
+"Бухгалтерский учет \\ Банки и Наличные \\ Банковские выписки.\n"
+"\n"
+"Можно генерировать банковские выписки, содержащие подмножество информации OFX (только те строки транзакций, которые требуются для\n"
+"создания финансовой отчетности).\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_bank_statement_import_qif
@@ -3285,6 +3570,17 @@ msgid ""
 "Because of the QIF format limitation, we cannot ensure the same transactions aren't imported several times or handle multicurrency.\n"
 "Whenever possible, you should use a more appropriate file format like OFX.\n"
 msgstr ""
+"\n"
+"Модуль для импорта банковских выписок QIF.\n"
+"======================================\n"
+"\n"
+"Этот модуль позволяет импортировать машиночитаемые файлы QIF в Odoo: они анализируются и хранятся в удобочитаемом формате в\n"
+"Бухгалтерский учет \\ Банки и Наличные \\ Банковские выписки.\n"
+"\n"
+"Важное замечание\n"
+"---------------------------------------------\n"
+"Из-за ограничения формата QIF мы не можем гарантировать, что одни и те же транзакции не импортируются несколько раз и не обрабатывают мультивалютность.\n"
+"По возможности, вы должны использовать более подходящий формат файла, такой как OFX.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_voip_onsip
@@ -3428,6 +3724,12 @@ msgid ""
 "This module modifies the web addon to provide Enterprise design and responsiveness.\n"
 "        "
 msgstr ""
+"\n"
+"Веб-клиент Odoo Enterprise.\n"
+"===========================\n"
+"\n"
+"Этот модуль модифицирует веб-аддон для обеспечения корпоративного дизайна и отзывчивости.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_form_editor
@@ -3439,6 +3741,12 @@ msgid ""
 "Allows you to build web forms on the website using the website builder.\n"
 "        "
 msgstr ""
+"\n"
+"Редактор форм Odoo\n"
+"====================\n"
+"\n"
+"Позволяет создавать веб-формы на сайте с помощью конструктора сайтов.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_mail_channel
@@ -3659,6 +3967,9 @@ msgid ""
 "Override community website features\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"Override community website features    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_pa
@@ -3808,6 +4119,13 @@ msgid ""
 "* Different approval flows possible depending on the type of change order\n"
 "\n"
 msgstr ""
+"\n"
+"Управление жизненным циклом продукта\n"
+"=======================\n"
+"\n"
+"* Версия спецификации материалов и маршрутизации\n"
+"* Возможны разные потоки утверждений в зависимости от типа заказа на изменение\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_http_routing
@@ -3970,6 +4288,13 @@ msgid ""
 "installed screen. This module then displays this HTML using a web\n"
 "browser.\n"
 msgstr ""
+"\n"
+"Драйвер экрана\n"
+"=============\n"
+"\n"
+"Этот модуль позволяет клиенту POS удаленно отправлять визуализированный HTML-код\n"
+"на установленный экран. Этот модуль затем отображает этот HTML с помощью веб-\n"
+"браузера.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_sale_digital
@@ -4057,6 +4382,11 @@ msgid ""
 "Let your customers follow the signature process easily.\n"
 "    "
 msgstr ""
+"\n"
+"Подпишите и заполните ваши документы легко. Настройте свои документы с полями текста и подписи и отправьте их своим получателям.\n"
+"\n"
+"Пусть ваши клиенты легко следят за процессом подписи.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_sg
@@ -4105,6 +4435,17 @@ msgid ""
 "\n"
 "Note: Only the admin user is allowed to make those customizations.\n"
 msgstr ""
+"\n"
+"Studio - настройка Odoo\n"
+"=======================\n"
+"\n"
+"Это дополнение позволяет пользователю настраивать большинство элементов пользовательского интерфейса в\n"
+"простом и графическом способе. Он имеет две основные функции:\n"
+"\n"
+"* создать новое приложение (добавить модуль, пункт меню верхнего уровня и действие по умолчанию)\n"
+"*  настроить существующее приложение (редактировать меню, действия, представления, переводы, ...)\n"
+"\n"
+"Примечание. Только пользователь с правами администратора может выполнять эти настройки.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_studio
@@ -4174,6 +4515,11 @@ msgid ""
 "\n"
 "Yodlee interface.\n"
 msgstr ""
+"\n"
+"Синхронизируйте ваши банковские каналы с Yodlee\n"
+"================================\n"
+"\n"
+"Yodlee интерфейс.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_project_timesheet_synchro
@@ -4341,6 +4687,21 @@ msgid ""
 "\n"
 "    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 msgstr ""
+"\n"
+"Это дополнение соответствует техническим требованиям французского регламента CGI. 286, I. 3° bis, который устанавливает определенные критерии, касающиеся неизменности, безопасности, хранения и архивирования данных, связанных с продажей частным лицам  (B2C).\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"Установите его, если вы используете приложение \"Точка продаж\" для продажи физическим лицам.\n"
+"\n"
+"Модуль добавляет следующие возможности:\n"
+"\n"
+"    Неизменность: деактивация всех способов отмены или изменения ключевых данных POS-заказов, счетов-фактур и записей в журнале.\n"
+"\n"
+"     Безопасность: алгоритм цепочки для проверки неизменяемости\n"
+"\n"
+"    Хранение: автоматическое завершение продаж с расчетом как за период, так и суммарно (ежедневно, ежемесячно, ежегодно)\n"
+"\n"
+"    Доступ для загрузки обязательного сертификата соответствия, предоставляемого компанией Odoo SA (только для пользователей Odoo Enterprise)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_fr_certification
@@ -4359,6 +4720,19 @@ msgid ""
 "\n"
 "    Access to download the mandatory Certificate of Conformity delivered by Odoo SA (only for Odoo Enterprise users)\n"
 msgstr ""
+"\n"
+"Это дополнение вводит технические требования французского правила CGI, статья 286, I. 3° bis, которое устанавливает определенные критерии, касающиеся неизменяемости, безопасности, хранения и архивирования данных, связанных с продажей частным лицам (B2C).\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"Модуль добавляет следующие возможности:\n"
+"\n"
+"    Неизменность: отключение всех способов отмены или изменения ключевых данных, счетов-фактур и записей в журнале\n"
+"\n"
+"    Безопасность: алгоритм цепочки для проверки неизменяемости\n"
+"\n"
+"    Хранение: автоматическое завершение продаж с расчетом как за период, так и суммарно (ежедневно, ежемесячно, ежегодно)\n"
+"\n"
+"    Доступ для загрузки обязательного сертификата соответствия, предоставляемого компанией Odoo SA (только для пользователей Odoo Enterprise)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_pos_cache
@@ -4866,6 +5240,16 @@ msgid ""
 "    - General Solutions.\n"
 "    - Trobz\n"
 msgstr ""
+"\n"
+"Это модуль для управления бухгалтерской отчетностью Вьетнама в Odoo.\n"
+"=========================================================================\n"
+"\n"
+"Данный модуль применим к компаниям, работающим на базе Вьетнамского стандарта бухгалтерского учета (VAS)\n"
+"с Планом счетов в соответствии с Циркуляром No. 200/2014/TT-BTC\n"
+"\n"
+"**Credits:**\n"
+"    - General Solutions.\n"
+"    - Trobz\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_vn_reports
@@ -4878,6 +5262,13 @@ msgid ""
 "\n"
 "**Credits:** General Solutions.\n"
 msgstr ""
+"\n"
+"Это модуль для управления бухгалтерскими отчетнами Вьетнама в Odoo.\n"
+"=========================================================================\n"
+"\n"
+"Данный модуль применим к компаниям, работающим на базе Вьетнамского стандарта бухгалтерского учета (VAS).\n"
+"\n"
+"**Credits:** General Solutions.\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_pad_project
@@ -4934,6 +5325,14 @@ msgid ""
 "    Storage: automatic sales closings with computation of both period and cumulative totals (daily, monthly, annually)\n"
 "\n"
 msgstr ""
+"\n"
+"Этот модуль добавляет поддержку автоматического закрытия продаж с расчетом как периодов, так и кумулятивных итогов (ежедневно, ежемесячно, ежегодно)\n"
+"-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------\n"
+"\n"
+"Модуль добавляет следующие возможности:\n"
+"\n"
+"    Хранение: автоматическое завершение продаж с расчетом как за период, так и суммарно (ежедневно, ежемесячно, ежегодно)\n"
+"\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_event_barcode
@@ -4944,6 +5343,11 @@ msgid ""
 "the registration is confirmed.\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль добавляет поддержку сканирования штрихкодов в систему управления событиями.\n"
+"Штрих-код генерируется для каждого участника и печатается на бейдже. При сканировании,\n"
+"регистрация подтверждается.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_margin
@@ -5030,6 +5434,17 @@ msgid ""
 "- Check on bottom: ADP standard\n"
 "    "
 msgstr ""
+"\n"
+"Данный модуль позволяет распечатывать платежи на предварительно распечатанной чековой бумаге.\n"
+"В настройках компании можно настроить выходные данные (макет, информацию о заглушках и т.д.) и управлять\n"
+"проверкой нумерации (если вы используете предварительно распечатанные чеки без цифр) в настройках журнала.\n"
+"\n"
+"Поддерживаемые форматы\n"
+"-----------------\n"
+"- Проверьте сверху : Quicken / QuickBooks стандарт\n"
+"- Проверь посередине: стандарт Peachtree\n"
+"- Проверь снизу: стандарт ADP\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_ca_check_printing
@@ -5175,6 +5590,10 @@ msgid ""
 "======================================================================================\n"
 "    "
 msgstr ""
+"\n"
+"Этот модуль позволяет отправлять документы по почте, благодаря Docsaway.\n"
+"======================================================================================\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_subscription_asset
@@ -5360,6 +5779,13 @@ msgid ""
 "from purchase order.\n"
 "    "
 msgstr ""
+"\n"
+"Данный модуль предоставляет пользователю возможность установки модулей mrp и закупок одновременно.\n"
+"========================================================================================\n"
+"\n"
+"В основном он используется, когда мы хотим отслеживать заказы на производство, созданные\n"
+"из заказа на закупку.\n"
+"    "
 
 #. module: base
 #: model:ir.module.module,description:base.module_sale_mrp
@@ -6796,7 +7222,7 @@ msgstr "Токен доступа"
 #: model:ir.model.fields,field_description:base.field_res_users__has_group_private_addresses
 #: model:res.groups,name:base.group_private_addresses
 msgid "Access to Private Addresses"
-msgstr ""
+msgstr "Доступ к частным адресам"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_analytic_default
@@ -6846,17 +7272,17 @@ msgstr "Номер счета должен быть уникальным"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_taxcloud
 msgid "Account TaxCloud"
-msgstr ""
+msgstr "Учет TaxCloud"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_sale_account_taxcloud
 msgid "Account TaxCloud - Ecommerce"
-msgstr ""
+msgstr "Учет TaxCloud - Ecommerce"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_account_taxcloud
 msgid "Account TaxCloud - Sale"
-msgstr ""
+msgstr "Учет TaxCloud - Sale"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_payment
@@ -8086,7 +8512,7 @@ msgstr "Base: авто-очистка внутренних данных"
 #. module: base
 #: model:ir.module.module,summary:base.module_web_grid
 msgid "Basic 2D Grid view for odoo"
-msgstr ""
+msgstr "Базовый 2D-просмотр сетки для odoo"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_web_cohort
@@ -8138,7 +8564,7 @@ msgstr "Бельгийская Интрастатская декларация"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_pos_blackbox_be
 msgid "Belgian Registered Cash Register"
-msgstr ""
+msgstr "Бельгийский зарегистрированный кассовый аппарат"
 
 #. module: base
 #: model:res.country,name:base.be
@@ -8153,7 +8579,7 @@ msgstr "Бельгия - отчеты"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_reports
 msgid "Belgium - Accounting Reports"
-msgstr ""
+msgstr "Бельгия - Бухгалтерские отчеты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_be_coda
@@ -8203,7 +8629,7 @@ msgstr "Бутан"
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp_plm
 msgid "Bill of Materials, Routings, Versions, Engineering Change Orders"
-msgstr ""
+msgstr "Спецификация, Маршруты, Версии, Заказы на инженерные изменения"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -8258,7 +8684,7 @@ msgstr "Боливия - Бухгалтерский учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_bo_reports
 msgid "Bolivia - Accounting Reports"
-msgstr ""
+msgstr "Боливия - Бухгалтерские отчеты"
 
 #. module: base
 #: model:res.country,name:base.bq
@@ -8313,7 +8739,7 @@ msgstr "Бразилия - учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_br_reports
 msgid "Brazilian - Accounting Reports"
-msgstr ""
+msgstr "Бразилия - Бухгалтерские отчеты"
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_payment
@@ -8324,7 +8750,7 @@ msgstr "Модуль моста между покупателем и веб-са
 #: model:ir.module.module,description:base.module_website_helpdesk
 #: model:ir.module.module,summary:base.module_website_helpdesk
 msgid "Bridge module for helpdesk modules using the website."
-msgstr ""
+msgstr "Модуль моста для модулей службы поддержки с использованием веб-сайта."
 
 #. module: base
 #: model:res.country,name:base.io
@@ -8913,7 +9339,7 @@ msgstr "Колумбийский учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_co_reports
 msgid "Colombian - Accounting Reports"
-msgstr ""
+msgstr "Колумбия - Бухгалтерские отчеты"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_co
@@ -9104,7 +9530,7 @@ msgstr "Вычислить"
 #. module: base
 #: model:ir.module.module,summary:base.module_website_sale_taxcloud_delivery
 msgid "Compute taxes with TaxCloud after online delivery computation."
-msgstr ""
+msgstr "Рассчет налогов с TaxCloud после онлайн расчета доставки."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -10919,7 +11345,7 @@ msgstr "Эфиопия - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_et_reports
 msgid "Ethiopia - Accounting Reports"
-msgstr ""
+msgstr "Эфиопия - Бухгалтерские отчеты"
 
 #. module: base
 #: model:res.country.group,name:base.europe
@@ -11091,12 +11517,12 @@ msgstr "Экспорт переводов"
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense_sepa
 msgid "Export expenses payments as SEPA Credit Transfer files"
-msgstr ""
+msgstr "Экспорт расходов платежей в виде файлов кредитных переводов SEPA"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_sepa
 msgid "Export payments as SEPA Credit Transfer files"
-msgstr ""
+msgstr "Экспорт платежей в виде файлов кредитных переводов SEPA"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_server_object_lines__value
@@ -11678,7 +12104,7 @@ msgstr "Финляндия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mail_push
 msgid "Firebase Cloud Messaging"
-msgstr ""
+msgstr "Обмен сообщениями Firebase Cloud"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_lang__week_start
@@ -11847,18 +12273,23 @@ msgstr "Франция - FEC"
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_certification
 msgid "France - VAT Anti-Fraud Certification (CGI 286 I-3 bis)"
 msgstr ""
+"Франция - Сертификация НДС по борьбе с мошенничеством (CGI 286 I-3 bis)"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_sale_closing
 msgid ""
 "France - VAT Anti-Fraud Certification (CGI 286 I-3 bis) - Sale Closings"
 msgstr ""
+"Франция - Сертификация НДС по борьбе с мошенничеством (CGI 286 I-3 bis) - "
+"Закрытие Продаж"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_fr_pos_cert
 msgid ""
 "France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis)"
 msgstr ""
+"Франция - Сертификация НДС по борьбе с мошенничеством для пункта продажи "
+"(CGI 286 I-3 bis)"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -12722,7 +13153,7 @@ msgstr "Венгерский учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_hu_reports
 msgid "Hungarian - Accounting Reports"
-msgstr ""
+msgstr "Венгерия - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:res.country,name:base.hu
@@ -13115,6 +13546,8 @@ msgid ""
 "Implements the registered cash system, adhering to guidelines by FPS "
 "Finance."
 msgstr ""
+"Внедряет зарегистрированную кассовую систему, следуя инструкциям FPS "
+"Finance."
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -13124,12 +13557,12 @@ msgstr "Импорт / экспорт"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_import_camt
 msgid "Import CAMT Bank Statement"
-msgstr ""
+msgstr "Импорт CAMT Банковской Выписки"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_import_csv
 msgid "Import CSV Bank Statement"
-msgstr ""
+msgstr "Импорт CSV Банковской Выписки"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_bank_statement_import_ofx
@@ -13199,7 +13632,7 @@ msgstr "Индия - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_reports
 msgid "Indian - Accounting Reports"
-msgstr ""
+msgstr "Индия - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_purchase
@@ -13214,7 +13647,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_schedule6
 msgid "Indian - Schedule VI Accounting"
-msgstr ""
+msgstr "Индия - Таблица VI Бухгалтерский учет"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_in_stock
@@ -13638,7 +14071,7 @@ msgstr "Ирландия"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_lock
 msgid "Irreversible Lock Date"
-msgstr ""
+msgstr "Необратимая дата блокировки"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_is_company
@@ -13711,7 +14144,7 @@ msgstr "Япония - бухгалтерский учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_jp_reports
 msgid "Japan - Accounting Reports"
-msgstr ""
+msgstr "Япония - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:res.country,name:base.je
@@ -13803,7 +14236,7 @@ msgstr "Кирибати"
 #. module: base
 #: model:ir.module.module,summary:base.module_website_helpdesk_forum
 msgid "Knowledge base for helpdesk based on Odoo Forum"
-msgstr ""
+msgstr "База знаний для службы поддержки на базе форума Odoo"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_si
@@ -14179,7 +14612,7 @@ msgstr "Автоматизация лидов"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_crm_score
 msgid "Lead Scoring"
-msgstr ""
+msgstr "Лид-скоринг"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_crm_project
@@ -14476,7 +14909,7 @@ msgstr "Люксембург - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_lu_reports
 msgid "Luxembourg - Accounting Reports"
-msgstr ""
+msgstr "Люксембург - Бухгалтерские отчеты"
 
 #. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_M
@@ -14492,7 +14925,7 @@ msgstr "MRP Субпродукты"
 #: model:ir.module.module,shortdesc:base.module_quality_mrp
 #: model:ir.module.module,shortdesc:base.module_quality_mrp_workorder
 msgid "MRP features for Quality Control"
-msgstr ""
+msgstr "Функции MRP для контроля качества"
 
 #. module: base
 #: model:res.country,name:base.mo
@@ -14579,7 +15012,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_maintenance
 msgid "Maintenance - MRP"
-msgstr ""
+msgstr "Техническое обслуживание - MRP"
 
 #. module: base
 #: model:res.country,name:base.mw
@@ -14779,7 +15212,7 @@ msgstr "Марокко - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ma_reports
 msgid "Maroc - Accounting Reports"
-msgstr ""
+msgstr "Марокко - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:res.country,name:base.mh
@@ -15037,7 +15470,7 @@ msgstr "Отсутствует требуемое значение для пол
 #: code:addons/base/models/ir_ui_view.py:386
 #, python-format
 msgid "Missing view architecture."
-msgstr ""
+msgstr "Отсутствует архитектура вида."
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_mister
@@ -15079,7 +15512,7 @@ msgstr "Модель"
 #: code:addons/base/models/ir_model.py:489
 #, python-format
 msgid "Model %s does not exist"
-msgstr ""
+msgstr "Модель %s не существует"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:643
@@ -15235,6 +15668,8 @@ msgid ""
 "Module loading %s failed: file %s could not be processed:\n"
 " %s"
 msgstr ""
+"Не удалось загрузить модуль %s: файл %s не может быть обработан:\n"
+" %s"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_translation__module
@@ -15310,7 +15745,7 @@ msgstr "Г-н"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_workorder
 msgid "Mrp Workorder"
-msgstr ""
+msgstr "MRP Порядок Работы"
 
 #. module: base
 #: model:res.partner.title,shortcut:base.res_partner_title_madam
@@ -15426,7 +15861,7 @@ msgstr "Нидерланды - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_nl_reports
 msgid "Netherlands - Accounting Reports"
-msgstr ""
+msgstr "Нидерланды - Бухгалтерские отчёты"
 
 #. module: base
 #: model:res.country,name:base.nc
@@ -15643,7 +16078,7 @@ msgstr "Норвегия - план счетов"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_no_reports
 msgid "Norway - Accounting Reports"
-msgstr ""
+msgstr "Норвегия - Бухгалтерские Отчёты"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -16292,7 +16727,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_web_mobile
 msgid "Odoo Mobile Core module"
-msgstr ""
+msgstr "Модуль Odoo Mobile Core"
 
 #. module: base
 #: model:ir.module.module,description:base.module_note
@@ -17808,7 +18243,7 @@ msgstr ""
 #: code:addons/base/models/ir_model.py:490
 #, python-format
 msgid "Please specify a valid model for the object relation"
-msgstr ""
+msgstr "Пожалуйста, укажите действительную модель для отношения объекта"
 
 #. module: base
 #: code:addons/base/models/res_users.py:320
@@ -17948,32 +18383,32 @@ msgstr "Печать Счета-фактуры"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_print_docsaway
 msgid "Print Provider : DocsAway"
-msgstr ""
+msgstr "Провайдер печати : DocsAway"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_print_sale
 msgid "Print Sale"
-msgstr ""
+msgstr "Печать продажи"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_l10n_us_check_printing
 msgid "Print US Checks"
-msgstr ""
+msgstr "Печать американских чеков"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_expense_check
 msgid "Print amount in words on checks issued for expenses"
-msgstr ""
+msgstr "Печатать сумму для расходов в словесном виде"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_print_docsaway
 msgid "Print and Send Invoices with DocsAway.com"
-msgstr ""
+msgstr "Печать и отправка счетов с помощью DocsAway.com"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_print
 msgid "Print and Send Provider Base Module"
-msgstr ""
+msgstr "Базовый модуль поставщика услуг печати и отправки документов"
 
 #. module: base
 #: model:ir.module.module,description:base.module_print
@@ -17981,6 +18416,9 @@ msgid ""
 "Print and Send Provider Base Module. Print and send your invoice with a "
 "Postal Provider. This required to install a module implementing a provider."
 msgstr ""
+"Базовый модуль поставщика услуг печати и отправки. Распечатайте и отправьте "
+"счет почтовому провайдеру. Это необходимо для установки модуля, реализующего"
+" провайдера."
 
 #. module: base
 #: model:ir.module.module,summary:base.module_print_sale
@@ -18011,7 +18449,7 @@ msgstr "Личный адрес"
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_partner_view_form_private
 msgid "Private Address Form"
-msgstr ""
+msgstr "Форма частного адреса"
 
 #. module: base
 #: code:addons/models.py:113
@@ -18203,7 +18641,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_hw_screen
 msgid "Provides support for customer facing displays"
-msgstr ""
+msgstr "Обеспечивает поддержку дисплеев, обращенных к клиенту"
 
 #. module: base
 #: model:res.groups,name:base.group_public
@@ -18298,7 +18736,7 @@ msgstr "Закупки"
 #. module: base
 #: model:ir.module.module,summary:base.module_mail_push
 msgid "Push notification for mobile app"
-msgstr ""
+msgstr "Push-уведомление для мобильного приложения"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_actions_server__code
@@ -18335,7 +18773,7 @@ msgstr "Катар"
 #. module: base
 #: model:ir.module.module,summary:base.module_quality_control
 msgid "Quality Alerts and Control Points"
-msgstr ""
+msgstr "Оповещения о качестве и контрольные точки"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_quality
@@ -18351,7 +18789,7 @@ msgstr "Контроль качества"
 #: model:ir.module.module,summary:base.module_quality_mrp
 #: model:ir.module.module,summary:base.module_quality_mrp_workorder
 msgid "Quality Management with MRP"
-msgstr ""
+msgstr "Управление качеством с MRP"
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_event_questions
@@ -18780,7 +19218,7 @@ msgstr "Румыния - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ro_reports
 msgid "Romania - Accounting Reports"
-msgstr ""
+msgstr "Румыния - Бухгалтерские отчеты"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_currency__rounding
@@ -18847,7 +19285,7 @@ msgstr "SEPA кредитный перевод"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_hr_expense_sepa
 msgid "SEPA Credit Transfer in Expenses"
-msgstr ""
+msgstr "SEPA кредитный перевод в расходах"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sepa_direct_debit
@@ -18991,7 +19429,7 @@ msgstr "Табели продаж"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_timesheet_grid_sale
 msgid "Sales Timesheet: Grid Support"
-msgstr ""
+msgstr "Продажи Табель учета рабочего времени: Поддержка cетки"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
@@ -19070,7 +19508,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp_maintenance
 msgid "Schedule and manage maintenance on machine and tools."
-msgstr ""
+msgstr "Запланировать и управлять обслуживанием станка и инструментов."
 
 #. module: base
 #: model:ir.module.module,summary:base.module_project_timesheet_holidays
@@ -19175,7 +19613,7 @@ msgstr "Смотреть все возможные значения"
 #: code:addons/common.py:42
 #, python-format
 msgid "See http://openerp.com"
-msgstr ""
+msgstr "См. http://openerp.com"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_report_paperformat__format
@@ -19293,6 +19731,8 @@ msgstr ""
 msgid ""
 "Send documents to sign online, receive and archive filled copies (esign)"
 msgstr ""
+"Отправлять документы для подписи онлайн, получать и архивировать заполненные"
+" копии (электронная подпись)"
 
 #. module: base
 #: model:ir.module.module,description:base.module_calendar_sms
@@ -19308,22 +19748,22 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,description:base.module_delivery_dhl
 msgid "Send your shippings through DHL and track them online"
-msgstr ""
+msgstr "Отправляйте свои посылки через DHL и отслеживайте их онлайн"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery_fedex
 msgid "Send your shippings through Fedex and track them online"
-msgstr ""
+msgstr "Отправляйте свои посылки через Fedex и отслеживайте их онлайн"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery_ups
 msgid "Send your shippings through UPS and track them online"
-msgstr ""
+msgstr "Отправляйте свои посылки через UPS и отслеживайте их онлайн"
 
 #. module: base
 #: model:ir.module.module,description:base.module_delivery_usps
 msgid "Send your shippings through USPS and track them online"
-msgstr ""
+msgstr "Отправляйте свои посылки через USPS и отслеживайте их онлайн"
 
 #. module: base
 #: model:res.country,name:base.sn
@@ -19550,7 +19990,7 @@ msgstr "Сингапур - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_sg_reports
 msgid "Singapore - Accounting Reports"
-msgstr ""
+msgstr "Сингапур - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:res.country,name:base.sx
@@ -19600,7 +20040,7 @@ msgstr "Словения - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_si_reports
 msgid "Slovenian - Accounting Reports"
-msgstr ""
+msgstr "Словения - Бухгалтерские отчеты"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_partner__image_small
@@ -19730,7 +20170,7 @@ msgstr "Испания - Бухгалтерский учет (PGCE 2008)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_es_reports
 msgid "Spain - Accounting (PGCE 2008) Reports"
-msgstr ""
+msgstr "Испания - Бухгалтерский учет (PGCE 2008) отчеты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_base_sparse_field
@@ -19854,12 +20294,12 @@ msgstr "Запасы"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_stock_barcode_mobile
 msgid "Stock Barcode in Mobile"
-msgstr ""
+msgstr "Cкладские штрих-код в мобильном устройстве"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_stock_barcode_mobile
 msgid "Stock Barcode scan in Mobile"
-msgstr ""
+msgstr "Сканирование cкладских штрих-кода в мобильном устройстве"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_fields__store
@@ -20017,7 +20457,7 @@ msgstr "Швейцария - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_ch_reports
 msgid "Switzerland - Accounting Reports"
-msgstr ""
+msgstr "Швейцария - Бухгалтерские отчёты"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_currency__symbol
@@ -20152,12 +20592,14 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_sale_taxcloud_delivery
 msgid "TaxCloud and Delivery - Ecommerce"
-msgstr ""
+msgstr "TaxCloud и Доставка - Электронная коммерция"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_account_taxcloud
 msgid "TaxCloud make it easy for business to comply with sales tax law"
 msgstr ""
+"TaxCloud упрощает соблюдение налогового законодательства по налогу с продаж "
+"для бизнеса"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_hr
@@ -20277,13 +20719,15 @@ msgstr "Таиланд - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_th_reports
 msgid "Thailand - Accounting Reports"
-msgstr ""
+msgstr "Таиланд - Бухгалтерские отчёты"
 
 #. module: base
 #: code:addons/base/models/res_users.py:360
 #, python-format
 msgid "The \"App Switcher\" action cannot be selected as home action."
 msgstr ""
+"Действие \"App Switcher\" не может быть выбрано в качестве домашнего "
+"действия."
 
 #. module: base
 #: model:ir.model.fields,help:base.field_res_country__code
@@ -20596,6 +21040,9 @@ msgid ""
 "- deletion: you may be trying to delete a record while other records still reference it\n"
 "- creation/update: a mandatory field is not correctly set"
 msgstr ""
+"Операция не может быть завершена, вероятно, по следующим причинам:\n"
+"- удаление: возможно, вы пытаетесь удалить запись, в то время как другие записи все еще ссылаются на нее\n"
+"- создание/обновление: обязательное поле задано неправильно"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_model_fields__domain
@@ -20884,6 +21331,8 @@ msgid ""
 "This module ensures that when delivery price is computed online, and taxes are computed with TaxCloud, the tax computation is done correctly on both the order and delivery.\n"
 "    "
 msgstr ""
+"Этот модуль гарантирует, что когда цена доставки рассчитывается онлайн, а налоги вычисляются с помощью TaxCloud, расчет налога выполняется правильно как для заказа, так и для доставки.\n"
+"    "
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade
@@ -20913,17 +21362,17 @@ msgstr "Четверг"
 #. module: base
 #: model:ir.module.module,summary:base.module_helpdesk
 msgid "Ticketing, Support, Issues"
-msgstr ""
+msgstr "Билеты, Поддержка, Задачи"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_website_helpdesk_livechat
 msgid "Ticketing, Support, Livechat"
-msgstr ""
+msgstr "Билеты, Поддержка, Живой чат"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_website_helpdesk_slides
 msgid "Ticketing, Support, Slides"
-msgstr ""
+msgstr "Билеты, Поддержка, Слайды"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_res_lang__time_format
@@ -21320,7 +21769,7 @@ msgstr "Великобритания - Учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uk_reports
 msgid "UK - Accounting Reports"
-msgstr ""
+msgstr "Великобритания - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_delivery_ups
@@ -21330,7 +21779,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery_ups
 msgid "UPS Shipping"
-msgstr ""
+msgstr "Доставка UPS"
 
 #. module: base
 #: selection:ir.attachment,type:0
@@ -21468,7 +21917,7 @@ msgstr "Соединенные Штаты Америки - Бухгалтерс
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_delivery_usps
 msgid "United States Postal Service (USPS) Shipping"
-msgstr ""
+msgstr "Почтовая служба США (USPS) Доставка"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_uom
@@ -21525,6 +21974,7 @@ msgstr ""
 msgid ""
 "Unrecognized extension: must be one of .csv, .po, or .tgz (received .%s)."
 msgstr ""
+"Неразрешенное расширение: должно быть .csv, .po, or .tgz (получено .%s)."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_translation_search
@@ -21610,7 +22060,7 @@ msgstr "Уругвай"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uy_reports
 msgid "Uruguay - Accounts Reports"
-msgstr ""
+msgstr "Уругвай - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_uy
@@ -21976,7 +22426,7 @@ msgstr "Вьетнам - Бухгалтерский учет"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_vn_reports
 msgid "Vietnam - Accounting Reports"
-msgstr ""
+msgstr "Вьетнам - Бухгалтерские Отчёты"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_actions_act_window_view__view_id
@@ -22177,7 +22627,7 @@ msgstr "Редактор веб-страниц"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_enterprise
 msgid "Web Enterprise"
-msgstr ""
+msgstr "Корпоративный Веб"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_web_gantt
@@ -22237,7 +22687,7 @@ msgstr "Конструктор веб-форм"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk_form
 msgid "Website Form Helpdesk"
-msgstr ""
+msgstr "Форма связи службы поддержки веб-сайта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_gengo
@@ -22252,12 +22702,12 @@ msgstr "Веб-сайт Google Map"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk
 msgid "Website Helpdesk"
-msgstr ""
+msgstr "Служба поддержки веб-сайта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk_livechat
 msgid "Website IM Livechat Helpdesk"
-msgstr ""
+msgstr "Живой чат службы поддержки веб-сайта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_links
@@ -22332,7 +22782,7 @@ msgstr "Веб-сайт магазин продаж - Веб-сайт инфор
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_helpdesk_slides
 msgid "Website Slides Helpdesk"
-msgstr ""
+msgstr "Cлайды Службы поддержки веб-сайта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_studio
@@ -22352,7 +22802,7 @@ msgstr "Установка темы сайта"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_version
 msgid "Website Versioning"
-msgstr ""
+msgstr "Версия веб-сайта"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_sale_wishlist
@@ -22480,7 +22930,7 @@ msgstr "Wkhtmltopdf не было выполнено (код ошибки: %s).
 #. module: base
 #: model:ir.module.module,summary:base.module_mrp_workorder
 msgid "Work Orders, Planing, Stock Reports."
-msgstr ""
+msgstr "Рабочие заказы, планирование, отчеты по запасам."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_payment_sips
@@ -22522,7 +22972,7 @@ msgstr "Yodlee"
 #. module: base
 #: model:ir.module.module,summary:base.module_account_yodlee
 msgid "Yodlee Finance"
-msgstr ""
+msgstr "Финансы Йодле"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_users_simple_form
@@ -22609,7 +23059,7 @@ msgstr ""
 #: code:addons/base/models/ir_ui_view.py:356
 #, python-format
 msgid "You cannot create recursive inherited views."
-msgstr ""
+msgstr "Вы не можете создавать рекурсивно унаследованные представления."
 
 #. module: base
 #: code:addons/base/models/res_users.py:421
@@ -22764,12 +23214,12 @@ msgstr "_unknown"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_online_sync
 msgid "account_online_sync"
-msgstr ""
+msgstr "account_online_sync"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_plaid
 msgid "account_plaid"
-msgstr ""
+msgstr "account_plaid"
 
 #. module: base
 #: code:addons/base/models/res_currency.py:124
diff --git a/odoo/addons/base/i18n/tr.po b/odoo/addons/base/i18n/tr.po
index 24db25f4df0..5c1b2229a64 100644
--- a/odoo/addons/base/i18n/tr.po
+++ b/odoo/addons/base/i18n/tr.po
@@ -19,13 +19,13 @@
 # Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2017
 # Martin Trigaux, 2018
 # José Luis <alagunajs@gmail.com>, 2018
-# Umur Akın <umura@projetgrup.com>, 2018
 # Levent Karakaş <levent@mektup.at>, 2018
 # Murat Kaplan <muratk@projetgrup.com>, 2018
 # Metin Akın <aknmetin@gmail.com>, 2018
 # Buket Şeker <buket_skr@hotmail.com>, 2018
-# Ediz Duman <neps1192@gmail.com>, 2018
 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2018
+# Ediz Duman <neps1192@gmail.com>, 2019
+# Umur Akın <umura@projetgrup.com>, 2019
 # 
 msgid ""
 msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-08-02 10:02+0000\n"
 "PO-Revision-Date: 2016-08-05 12:54+0000\n"
-"Last-Translator: Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2018\n"
+"Last-Translator: Umur Akın <umura@projetgrup.com>, 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -636,6 +636,8 @@ msgid ""
 "        Generate Electronic Invoice with Customs Number\n"
 "    "
 msgstr ""
+"\n"
+"Müşteri Numarası ile Elektronik Fatura Oluşturun"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_sepa
@@ -942,6 +944,12 @@ msgid ""
 "    * The new lock date for advisors must be set after the previous lock date.\n"
 "    "
 msgstr ""
+"\n"
+"Kilit tarihini geri alınamaz duruma getirin:\n"
+"\n"
+"* Müşavir için kullanıcıdan daha katı şartlar tanımlayamazsınız. Ayrıca, kullanıcı kilit tarihi müşavirden daha önceki zamana ayarlanmış olmalı.\n"
+"* Henüz bitmemiş bir dönemi kilitleyemezsiniz. Ayrıca, müşavirler için kilit tarihi, geçmiş ayın son gününden önce olmalı.\n"
+"* Müşavirler için yeni kilit tarihi, son kilit tarihinden daha sonra olmak zorundadır."
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_timesheet_attendance
@@ -6183,7 +6191,7 @@ msgstr "%b - Kısaltılmış ay adı."
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "%d - Day of the month [01,31].\""
-msgstr ""
+msgstr "%d - Ayın günleri [01,31].\""
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
@@ -6198,7 +6206,7 @@ msgstr "%m - Ay numarası [01,12].\""
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "%p - Equivalent of either AM or PM.\""
-msgstr ""
+msgstr "%p - AM yada PM'ye eşit.\""
 
 #. module: base
 #: code:addons/base/models/ir_filters.py:38
@@ -6247,7 +6255,7 @@ msgstr "'%s' alan için geçerli bir tarih görünmüyor '%%(field)s'"
 #: code:addons/base/models/ir_fields.py:239
 #, python-format
 msgid "'%s' does not seem to be a valid datetime for field '%%(field)s'"
-msgstr ""
+msgstr "'%s' alan için geçerli bir tarih görünmüyor'%%(alan)lar'"
 
 #. module: base
 #: code:addons/base/models/ir_fields.py:176
@@ -6339,37 +6347,37 @@ msgstr "- Bu modül başka bir modül içermez."
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "1. %b, %B         ==&gt; Dec, December"
-msgstr ""
+msgstr "1. %b, %B         ==&gt; Ara, Aralık"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "2. %a ,%A         ==&gt; Fri, Friday"
-msgstr ""
+msgstr "2. %a ,%A         ==&gt; Cuma, Cuma"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "3. %y, %Y         ==&gt; 08, 2008"
-msgstr ""
+msgstr "3. %y, %Y         ==&gt; 08, 2008"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "4. %d, %m         ==&gt; 05, 12"
-msgstr ""
+msgstr "4. %d, %m         ==&gt; 05, 12"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "5. %H:%M:%S      ==&gt; 18:25:20"
-msgstr ""
+msgstr "5. %H:%M:%S      ==&gt; 18:25:20"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "6. %I:%M:%S %p  ==&gt; 06:25:20 PM"
-msgstr ""
+msgstr "6. %I:%M:%S %p  ==&gt; 06:25:20 PM"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "7. %j              ==&gt; 340"
-msgstr ""
+msgstr "7. %j              ==&gt; 340"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
@@ -6379,7 +6387,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_lang_form
 msgid "9. %w              ==&gt; 5 ( Friday is the 6th day)"
-msgstr ""
+msgstr "9. %w              ==&gt; 5 ( Cuma 6.gündür)"
 
 #. module: base
 #: selection:report.paperformat,format:0
@@ -6404,18 +6412,18 @@ msgstr ""
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_form
 msgid "<code>datetime</code> (Python module)"
-msgstr ""
+msgstr "<code>tarihsaat</code> (Python modül)"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_form
 msgid "<code>dateutil</code> (Python module)"
-msgstr ""
+msgstr "<code>dateutil</code> (Python modül)"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "<code>env</code>: Odoo Environment on which the action is triggered"
-msgstr ""
+msgstr "<code>env</code>: Eylemin tetiklendiği Odoo Ortamı"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
@@ -6423,6 +6431,8 @@ msgid ""
 "<code>log(message, level='info')</code>:logging function to record debug "
 "information in <code>ir.logging</code> table"
 msgstr ""
+"<code>log(message, level='info')</code>:tablodaki hata ayıklama bilgilerini "
+"kaydetmek için <code>ir.logging</code> loglama işlevi"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
@@ -6430,12 +6440,14 @@ msgid ""
 "<code>model</code>: Odoo Model of the record on which the action is "
 "triggered; is a void recordset"
 msgstr ""
+"<code>model</code>: Eylemin tetiklendiği kaydın Odoo Modeli; boş bir kayıt "
+"kümesidir"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid ""
 "<code>record</code>: record on which the action is triggered; may be be void"
-msgstr ""
+msgstr "<code>record</code>: eylemin tetiklendiği kayıt; geçersiz olabilir"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
@@ -6443,12 +6455,14 @@ msgid ""
 "<code>records</code>: recordset of all records on which the action is "
 "triggered in multi mode; may be void"
 msgstr ""
+"<code>records</code>: eylemin çoklu modda tetiklendiği tüm kayıtların kayıt "
+"kümesi; geçersiz olabilir"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
 #: model:ir.ui.view,arch_db:base.view_model_form
 msgid "<code>self</code> (the set of records to compute)"
-msgstr ""
+msgstr "<code>self</code> (hesaplanacak kayıtlar kümesi)"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
@@ -6462,11 +6476,13 @@ msgid ""
 "<code>time</code>, <code>datetime</code>, <code>dateutil</code>, "
 "<code>timezone</code>: useful Python libraries"
 msgstr ""
+"<code>time</code>, <code>datetime</code>, <code>dateutil</code>, "
+"<code>timezone</code>: kullanışlı Python kütüphanesi"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_currency_kanban
 msgid "<strong><span>Current Rate: </span></strong>"
-msgstr ""
+msgstr "<strong><span>Güncel Kur: </span></strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
@@ -6486,7 +6502,7 @@ msgstr "<strong>Bağımlılıklar :</strong>"
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_res_company_kanban
 msgid "<strong>Email:</strong>"
-msgstr ""
+msgstr "<strong>Email:</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
@@ -6496,7 +6512,7 @@ msgstr "<strong>Grup</strong>"
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Idx</strong>"
-msgstr ""
+msgstr "<strong>Idx</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
@@ -6521,7 +6537,7 @@ msgstr "<strong>Adı</strong>"
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_res_company_kanban
 msgid "<strong>Phone</strong>"
-msgstr ""
+msgstr "<strong>Telefon</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
@@ -6531,17 +6547,17 @@ msgstr "<strong>Raporlar :</strong>"
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Ro</strong>"
-msgstr ""
+msgstr "<strong>Ro</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Rq</strong>"
-msgstr ""
+msgstr "<strong>Rq</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Seq</strong>"
-msgstr ""
+msgstr "<strong>Seq</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_users_form
@@ -6554,41 +6570,43 @@ msgid ""
 "<strong>This operation will permanently erase all data currently stored by "
 "the modules!</strong>"
 msgstr ""
+"<strong>Bu işlem modül tarafından depolanan tüm verileri kalıcı olarak "
+"silecektir!</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Tr</strong>"
-msgstr ""
+msgstr "<strong>Tr</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>Type</strong>"
-msgstr ""
+msgstr "<strong>Tür</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodulereference
 msgid "<strong>View :</strong>"
-msgstr ""
+msgstr "<strong>Görüntü :</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<strong>XML ID</strong>"
-msgstr ""
+msgstr "<strong>XML ID</strong>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<u><strong>Fields</strong></u>"
-msgstr ""
+msgstr "<u><strong>Alanlar</strong></u>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<u><strong>Security</strong></u>"
-msgstr ""
+msgstr "<u><strong>Güvenlik</strong></u>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.report_irmodeloverview
 msgid "<u><strong>Views</strong></u>"
-msgstr ""
+msgstr "<u><strong>Görünümler</strong></u>"
 
 #. module: base
 #: model:ir.module.module,description:base.module_barcodes
@@ -7625,6 +7643,8 @@ msgid ""
 "Also you will find here all the related documents and download it by "
 "clicking on any individual document."
 msgstr ""
+"Ayrıca burada tüm ilişkili dokümanları bulacaksınız ve tıklayarak herhangi "
+"bir belgeyi bireysel olarak indirebilirsiniz."
 
 #. module: base
 #: code:addons/base/models/ir_fields.py:378
@@ -7633,6 +7653,8 @@ msgid ""
 "Ambiguous specification for field '%(field)s', only provide one of name, "
 "external id or database id"
 msgstr ""
+"'%(field)s' alanı için belirsiz özelleştirme, sadece bir isim, dış id yada "
+"veri tabanı id sağlar"
 
 #. module: base
 #: model:res.country,name:base.as
@@ -8054,7 +8076,7 @@ msgstr "Azerbaycan"
 #. module: base
 #: model:res.partner.industry,full_name:base.res_partner_industry_B
 msgid "B MINING AND QUARRYING"
-msgstr ""
+msgstr "B MADENCİLİĞİ VE ÇIKARICILIĞI"
 
 #. module: base
 #: selection:report.paperformat,format:0
@@ -8203,12 +8225,12 @@ msgstr "Barcode Scanner Donanım Sürücüsü"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_barcodes_mobile
 msgid "Barcode in Mobile"
-msgstr ""
+msgstr "Mobilde Barkod"
 
 #. module: base
 #: model:ir.module.module,summary:base.module_barcodes_mobile
 msgid "Barcode scan in Mobile"
-msgstr ""
+msgstr "Mobilde Barkod taraması"
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_barcodes
@@ -9071,6 +9093,13 @@ msgid ""
 "\n"
 "Modules time, datetime, dateutil are available."
 msgstr ""
+"Alanın değerini hesaplama kodu.\n"
+"'kendi' kayıt kümesini yineleyin ve alanlara değer atayın:\n"
+"\n"
+"    kişisel kayıt için:\n"
+"        record['size'] = len(record.name)\n"
+"\n"
+"Modules time, datetime, dateutil mevcut."
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -9299,6 +9328,7 @@ msgstr "Hesapla"
 #: model:ir.module.module,summary:base.module_website_sale_taxcloud_delivery
 msgid "Compute taxes with TaxCloud after online delivery computation."
 msgstr ""
+"Çevrimiçi teslimat hesaplamasından sonra vergileri TaxCloud ile hesaplayın."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -9306,6 +9336,9 @@ msgid ""
 "Computed fields are defined with the fields\n"
 "                                                <strong>Dependencies</strong> and <strong>Compute</strong>."
 msgstr ""
+"Hesaplanmış alanlar \n"
+"                                                <strong>Bağlılıklar</strong> ve <strong>Hesaplama</strong>\n"
+"alanları ile birlikte tanımlanmış."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
@@ -9313,6 +9346,9 @@ msgid ""
 "Computed fields are defined with the fields\n"
 "                                    <strong>Dependencies</strong> and <strong>Compute</strong>."
 msgstr ""
+"Hesaplanmış alanlar\n"
+"                                    <strong>Bağlılıklar </strong> ve <strong>Hesaplama</strong>\n"
+"alanları ile birlikte tanımlanmış."
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_default__condition
@@ -9386,6 +9422,8 @@ msgid ""
 "Connection Test Failed! Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Bağlantı Testi Başarısız! : Onun yerine buna sahibiz:\n"
+" %s"
 
 #. module: base
 #: code:addons/base/models/ir_mail_server.py:195
@@ -9688,7 +9726,7 @@ msgstr ""
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_category_form
 msgid "Create a new contact tag"
-msgstr ""
+msgstr "Yeni bir kontak etiketi oluşturun"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_customer_form
@@ -10703,6 +10741,14 @@ msgid ""
 "%(country_name)s: the name of the country\n"
 "%(country_code)s: the code of the country"
 msgstr ""
+"Ait olduğu ülkenin adresinde kullanılacak görüntü formatı.\n"
+"\n"
+" (örneğin, 'sokak' alanını görüntülemek için kullanın)\n"
+"Python tarzı dize desenini adresin tüm alanlarıyla birlikte kullanabilirsiniz (örneğin, 'sokak' alanını görüntülemek için '%(street)s' alanını kullanın ) ayrıca\n"
+"%(state_name)s: şehir adı\n"
+"%(state_code)s: şehir kodu\n"
+"%(country_name)s: ülke adı\n"
+"%(country_code)s: ülke kodu"
 
 #. module: base
 #: model:res.country,name:base.dj
@@ -10801,6 +10847,8 @@ msgstr "Stoksuz Stok"
 msgid ""
 "Duplicating a company is not allowed. Please create a new company instead."
 msgstr ""
+"Şirketi çoğaltmak mümkün değildir. Onun yerine lütfen yeni bir şirket "
+"oluşturun."
 
 #. module: base
 #: code:addons/base/models/ir_qweb_fields.py:401
@@ -10821,7 +10869,7 @@ msgstr ""
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_l10n_mx_edi_payment
 msgid "EDI Payment"
-msgstr ""
+msgstr "EDI Ödeme"
 
 #. module: base
 #: model:ir.module.module,description:base.module_l10n_mx_edi_payment
@@ -12524,7 +12572,7 @@ msgstr "İK Organizasyon Planı"
 #. module: base
 #: model:res.country,vat_label:base.ca
 msgid "HST"
-msgstr ""
+msgstr "HST"
 
 #. module: base
 #: selection:ir.actions.report,report_type:0
@@ -13522,6 +13570,8 @@ msgid ""
 "Insufficient fields to generate a Calendar View for %s, missing a date_stop "
 "or a date_delay"
 msgstr ""
+"%siçin Takvim Görünümü oluşturmak için yetersiz alan, bir date_stop yada bir"
+" date_delay eşleşmiyor"
 
 #. module: base
 #: selection:ir.property,type:0
@@ -13695,7 +13745,7 @@ msgstr "Eylem tanımındaki geçersiz model adı %r"
 #: code:addons/base/models/ir_ui_view.py:661
 #, python-format
 msgid "Invalid position attribute: '%s'"
-msgstr ""
+msgstr "Geçersiz konum özelliği: '%s'"
 
 #. module: base
 #: code:addons/base/models/ir_sequence.py:220
@@ -13792,7 +13842,7 @@ msgstr "İrlanda"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_lock
 msgid "Irreversible Lock Date"
-msgstr ""
+msgstr "Değiştirilemez Kilit Tarihi"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_base_partner_merge_automatic_wizard__group_by_is_company
@@ -14845,6 +14895,8 @@ msgid ""
 "Manage contact tags to better classify them for tracking and analysis "
 "purposes."
 msgstr ""
+"İzleme ve analiz amacıyla bunları daha iyi sınıflandırmak için kontak "
+"etiketleri ile yönetin."
 
 #. module: base
 #: model:ir.module.module,summary:base.module_hr_attendance
@@ -14903,7 +14955,7 @@ msgstr "Many2One"
 #: code:addons/base/models/ir_model.py:647
 #, python-format
 msgid "Many2one %s on model %s does not exist!"
-msgstr ""
+msgstr "Many2one %s on model %s does not exist!"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_model_relation
@@ -15246,7 +15298,7 @@ msgstr "Model"
 #: code:addons/base/models/ir_model.py:489
 #, python-format
 msgid "Model %s does not exist"
-msgstr ""
+msgstr "Model %s yok"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:643
@@ -15402,6 +15454,8 @@ msgid ""
 "Module loading %s failed: file %s could not be processed:\n"
 " %s"
 msgstr ""
+"Modül yükleme %s başarsız: dosya%s işlenemedi:\n"
+" %s"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_translation__module
@@ -15417,7 +15471,7 @@ msgstr "Modüller"
 #: code:addons/base/models/ir_module.py:402
 #, python-format
 msgid "Modules \"%s\" and \"%s\" are incompatible."
-msgstr ""
+msgstr "Modüller \"%s\" and \"%s\" uyumsuz."
 
 #. module: base
 #: model:res.country,name:base.md
@@ -15705,7 +15759,7 @@ msgstr "Kayıt Bulunamadı"
 #: code:addons/models.py:1361
 #, python-format
 msgid "No default view of type '%s' could be found !"
-msgstr ""
+msgstr "Varsayılan tür görünümü '%s' bulunamadı !"
 
 #. module: base
 #: selection:ir.sequence,implementation:0
@@ -15716,7 +15770,7 @@ msgstr "Boşluk Yok"
 #: code:addons/fields.py:2261
 #, python-format
 msgid "No inverse field %r found for %r"
-msgstr ""
+msgstr " %r bunlar için %r ters alanlar bulunamadı"
 
 #. module: base
 #: code:addons/base/wizard/base_update_translations.py:26
@@ -15753,13 +15807,13 @@ msgstr "Güncellenemez"
 #: code:addons/base/models/ir_model.py:456
 #, python-format
 msgid "Non-relational field %r in dependency %r"
-msgstr ""
+msgstr "İlişkisi olmayan alanlar %r bağımlılığında %r"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:413
 #, python-format
 msgid "Non-relational field name '%s' in related field '%s'"
-msgstr ""
+msgstr "İlişkisi olmayan alan adı '%s' ilgili alan '%s'"
 
 #. module: base
 #: model:ir.module.module,description:base.module_test_testing_utilities
@@ -17128,6 +17182,13 @@ msgid ""
 "(<xpath/>) are applied, and the result is used as if it were this view's\n"
 "actual arch.\n"
 msgstr ""
+"Yalnızca bu görünüm diğerinden devir alınırsa uygulanır (inherit_id False / Null değil).\n"
+"\n"
+"* eğer uzantı (varsayılan), bu görünüm gerekirse en yakın birincil görünüm\n"
+"aranır (via inherit_id), daha sonra bu görünüm modeliyle devralınan tüm görünümler uygulanır.\n"
+"* birincil ise, en yakın ana görünüm tam olarak çözülür\n"
+" (bundan farklı bir model kullanılıyor olsa bile), daha sonra bu görüşün devralma özellikleri\n"
+"(<xpath/>) uygulanır, ve sonuç, bu görünümün asıl arch gibi kullanılır.\n"
 
 #. module: base
 #: sql_constraint:res.currency.rate:0
@@ -17549,6 +17610,8 @@ msgid ""
 "Other features are accessible through <code>self</code>, like\n"
 "                                                <code>self.env</code>, etc."
 msgstr ""
+"Diğer özelliklere bu yollarla erişebilirsiniz <code>self</code>, like\n"
+"                                                <code>self.env</code>, etc."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
@@ -17556,6 +17619,8 @@ msgid ""
 "Other features are accessible through <code>self</code>, like\n"
 "                                    <code>self.env</code>, etc."
 msgstr ""
+"Diğer özelliklere bu yollarla erişebilirsiniz <code>self</code>, like\n"
+"                                    <code>self.env</code>, etc."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_ir_mail_server_search
@@ -17995,7 +18060,7 @@ msgstr "Lütfen değerleri seçmeden önce Modeli Oluştur'a ayarlayın."
 #: code:addons/base/models/ir_model.py:490
 #, python-format
 msgid "Please specify a valid model for the object relation"
-msgstr ""
+msgstr "Lütfen nesne ilişkisi için geçerli bir model belirtin"
 
 #. module: base
 #: code:addons/base/models/res_users.py:320
@@ -18201,13 +18266,13 @@ msgstr "Kişisel Adres"
 #. module: base
 #: model:ir.ui.view,arch_db:base.res_partner_view_form_private
 msgid "Private Address Form"
-msgstr ""
+msgstr "Özel Adres Formu"
 
 #. module: base
 #: code:addons/models.py:113
 #, python-format
 msgid "Private methods (such as %s) cannot be called remotely."
-msgstr ""
+msgstr "Özel methodlar (gibi %s) uzaktan aranamaz."
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_website_sale_comparison
@@ -18585,7 +18650,7 @@ msgstr "R SANAT, EĞLENCE VE REKREASYON"
 #. module: base
 #: model:res.country,vat_label:base.mx
 msgid "RFC"
-msgstr ""
+msgstr "RFC"
 
 #. module: base
 #: model:res.country,vat_label:base.do
@@ -18738,13 +18803,13 @@ msgstr ""
 #: code:addons/base/models/ir_model.py:425
 #, python-format
 msgid "Related field '%s' does not have comodel '%s'"
-msgstr ""
+msgstr "İlgili alanlar '%s' ortak alanlara sahip değil '%s'"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:423
 #, python-format
 msgid "Related field '%s' does not have type '%s'"
-msgstr ""
+msgstr "İlgili alanlar '%s' türe sahip değil '%s'"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_model_fields__relation_field
@@ -19883,7 +19948,7 @@ msgstr "Sırala"
 #: code:addons/models.py:3678
 #, python-format
 msgid "Sorting field %s not found on model %s"
-msgstr ""
+msgstr "Sıralama alanı %s model üzerinde bulunamadı%s"
 
 #. module: base
 #: model:ir.model.fields,field_description:base.field_ir_actions_act_window__src_model
@@ -20179,7 +20244,7 @@ msgstr "Tedarik argümanları"
 #. module: base
 #: model:ir.module.module,summary:base.module_theme_bootswatch
 msgid "Support for Bootswatch themes in master"
-msgstr ""
+msgstr "Ana sayfadaki Bootswatch temalarına destek"
 
 #. module: base
 #: model:res.country,name:base.sr
@@ -20527,6 +20592,10 @@ msgid ""
 " 1,06,500; [1,2,-1] will represent it to be 106,50,0;[3] will represent it "
 "as 106,500. Provided ',' as the thousand separator in each case."
 msgstr ""
+"Ayraç Formatı [, n] gibi olmalıdır, burada 0 <n: Birim basamağından "
+"başlayarak. -1 ayrımı sona erdirir. Örneğin. [3,2, -1] 106500 1,06,500 "
+"olacaktır; [1,2, -1] 106,50,0 olarak; [3] 106,500 olarak görünecek. Her "
+"durumda bin ayırıcı olarak ',' sağlanmıştır."
 
 #. module: base
 #: code:addons/base/models/res_lang.py:74
@@ -20537,6 +20606,10 @@ msgid ""
 " 1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as"
 " 106,500. Provided as the thousand separator in each case."
 msgstr ""
+"Ayraç Formatı [, n] gibi olmalıdır, burada 0 <n: Birim basamağından "
+"başlayarak. -1 ayrımı sona erdirir. Örneğin. [3,2, -1] 106500 1,06,500 "
+"olacaktır; [1,2, -1] 106,50,0 olarak; [3] 106,500 olarak görünecek. Her "
+"durumda bin ayırıcı olarak ',' sağlanmıştır."
 
 #. module: base
 #: code:addons/base/models/ir_module.py:750
@@ -20544,7 +20617,7 @@ msgstr ""
 msgid ""
 "The `%s` module appears to be unavailable at the moment, please try again "
 "later."
-msgstr ""
+msgstr "Bu `%s` modüle şuanda erişilemiyor, lütfen daha sonra tekrar deneyin."
 
 #. module: base
 #: code:addons/base/models/ir_module.py:564
@@ -20627,7 +20700,7 @@ msgstr "Bu eki içeren veritabanı eklenecektir."
 #: code:addons/base/models/ir_model.py:581
 #, python-format
 msgid "The field '%s' cannot be removed because the field '%s' depends on it."
-msgstr ""
+msgstr "Alan '%s' değiştirilemez, çünkü alan '%s' ona bağlı."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -20637,6 +20710,9 @@ msgid ""
 "                                                the field must be assigned to each record with a dictionary-like\n"
 "                                                assignment."
 msgstr ""
+"Alan <strong>Hesaplama</strong> bir kayıt kümesindeki alanın değerini hesaplayan \n"
+"Python kodudur. Alanın değeri,\n"
+" sözlük benzeri bir atama ile her kayda atanmalıdır."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
@@ -20646,6 +20722,9 @@ msgid ""
 "                                    the field must be assigned to each record with a dictionary-like\n"
 "                                    assignment."
 msgstr ""
+"Alan <strong>Hesaplama</strong> bir kayıt kümesindeki alanın değerini hesaplayan \n"
+"Python kodudur. Alanın değeri,\n"
+" sözlük benzeri bir atama ile her kayda atanmalıdır."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_form
@@ -20656,6 +20735,9 @@ msgid ""
 "                                                fields accessible through other relational fields, for instance\n"
 "                                                <code>partner_id.company_id.name</code>."
 msgstr ""
+"Alan <strong>Bağımlılıklar</strong> geçerli alanın bağlı olduğu \n"
+"alanları listeler.Bu, alan adlarının virgül ile ayrıldığı bir liste, <code>isim, beden</code>gibi. Ayrıca, diğer ilişkisel alanlardan erişilebilen alanlara da bakabilirsiniz, örneğin\n"
+"                                                <code>partner_id.company_id.name</code>."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_model_fields_form
@@ -20666,6 +20748,9 @@ msgid ""
 "                                    fields accessible through other relational fields, for instance\n"
 "                                    <code>partner_id.company_id.name</code>."
 msgstr ""
+"Alan <strong>Bağımlılıklar</strong> geçerli alanın bağlı olduğu \n"
+"alanları listeler.Bu, alan adlarının virgül ile ayrıldığı bir liste, <code>isim, beden</code>gibi. Ayrıca, diğer ilişkisel alanlardan erişilebilen alanlara da bakabilirsiniz, örneğin\n"
+"                                                <code>partner_id.company_id.name</code>."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_base_module_uninstall
@@ -20681,7 +20766,7 @@ msgstr "Aşağıdaki belgeler kalıcı olarak kaybolacaktır."
 #: code:addons/base/wizard/base_module_upgrade.py:69
 #, python-format
 msgid "The following modules are not installed or unknown: %s"
-msgstr ""
+msgstr "Sıradaki modüller kurulmadı yada bilinmiyor: %s"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_res_country__name
@@ -20848,6 +20933,8 @@ msgid ""
 "The requested operation cannot be completed due to record rules: Document "
 "type: %s, Operation: %s, Records: %s, User: %s"
 msgstr ""
+"Kayıt kurallarından dolayı gerekli işlemler tamamlanamadı: Belge türü: %s, "
+"İşlem: %s, Kayıtlar: %s, Kullanıcı: %s"
 
 #. module: base
 #: code:addons/models.py:2577 code:addons/models.py:2786
@@ -20910,7 +20997,7 @@ msgstr "İl kodu."
 #: code:addons/base/models/ir_model.py:516
 #, python-format
 msgid "The table %r if used for other, possibly incompatible fields."
-msgstr ""
+msgstr "Tablo %r diğeri için kullanıldıysa, muhtemelen uyumsuz alanlardır."
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_model_fields__model
@@ -20945,7 +21032,7 @@ msgstr ""
 msgid ""
 "The value for the field '%s' already exists (this is probably '%s' in the "
 "current model)."
-msgstr ""
+msgstr "Alan değeri '%s' zaten mevcut (muhtemelen '%s' güncel modelde)."
 
 #. module: base
 #: code:addons/models.py:5215
@@ -20954,6 +21041,7 @@ msgid ""
 "The values for the fields '%s' already exist (they are probably '%s' in the "
 "current model)."
 msgstr ""
+"Alanların değeri '%s' çoktan var (onlar muhtemelen '%s' güncel modellerde)."
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_theme
@@ -21012,6 +21100,9 @@ msgid ""
 "This file was generated using the universal <strong>Unicode/UTF-8</strong> file encoding, please be sure to view and edit\n"
 "                           using the same encoding."
 msgstr ""
+"Bu dosya evrensel <strong>Unicode/UTF-8</strong> dosya kodlaması "
+"kullanılarak oluşturuldu, lütfen aynı kodlamayı kullanarak "
+"görüntülediğinizden ve düzenlediğinizden emin olun"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_actions_act_window__views
@@ -21070,6 +21161,9 @@ msgid ""
 "This module ensures that when delivery price is computed online, and taxes are computed with TaxCloud, the tax computation is done correctly on both the order and delivery.\n"
 "    "
 msgstr ""
+"Bu modül, teslimat fiyatı çevrimiçi olarak hesaplandığında ve vergiler "
+"TaxCloud ile hesaplandığında, vergi hesaplamasının hem sipariş hem de "
+"teslimatta doğru yapılmasını sağlar."
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_base_module_upgrade
@@ -21219,7 +21313,7 @@ msgstr ""
 #. module: base
 #: model:ir.ui.view,arch_db:base.view_server_action_form
 msgid "To return an action, assign: <code>action = {...}</code>"
-msgstr ""
+msgstr "Bir eylemi geri döndürmek için, atama: <code>action = {...}</code>"
 
 #. module: base
 #: model:ir.ui.view,arch_db:base.ir_actions_todo_tree
@@ -21682,13 +21776,13 @@ msgstr "Alma sırasında bilinmeyen bir hata oluştu:"
 #: code:addons/base/models/ir_model.py:454
 #, python-format
 msgid "Unknown field %r in dependency %r"
-msgstr ""
+msgstr "Bilinmeyen alan %r bağımlılıkta %r"
 
 #. module: base
 #: code:addons/base/models/ir_model.py:411
 #, python-format
 msgid "Unknown field name '%s' in related field '%s'"
-msgstr ""
+msgstr "Bilinmeyen dosya adı '%s' ilişkili alan'%s'"
 
 #. module: base
 #: code:addons/base/models/ir_fields.py:349
@@ -21882,7 +21976,7 @@ msgstr "Sisteme giriş için kullanılmış"
 #. module: base
 #: model:ir.model.fields,help:base.field_res_company__sequence
 msgid "Used to order Companies in the company switcher"
-msgstr ""
+msgstr "Used to order Companies in the company switcher"
 
 #. module: base
 #: model:ir.model.fields,help:base.field_res_partner__type
@@ -22605,6 +22699,8 @@ msgid ""
 "When subsequences per date range are used, you can prefix variables with 'range_'\n"
 "                                to use the beginning of the range instead of the current date, e.g. %(range_year)s instead of %(year)s."
 msgstr ""
+"Tarih aralığı başına alt sıralama kullanıldığında, geçerli tarih yerine aralığın başlangıcını kullanmak için değişkenleri 'range_' \n"
+"ile önekleyebilirsiniz, örnek; %(range_year)s yerine %(year)s."
 
 #. module: base
 #: model:ir.model.fields,help:base.field_ir_model_fields__copy
@@ -22654,6 +22750,8 @@ msgid ""
 "Wkhtmltopdf failed (error code: %s). Memory limit too low or maximum file "
 "number of subprocess reached. Message : %s"
 msgstr ""
+"Wkhtmltopdf başarısız (hata kodu: %s). Hafıza limiti çok düşük yada alt "
+"işlem maksimum dosya sayısına ulaşıldı. Mesaj : %s"
 
 #. module: base
 #: code:addons/base/models/ir_actions_report.py:399
@@ -22716,7 +22814,7 @@ msgstr ""
 #: code:addons/base/models/ir_module.py:421
 #, python-format
 msgid "You are trying to install incompatible modules in category \"%s\":"
-msgstr ""
+msgstr "Kategoride \"%s\" uyumsuz modülleri kurmaya çalışıyorsunuz :"
 
 #. module: base
 #: code:addons/base/models/ir_module.py:306
@@ -22855,6 +22953,8 @@ msgid ""
 "You try to upgrade the module %s that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Modülü %s bağlı olan modül üzerinde güncellemeye çalışıyorsunuz: %s.\n"
+"Ancak bu modül sisteminizde mevcut değil."
 
 #. module: base
 #: model:ir.module.module,description:base.module_website_crm
diff --git a/odoo/tests/common.py b/odoo/tests/common.py
index 7c3b18be2ff..f703ca30a41 100644
--- a/odoo/tests/common.py
+++ b/odoo/tests/common.py
@@ -1167,8 +1167,11 @@ class Form(object):
         # pre-resolve modifiers & bind to arch toplevel
         modifiers = fvg['modifiers'] = {}
         contexts = fvg['contexts'] = {}
+        order = fvg['fields_ordered'] = []
         for f in fvg['tree'].xpath('//field[not(ancestor::field)]'):
             fname = f.get('name')
+            order.append(fname)
+
             modifiers[fname] = {
                 modifier: domain if isinstance(domain, bool) else normalize_domain(domain)
                 for modifier, domain in json.loads(f.get('modifiers', '{}')).items()
@@ -1216,7 +1219,8 @@ class Form(object):
 
         # on creation, every field is considered changed by the client
         # apparently
-        self._perform_onchange(list(vals.keys() - {'id'}))
+        # and fields should be sent in view order, not whatever fields_view_get['fields'].keys() is
+        self._perform_onchange(self._view['fields_ordered'])
 
     def _init_from_values(self, values):
         self._values.update(