From a5b5dd83a2b9d27b3f57ffc3800c9d6753d7cae2 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Tue, 28 Jun 2022 22:13:20 +0200
Subject: [PATCH] account_usability: adapt context for suspensed_account_id for
 user_type_id

This commit follows a change in the account module made in this commit: https://github.com/odoo/odoo/commit/c16bc3192fe8ea033144c9cb6ab5b8c6db21d735
Improve multi-company support in the wizard account.group.generate
Remove widget="selection" on fiscal_position on res.partner form
---
 account_usability/models/account_journal.py              | 5 +----
 account_usability/views/account_journal.xml              | 3 +--
 account_usability/views/res_partner.xml                  | 3 ---
 account_usability/wizard/account_group_generate.py       | 5 ++++-
 account_usability/wizard/account_group_generate_view.xml | 1 +
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/account_usability/models/account_journal.py b/account_usability/models/account_journal.py
index c8b517f..1910faa 100644
--- a/account_usability/models/account_journal.py
+++ b/account_usability/models/account_journal.py
@@ -16,10 +16,7 @@ class AccountJournal(models.Model):
         "you don't want to enter the start/end balance manually: it "
         "will prevent the display of wrong information in the accounting "
         "dashboard and on bank statements.")
-    # Used to set default user_type_id on account fields
-    account_type_current_liabilities_id = fields.Many2one(
-        'account.account.type',
-        default=lambda self: self.env.ref('account.data_account_type_current_liabilities').id)
+    # Used to set default user_type_id on account fields via context
     account_type_current_assets_id = fields.Many2one(
         'account.account.type',
         default=lambda self: self.env.ref('account.data_account_type_current_assets').id)
diff --git a/account_usability/views/account_journal.xml b/account_usability/views/account_journal.xml
index cca9f59..0f2c5e5 100644
--- a/account_usability/views/account_journal.xml
+++ b/account_usability/views/account_journal.xml
@@ -14,11 +14,10 @@
     <field name="arch" type="xml">
         <field name="bank_statements_source" position="after">
             <field name="hide_bank_statement_balance" groups="account.group_account_readonly"/>
-            <field name="account_type_current_liabilities_id" invisible="1"/>
             <field name="account_type_current_assets_id" invisible="1"/>
         </field>
         <field name="suspense_account_id" position="attributes">
-            <attribute name="context">{'default_user_type_id': account_type_current_liabilities_id, 'default_reconcile': True}</attribute>
+            <attribute name="context">{'default_user_type_id': account_type_current_assets_id, 'default_reconcile': True}</attribute>
         </field>
         <field name="payment_debit_account_id" position="attributes">
             <attribute name="context">{'default_user_type_id': account_type_current_assets_id, 'default_reconcile': True}</attribute>
diff --git a/account_usability/views/res_partner.xml b/account_usability/views/res_partner.xml
index 37af0d2..674a125 100644
--- a/account_usability/views/res_partner.xml
+++ b/account_usability/views/res_partner.xml
@@ -13,9 +13,6 @@
     <field name="model">res.partner</field>
     <field name="inherit_id" ref="account.view_partner_property_form"/>
     <field name="arch" type="xml">
-        <field name="property_account_position_id" position="attributes">
-            <attribute name="widget">selection</attribute>
-        </field>
         <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
             <field name="acc_type"/>
         </xpath>
diff --git a/account_usability/wizard/account_group_generate.py b/account_usability/wizard/account_group_generate.py
index f855341..2379ce4 100644
--- a/account_usability/wizard/account_group_generate.py
+++ b/account_usability/wizard/account_group_generate.py
@@ -10,6 +10,9 @@ class AccountGroupGenerate(models.TransientModel):
     _name = 'account.group.generate'
     _description = 'Generate Account Groups'
 
+    company_id = fields.Many2one(
+        'res.company', string='Company', required=True,
+        default=lambda self: self.env.company)
     name_prefix = fields.Char(string='Prefix', required=True, default='Comptes')
     level = fields.Integer(default=2, required=True)
 
@@ -18,7 +21,7 @@ class AccountGroupGenerate(models.TransientModel):
             raise UserError(_("The level must be >= 1."))
         ago = self.env['account.group']
         aao = self.env['account.account']
-        company = self.env.company
+        company = self.company_id
         groups = ago.search([('company_id', '=', company.id)])
         if groups:
             raise UserError(_(
diff --git a/account_usability/wizard/account_group_generate_view.xml b/account_usability/wizard/account_group_generate_view.xml
index 57ced24..13e4d37 100644
--- a/account_usability/wizard/account_group_generate_view.xml
+++ b/account_usability/wizard/account_group_generate_view.xml
@@ -16,6 +16,7 @@
                 This wizard is designed to auto-generate account groups from the chart of account.
             </p>
             <group name="main">
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="name_prefix"/>
                 <field name="level"/>
             </group>