Browse Source

Apr 18 : [FIX] Bug Fixed 'base_accounting_kit'

pull/254/head
AjmalCybro 2 years ago
parent
commit
3427ef02bc
  1. 2
      base_accounting_kit/__manifest__.py
  2. 2
      base_accounting_kit/data/account_financial_report_data.xml
  3. 7
      base_accounting_kit/doc/RELEASE_NOTES.md
  4. 2
      base_accounting_kit/report/report_tax.py
  5. 5
      base_accounting_kit/wizard/financial_report.py

2
base_accounting_kit/__manifest__.py

@ -22,7 +22,7 @@
{ {
'name': 'Odoo 15 Full Accounting Kit', 'name': 'Odoo 15 Full Accounting Kit',
'version': '15.0.2.2.2', 'version': '15.0.2.2.3',
'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,

2
base_accounting_kit/data/account_financial_report_data.xml

@ -78,7 +78,7 @@
<field name="display_detail">detail_with_hierarchy</field> <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_expenses')), (4,ref('account.data_account_type_direct_costs')), (4,ref('account.data_account_type_depreciation'))]"/> eval="[(4,ref('account.data_account_type_expenses')), (4,ref('account.data_account_type_depreciation'))]"/>
</record> </record>
<record id="account_financial_report_balancesheet0" <record id="account_financial_report_balancesheet0"

7
base_accounting_kit/doc/RELEASE_NOTES.md

@ -14,4 +14,9 @@
#### 14.01.2022 #### 14.01.2022
#### Version 15.0.2.0.2 #### Version 15.0.2.0.2
#### FIX #### FIX
- Dashboard cash and bank balance issue fix - Dashboard cash and bank balance issue fix
#### 11.04.2023
#### Version 15.0.2.2.3
#### FIX
- Profit and Loss report issue fix

2
base_accounting_kit/report/report_tax.py

@ -55,7 +55,6 @@ class ReportTax(models.AbstractModel):
return sql return sql
def _compute_from_amls(self, options, taxes): def _compute_from_amls(self, options, taxes):
print("hhhh")
# compute the tax amount # compute the tax amount
sql = self._sql_from_amls_one() sql = self._sql_from_amls_one()
tables, where_clause, where_params = self.env[ tables, where_clause, where_params = self.env[
@ -63,7 +62,6 @@ class ReportTax(models.AbstractModel):
query = sql % (tables, where_clause) query = sql % (tables, where_clause)
self.env.cr.execute(query, where_params) self.env.cr.execute(query, where_params)
results = self.env.cr.fetchall() results = self.env.cr.fetchall()
print("3333",results)
for result in results: for result in results:
if result[0] in taxes: if result[0] in taxes:
taxes[result[0]]['tax'] = abs(result[1]) taxes[result[0]]['tax'] = abs(result[1])

5
base_accounting_kit/wizard/financial_report.py

@ -189,8 +189,7 @@ class FinancialReport(models.TransientModel):
# it's the sum the leaf accounts # it's the sum the leaf accounts
# with such an account type # with such an account type
accounts = self.env['account.account'].search([ accounts = self.env['account.account'].search([
('user_type_id', 'in', report.account_type_ids.ids) ('user_type_id', 'in', report.account_type_ids.ids)])
])
res[report.id]['account'] = self._compute_account_balance( res[report.id]['account'] = self._compute_account_balance(
accounts) accounts)
for value in res[report.id]['account'].values(): for value in res[report.id]['account'].values():
@ -268,11 +267,11 @@ class FinancialReport(models.TransientModel):
# used to display the details of the # used to display the details of the
# financial report, so it's not needed here. # financial report, so it's not needed here.
continue continue
if res[report.id].get('account'): if res[report.id].get('account'):
sub_lines = [] sub_lines = []
for account_id, value \ for account_id, value \
in res[report.id]['account'].items(): in res[report.id]['account'].items():
# if there are accounts to display, # if there are accounts to display,
# we add them to the lines with a level equals # we add them to the lines with a level equals
# to their level in # to their level in

Loading…
Cancel
Save