Browse Source

[UPDT] 2 * Dashboard issue fixed

pull/175/head
Ajmal Cybro 4 years ago
parent
commit
7489c0c1d5
  1. 2
      base_accounting_kit/__manifest__.py
  2. 54
      base_accounting_kit/data/account_financial_report_data.xml
  3. 6
      base_accounting_kit/doc/changelog.md
  4. 1125
      base_accounting_kit/static/src/js/account_dashboard.js

2
base_accounting_kit/__manifest__.py

@ -22,7 +22,7 @@
{ {
'name': 'Odoo 14 Full Accounting Kit', 'name': 'Odoo 14 Full Accounting Kit',
'version': '14.0.3.10.8', 'version': '14.0.3.11.9',
'category': 'Accounting', 'category': 'Accounting',
'live_test_url': 'https://www.youtube.com/watch?v=peAp2Tx_XIs', 'live_test_url': 'https://www.youtube.com/watch?v=peAp2Tx_XIs',
'summary': """ Asset and Budget Management, 'summary': """ Asset and Budget Management,

54
base_accounting_kit/data/account_financial_report_data.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<data noupdate="1"> <data>
<!-- Financial Reports --> <!-- Financial Reports -->
<record id="account_financial_report_profitandloss0" <record id="account_financial_report_profitandloss0"
model="account.financial.report"> model="account.financial.report">
@ -13,20 +13,66 @@
model="account.financial.report"> model="account.financial.report">
<field name="name">Income</field> <field name="name">Income</field>
<field name="sign" eval="'-1'"/> <field name="sign" eval="'-1'"/>
<field name="sequence">0</field> <field name="sequence">1</field>
<field name="parent_id" <field name="parent_id"
ref="account_financial_report_profitandloss0"/> ref="account_financial_report_profitandloss0"/>
<field name="display_detail">detail_with_hierarchy</field> <field name="display_detail">detail_with_hierarchy</field>
<field name="type">sum</field>
</record>
<record id="account_financial_report_other_income0"
model="account.financial.report">
<field name="name">Other Income</field>
<field name="sequence">10</field>
<field name="parent_id"
ref="account_financial_report_income0"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">account_type</field> <field name="type">account_type</field>
<field name="account_type_ids" <field name="account_type_ids"
eval="[(4,ref('account.data_account_type_other_income')), (4,ref('account.data_account_type_revenue'))]"/> eval="[(4,ref('account.data_account_type_other_income'))]"/>
</record>
<record id="financial_report_gross_profit"
model="account.financial.report">
<field name="name">Gross Profit</field>
<field name="parent_id"
ref="account_financial_report_income0"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">sum</field>
<field name="sequence">3</field>
</record>
<record id="financial_report_cost_of_revenue"
model="account.financial.report">
<field name="name">Cost of Revenue</field>
<field name="sequence">10</field>
<field name="parent_id"
ref="financial_report_gross_profit"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">account_type</field>
<field name="account_type_ids"
eval="[(4,ref('account.data_account_type_direct_costs'))]"/>
</record>
<record id="account_financial_report_operating_income0"
model="account.financial.report">
<field name="name">Operating Income</field>
<field name="sequence">1</field>
<field name="parent_id"
ref="financial_report_gross_profit"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">account_type</field>
<field name="account_type_ids"
eval="[(4,ref('account.data_account_type_revenue'))]"/>
</record> </record>
<record id="account_financial_report_expense0" <record id="account_financial_report_expense0"
model="account.financial.report"> model="account.financial.report">
<field name="name">Expense</field> <field name="name">Expense</field>
<field name="sign" eval="'-1'"/> <field name="sign" eval="'-1'"/>
<field name="sequence">1</field> <field name="sequence">2</field>
<field name="parent_id" <field name="parent_id"
ref="account_financial_report_profitandloss0"/> ref="account_financial_report_profitandloss0"/>
<field name="display_detail">detail_with_hierarchy</field> <field name="display_detail">detail_with_hierarchy</field>

6
base_accounting_kit/doc/changelog.md

@ -70,3 +70,9 @@
#### UPDT #### UPDT
- Report Configuration Sequence - Report Configuration Sequence
#### 28.05.2021
#### Version 14.0.3.11.9
#### UPDT
- 2 * Dashboard Issue
- Report Configuration Sequence

1125
base_accounting_kit/static/src/js/account_dashboard.js

File diff suppressed because it is too large
Loading…
Cancel
Save