[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

1 files changed, 30 insertions, 30 deletions

diff --git a/addons/l10n_generic_coa/data/configurable_account_chart.xml b/addons/l10n_generic_coa/data/configurable_account_chart.xml
index 39db01580a3..18c286f3afb 100644
--- a/addons/l10n_generic_coa/data/configurable_account_chart.xml
+++ b/addons/l10n_generic_coa/data/configurable_account_chart.xml
@@ -6,7 +6,7 @@
             <field name="code">1017</field>
             <field name="name">Liquidity Transfers</field>
             <field name="reconcile" eval='True'/>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
         </record>
 
         <record id="configurable_chart_template" model="account.chart.template">
@@ -26,21 +26,21 @@
         <record id="conf_xfa" model="account.account.template">
             <field name="code">1000</field>
             <field name="name">Fixed Asset Account</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_stk" model="account.account.template">
             <field name="code">1010</field>
             <field name="name">Current Assets</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_cas" model="account.account.template">
             <field name="code">1011</field>
             <field name="name">Purchased Stocks</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -48,56 +48,56 @@
             <field name="code">1012</field>
             <field name="name">Account Receivable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_receivable"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_ova" model="account.account.template">
             <field name="code">1013</field>
             <field name="name">Tax Paid</field>
-            <field name="user_type" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_bnk" model="account.account.template">
             <field name="code">1014</field>
             <field name="name">Bank Current 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="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_cash" model="account.account.template">
             <field name="code">1015</field>
             <field name="name">Cash</field>
-            <field name="user_type" ref="account.data_account_type_liquidity"/>
+            <field name="user_type_id" ref="account.data_account_type_liquidity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_o_income" model="account.account.template">
             <field name="code">1016</field>
             <field name="name">Opening Income Account</field>
-            <field name="user_type" ref="account.data_account_type_other_income"/>
+            <field name="user_type_id" ref="account.data_account_type_other_income"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_ncas" model="account.account.template">
             <field name="code">1020</field>
             <field name="name">Non-current assets</field>
-            <field name="user_type" ref="account.data_account_type_non_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_assets"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_prepayments" model="account.account.template">
             <field name="code">1030</field>
             <field name="name">Prepayments</field>
-            <field name="user_type" ref="account.data_account_type_prepayments"/>
+            <field name="user_type_id" ref="account.data_account_type_prepayments"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
        <record id="current_liabilities" model="account.account.template">
             <field name="code">1110</field>
             <field name="name">Current Liabilities</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -105,14 +105,14 @@
             <field name="code">1111</field>
             <field name="name">Account Payable</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_payable"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
         <record id="conf_iva" model="account.account.template">
             <field name="code">1112</field>
             <field name="name">Tax Received</field>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -120,13 +120,13 @@
             <field name="code">1113</field>
             <field name="name">Reserve and Profit/Loss Account</field>
             <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="cas" model="account.account.template">
             <field name="code">1120</field>
             <field name="name">Non-current Liabilities</field>
-            <field name="user_type" ref="account.data_account_type_non_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -136,7 +136,7 @@
         <record id="conf_a_sale" model="account.account.template">
             <field name="code">200</field>
             <field name="name">Product Sales</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -144,7 +144,7 @@
         <record id="conf_cog" model="account.account.template">
             <field name="code">210</field>
             <field name="name">Cost of Goods Sold</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -152,7 +152,7 @@
         <record id="conf_a_expense" model="account.account.template">
             <field name="code">220</field>
             <field name="name">Expenses</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
         </record>
@@ -160,7 +160,7 @@
         <record model="account.account.template" id="exchange_fx_income">
             <field name="name">Foreign Exchange Gain</field>
             <field name="code">2010</field>
-            <field name="user_type" ref="account.data_account_type_revenue"/>
+            <field name="user_type_id" ref="account.data_account_type_revenue"/>
             <field name="reconcile" eval="False"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
@@ -168,7 +168,7 @@
         <record model="account.account.template" id="exchange_fx_expense">
             <field name="name">Foreign Exchange Loss</field>
             <field name="code">2110</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="reconcile" eval="False"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
@@ -176,34 +176,34 @@
         <record id="a_salary_expense" model="account.account.template">
             <field name="code">2121</field>
             <field name="name">Salary Expenses</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_operating')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_expense_invest" model="account.account.template">
             <field name="code">2122</field>
             <field name="name">Purchase of Equipments</field>
-            <field name="user_type" ref="account.data_account_type_fixed_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_fixed_assets"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_investing')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_expense_finance" model="account.account.template">
             <field name="code">2123</field>
             <field name="name">Bank Fees</field>
-            <field name="user_type" ref="account.data_account_type_expenses"/>
+            <field name="user_type_id" ref="account.data_account_type_expenses"/>
             <field name="tag_ids" eval="[(6,0,[ref('account.account_tag_financing')])]"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_capital" model="account.account.template">
             <field name="code">3001</field>
             <field name="name">Capital</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
         <record id="a_dividends" model="account.account.template">
             <field name="code">3002</field>
             <field name="name">Dividends</field>
-            <field name="user_type" ref="account.data_account_type_equity"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="configurable_chart_template"/>
         </record>
 
@@ -211,10 +211,10 @@
 
         <!-- chart template -->
         <record id="configurable_chart_template" model="account.chart.template">
-            <field name="property_account_receivable" ref="conf_a_recv"/>
-            <field name="property_account_payable" ref="conf_a_pay"/>
-            <field name="property_account_expense_categ" ref="conf_a_expense"/>
-            <field name="property_account_income_categ" ref="conf_a_sale"/>
+            <field name="property_account_receivable_id" ref="conf_a_recv"/>
+            <field name="property_account_payable_id" ref="conf_a_pay"/>
+            <field name="property_account_expense_categ_id" ref="conf_a_expense"/>
+            <field name="property_account_income_categ_id" ref="conf_a_sale"/>
             <field name="complete_tax_set" eval="False"/>
             <field name="use_anglo_saxon" eval="True"/>
             <field name="income_currency_exchange_account_id" ref="exchange_fx_income"/>