From 3830621075805ff71bffe45f428b7318ab2769d2 Mon Sep 17 00:00:00 2001
From: Sanjay Jamod <sja@odoo.com>
Date: Thu, 14 Dec 2017 13:43:26 +0100
Subject: [PATCH 1/5] [FIX] base: language code for Khmer (Cambodia)

Closes #17633
---
 odoo/addons/base/res/res.lang.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/odoo/addons/base/res/res.lang.csv b/odoo/addons/base/res/res.lang.csv
index e04af8271b7..4a194725841 100644
--- a/odoo/addons/base/res/res.lang.csv
+++ b/odoo/addons/base/res/res.lang.csv
@@ -35,7 +35,7 @@ base.lang_de_CH,"German (CH) / Deutsch (CH)",de_CH,de_CH,"Left-to-Right","[3,3]"
 "base.lang_it","Italian / Italiano","it_IT","it","Left-to-Right","[3,0]",",",".","%d/%m/%Y","%H:%M:%S","True"
 "base.lang_ja_JP","Japanese / 日本語","ja_JP","ja_JP","Left-to-Right","[3,0]",".",",","%Y年%m月%d日","%H時%M分%S秒","True"
 "base.lang_kab_DZ","Kabyle / Taqbaylit","kab_DZ","kab_DZ","Left-to-Right","[]",".",",","%m/%d/%Y","%I:%M:%S %p","True"
-"base.lang_km","Khmer / ភាសាខ្មែរ","km_KM","km","Left-to-Right","[3,0]",".",",","%d %B %Y","%H:%M:%S","True"
+"base.lang_km","Khmer / ភាសាខ្មែរ","km_KH","km","Left-to-Right","[3,0]",".",",","%d %B %Y","%H:%M:%S","True"
 "base.lang_ko_KP","Korean (KP) / 한국어 (KP)","ko_KP","ko_KP","Left-to-Right","[3,0]",".",",","%m/%d/%Y","%I:%M:%S %p","True"
 "base.lang_ko_KR","Korean (KR) / 한국어 (KR)","ko_KR","ko_KR","Left-to-Right","[3,0]",".",",","%Y년 %m월 %d일","%H시 %M분 %S초","True"
 "base.lang_lo_LA","Lao / ພາສາລາວ","lo_LA","lo_LA","Left-to-Right","[3,0]",".",",","%d/%m/y","%H:%M:%S","True"

From e89fbb5c389d53deacb35911a783ce216601e44d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 14 Dec 2017 14:27:53 +0100
Subject: [PATCH 2/5] [FIX] l10n_fr_certification: correct view inheritance
 hook

---
 addons/l10n_fr_certification/views/res_config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr_certification/views/res_config.xml b/addons/l10n_fr_certification/views/res_config.xml
index 36f66f00df2..f1a520f0fa9 100644
--- a/addons/l10n_fr_certification/views/res_config.xml
+++ b/addons/l10n_fr_certification/views/res_config.xml
@@ -4,7 +4,7 @@
         <field name="model">base.config.settings</field>
         <field name="inherit_id" ref="base_setup.view_general_configuration"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='company_share_ressources']" position="before">
+            <xpath expr="//group[@name='company_share_resources']" position="before">
                 <group>
                     <label for="id" string="Data Inalterability"/>
                     <div>
@@ -15,4 +15,4 @@
             </xpath>
         </field>
     </record>
-</odoo>
\ No newline at end of file
+</odoo>

From 063314b78aaa6e4a461723880cc2115052c9db24 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Thu, 14 Dec 2017 13:24:30 +0100
Subject: [PATCH 3/5] [FIX] account: switching chart of account

Backport of cf3235e134ca02c7abad41e58c01d176391865de

opw-788228
---
 addons/account/models/res_config.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account/models/res_config.py b/addons/account/models/res_config.py
index 167300a7321..906e8f95012 100644
--- a/addons/account/models/res_config.py
+++ b/addons/account/models/res_config.py
@@ -92,8 +92,6 @@ class AccountConfigSettings(models.TransientModel):
                 'chart_template_id': self.chart_template_id.id,
                 'transfer_account_id': self.chart_template_id.transfer_account_id.id,
                 'code_digits': self.code_digits or 6,
-                'sale_tax_id': self.default_sale_tax_id.id,
-                'purchase_tax_id': self.default_purchase_tax_id.id,
                 'sale_tax_rate': 15.0,
                 'purchase_tax_rate': 15.0,
                 'complete_tax_set': self.chart_template_id.complete_tax_set,
@@ -101,6 +99,7 @@ class AccountConfigSettings(models.TransientModel):
                 'bank_account_code_prefix': self.chart_template_id.bank_account_code_prefix,
                 'cash_account_code_prefix': self.chart_template_id.cash_account_code_prefix,
             })
+            wizard.onchange_chart_template_id()
             wizard.execute()
 
     @api.onchange('group_analytic_accounting')

From 25375efd5b9584306a4dab1fb1305bc2cfc8433e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 14 Dec 2017 15:38:06 +0100
Subject: [PATCH 4/5] [FIX] l10n_fr_certification: correct settings view

---
 .../l10n_fr_certification/views/res_config.xml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/addons/l10n_fr_certification/views/res_config.xml b/addons/l10n_fr_certification/views/res_config.xml
index 36f66f00df2..50d46886469 100644
--- a/addons/l10n_fr_certification/views/res_config.xml
+++ b/addons/l10n_fr_certification/views/res_config.xml
@@ -2,17 +2,15 @@
     <record id="view_general_fr_inalterability_inherit_config" model="ir.ui.view">
         <field name="name">Inalterability settings</field>
         <field name="model">base.config.settings</field>
-        <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+        <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='company_share_ressources']" position="before">
-                <group>
-                    <label for="id" string="Data Inalterability"/>
-                    <div>
-                        <button name="%(l10n_fr_certification.action_check_hash_integrity)d" type="action" string="Data Inalterability Check" class="oe_link"/>
-                        <button name="%(l10n_fr_certification.odoo_french_certification)d" type="action" string="Get the certification now!" class="oe_link"/>
-                    </div>
-                </group>
-            </xpath>
+          <xpath expr="//field[@name='group_multi_company']/../../.." position="after">
+            <h2>Data Inalterability</h2>
+            <div class="row mt16 o_settings_container">
+              <button name="%(l10n_fr_certification.action_check_hash_integrity)d" type="action" string="Data Inalterability Check" class="oe_link"/>
+              <button name="%(l10n_fr_certification.odoo_french_certification)d" type="action" string="Get the certification now!" class="oe_link"/>
+            </div>
+          </xpath>
         </field>
     </record>
 </odoo>
\ No newline at end of file

From 5dee10b75cc3905286764f80ba7ee9fb3626f961 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Thu, 14 Dec 2017 15:38:50 +0100
Subject: [PATCH 5/5] [FIX] l10n_fr_sale_closing: declare crons correctly

---
 .../data/account_sale_closure_cron.xml        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/l10n_fr_sale_closing/data/account_sale_closure_cron.xml b/addons/l10n_fr_sale_closing/data/account_sale_closure_cron.xml
index edc1b1566ec..9e20ced6e89 100644
--- a/addons/l10n_fr_sale_closing/data/account_sale_closure_cron.xml
+++ b/addons/l10n_fr_sale_closing/data/account_sale_closure_cron.xml
@@ -5,20 +5,20 @@
         <field name="interval_type">days</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
-        <field name="model" eval="'account.sale.closing'"/>
-        <field name="function" eval="'_automated_closing'"/>
-        <field name="args" eval="'(\'daily\',)'" />
+        <field name="model_id" ref="model_account_sale_closing"/>
+        <field name="state">code</field>
+        <field name="code">model._automated_closing('daily')</field>
     </record>
-    
+
     <record model="ir.cron" id="account_sale_closing_monthly">
         <field name="name">Generate Monthly Sales Closing</field>
         <field name="interval_number">1</field>
         <field name="interval_type">months</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
-        <field name="model" eval="'account.sale.closing'"/>
-        <field name="function" eval="'_automated_closing'"/>
-        <field name="args" eval="'(\'monthly\',)'" />
+        <field name="model_id" ref="model_account_sale_closing"/>
+        <field name="state">code</field>
+        <field name="code">model._automated_closing('monthly')</field>
     </record>
 
     <record model="ir.cron" id="account_sale_closing_annually">
@@ -27,9 +27,9 @@
         <field name="interval_type">months</field>
         <field name="numbercall">-1</field>
         <field name="doall" eval="False"/>
-        <field name="model" eval="'account.sale.closing'"/>
-        <field name="function" eval="'_automated_closing'"/>
-        <field name="args" eval="'(\'annually\',)'" />
+        <field name="model_id" ref="model_account_sale_closing"/>
+        <field name="state">code</field>
+        <field name="code">model._automated_closing('annually')</field>
     </record>
 </odoo>