[REF]Account: Refactoring the account, Change some fields name according to new api guidelines

code improvement

code improvement

payment_method to payment_method_id

writeoff_account to writeoff_account_id

property_account_receivable to property_account_receivable_id

property_account_payable to property_account_payable_id

property_account_expense_categ to property_account_expense_categ_id

property_account_income_categ to property_account_income_categ_id

property_account_expense to property_account_expense_id

property_account_income to property_account_income_id

property_account_expense_categ fix

sale_tax to sale_tax_id and default_sale_tax to default_sale_tax_id

purchase_tax to purchase_tax_id and default_purchase_tax to default_purchase_tax_id

ref_companies to ref_companies_ids

property_account_position to property_account_position_id

property_payment_term to property_payment_term_id

property_supplier_payment_term to property_supplier_payment_term_id

bank_accounts_id to bank_accounts_ids

payment_method fix after rebase

user_type after rebase

payment_method fix after rebase

after rebase

invoice to invoice_id

fix payment_method_id after rebase

code improvement

[IMP]user_type to user_type_id

[IMP]property_stock_account_input_categ, property_stock_account_output_categ to _id

[IMP]improve after rebase

[IMP]fix type

[IMP]Account: code improvement

3 files changed, 14 insertions, 14 deletions

diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index ee8e66f848d..c3038bcca8b 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -56,22 +56,22 @@
 
         <!-- Add payment term on some demo partners -->
         <record id="base.res_partner_2" model="res.partner">
-            <field name="property_payment_term" ref="account.account_payment_term_net"/>
+            <field name="property_payment_term_id" ref="account.account_payment_term_net"/>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="property_payment_term" ref="account_payment_term"/>
-            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+            <field name="property_payment_term_id" ref="account_payment_term"/>
+            <field name="property_supplier_payment_term_id" ref="account_payment_term"/>
         </record>
         <record id="base.res_partner_4" model="res.partner">
-            <field name="property_supplier_payment_term" ref="account.account_payment_term_net"/>
+            <field name="property_supplier_payment_term_id" ref="account.account_payment_term_net"/>
         </record>
         <record id="base.res_partner_1" model="res.partner">
-            <field name="property_supplier_payment_term" ref="account_payment_term"/>
+            <field name="property_supplier_payment_term_id" ref="account_payment_term"/>
         </record>
 <!-- 
         <record id="account.credit_account" model="account.account">
             <field name="name">Bank Account</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="code">Testbank</field>
         </record>
 
diff --git a/addons/account/demo/account_invoice_demo.yml b/addons/account/demo/account_invoice_demo.yml
index 24f5549b9a2..3c95f219cf1 100644
--- a/addons/account/demo/account_invoice_demo.yml
+++ b/addons/account/demo/account_invoice_demo.yml
@@ -122,7 +122,7 @@
       }
       account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_ceo_wages_account')])])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
       if account_id:
           line_vals['account_id'] = account_id[0]
           self._update(cr, uid, 'account.invoice.line', 'account', line_vals, 'ceo_wages_line')
@@ -143,7 +143,7 @@
       }
       account_id = self.pool.get('account.account').search(cr, uid, [('tag_ids', 'in', [ref('account.demo_coffee_machine_account')])])
       if not account_id:
-          account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses'))])
+          account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses'))])
       if account_id:
           line_vals['account_id'] = account_id[0]
           tax_id = self.pool.get('account.tax').search(cr, uid, [('type_tax_use', '=', 'purchase'), ('amount', '>', 0)])
@@ -154,7 +154,7 @@
           self.pool.get('account.invoice').signal_workflow(cr, uid, [ref('demo_invoice_equipment_purchase')], 'invoice_open')
 -
   !python {model: account.bank.statement.line} : |
-      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')])])
+      account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', 'in', [ref('account.account_tag_financing')])])
       line = self.browse(cr, uid, ref('account.demo_bank_statement_line_5'))
       if not line.journal_entry_ids and account_ids:
           line.write({'account_id': account_ids[0]})
@@ -175,8 +175,8 @@
       bank_journal_id = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'bank')])[0]
       if bank_journal_id:
           bank_account_id = self.pool.get('account.journal').browse(cr, uid, bank_journal_id).default_debit_account_id.id
-      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))])
-      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])])
+      fixed_asset_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', 'in', (ref('account.data_account_type_fixed_assets'),ref('account.data_account_type_current_assets')))])
+      equity_account_ids = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_equity')), ('tag_ids', 'in', [ref('account.demo_capital_account')])])
       if bank_account_id and fixed_asset_account_ids and equity_account_ids:
           self._update(cr, uid, 'account.move.line', 'account', {
               'move_id': ref('account.demo_opening_move'),
diff --git a/addons/account/demo/account_statement_operations.yml b/addons/account/demo/account_statement_operations.yml
index 49524d1557b..5e7eab605ca 100644
--- a/addons/account/demo/account_statement_operations.yml
+++ b/addons/account/demo/account_statement_operations.yml
@@ -1,6 +1,6 @@
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Discount For Early Payment",
           'label': 'Discount',
@@ -12,7 +12,7 @@
           self._update(cr, uid, 'account.operation.template', 'account', vals, 'statement_operation_template_1')
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_expenses')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Bank Fees",
           'label': 'Bank Fees',
@@ -24,7 +24,7 @@
           self._update(cr, uid, 'account.operation.template', 'account', vals, 'statement_operation_template_2')
 -
   !python {model: ir.model.data} : |
-      account_id = self.pool.get('account.account').search(cr, uid, [('user_type', '=', ref('account.data_account_type_revenue')), ('tag_ids', '=', ref('account_tag_operating'))])
+      account_id = self.pool.get('account.account').search(cr, uid, [('user_type_id', '=', ref('account.data_account_type_revenue')), ('tag_ids', '=', ref('account_tag_operating'))])
       vals = {
           'name': "Profit / Loss",
           'label': 'Profit / Loss',