thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Mar 20 : [UPDT] Bug Fixed 'dynamic_accounts_report'

pull/249/merge
AjmalCybro 2 years ago
parent
908568c4f3
commit
5b0aea4277
3 changed files with 100 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dynamic_accounts_report/__manifest__.py
  2. 46
      dynamic_accounts_report/report/general_ledger.xml
  3. 151
      dynamic_accounts_report/wizard/general_ledger.py

2
dynamic_accounts_report/__manifest__.py
View File

@ -22,7 +22,7 @@
{ {
'name': 'Dynamic Financial Reports V16', 'name': 'Dynamic Financial Reports V16',
'version': '16.0.1.0.3', 'version': '16.0.1.0.4',
'category': 'Accounting', 'category': 'Accounting',
'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s', 'live_test_url': 'https://www.youtube.com/watch?v=gVQi9q9Rs-E&t=5s',
'summary': """Dynamic Financial Reports with drill 'summary': """Dynamic Financial Reports with drill

46
dynamic_accounts_report/report/general_ledger.xml
View File

@ -109,29 +109,29 @@
</td> </td>
<td groups="base.group_multi_currency"/> <td groups="base.group_multi_currency"/>
</tr> </tr>
<!-- <tr t-foreach="account['move_lines']" t-as="line">--> <tr t-foreach="account['move_lines']" t-as="line">
<!-- <td><span t-esc="line['ldate']"/></td>--> <td><span t-esc="line['ldate']"/></td>
<!-- <td><span t-esc="line['lcode']"/></td>--> <td><span t-esc="line['lcode']"/></td>
<!-- <td><span t-esc="line['partner_name']"/></td>--> <td><span t-esc="line['partner_name']"/></td>
<!-- <td><span t-if="line['lref']" t-esc="line['lref']"/></td>--> <td><span t-if="line['lref']" t-esc="line['lref']"/></td>
<!-- <td><span t-esc="line['move_name']"/></td>--> <td><span t-esc="line['move_name']"/></td>
<!-- <td><span t-esc="line['lname']"/></td>--> <td><span t-esc="line['lname']"/></td>
<!-- <td class="text-right">--> <td class="text-right">
<!-- <span t-esc="line['debit']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>--> <span t-esc="line['debit']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
<!-- </td>--> </td>
<!-- <td class="text-right">--> <td class="text-right">
<!-- <span t-esc="line['credit']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>--> <span t-esc="line['credit']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
<!-- </td>--> </td>
<!-- <td class="text-right">--> <td class="text-right">
<!-- <span t-esc="line['balance']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>--> <span t-esc="line['balance']" t-options="{'widget': 'monetary', 'display_currency': env.company.currency_id}"/>
<!-- </td>--> </td>
<!-- <t t-if="line['amount_currency']">--> <t t-if="line['amount_currency']">
<!-- <td class="text-right" groups="base.group_multi_currency">--> <td class="text-right" groups="base.group_multi_currency">
<!-- <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>--> <span t-esc="line['amount_currency'] if line['amount_currency'] > 0.00 else ''"/>
<!-- <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>--> <span t-esc="line['currency_code'] if line['amount_currency'] > 0.00 else ''"/>
<!-- </td>--> </td>
<!-- </t>--> </t>
<!-- </tr>--> </tr>
</t> </t>
</tbody> </tbody>
</table> </table>

151
dynamic_accounts_report/wizard/general_ledger.py
View File

@ -366,55 +366,54 @@ class GeneralView(models.TransientModel):
WHERE = "WHERE l.account_id IN %s" WHERE = "WHERE l.account_id IN %s"
# Get move lines base on sql query and Calculate the total balance of move lines # Get move lines base on sql query and Calculate the total balance of move lines
sql = ('''SELECT l.account_id AS account_id, a.code AS code,a.id AS id, a.name AS name, ROUND(COALESCE(SUM(l.debit),0),2) AS debit, ROUND(COALESCE(SUM(l.credit),0),2) AS credit, ROUND(COALESCE(SUM(l.balance),0),2) AS balance sql = ('''SELECT l.id AS lid,m.id AS move_id, l.account_id AS account_id,
l.date AS ldate, j.code AS lcode, l.currency_id, l.amount_currency,
FROM account_move_line l\ l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit,
JOIN account_move m ON (l.move_id=m.id)\ COALESCE(l.credit,0) AS credit, COALESCE(SUM(l.balance),0) AS balance,
LEFT JOIN res_currency c ON (l.currency_id=c.id)\ m.name AS move_name, c.symbol AS currency_code, p.name AS partner_name
LEFT JOIN res_partner p ON (l.partner_id=p.id)\ FROM account_move_line l
LEFT JOIN account_account_tag_account_move_line_rel acc ON (acc.account_move_line_id=l.id) JOIN account_move m ON (l.move_id=m.id)
JOIN account_journal j ON (l.journal_id=j.id)\ LEFT JOIN res_currency c ON (l.currency_id=c.id)
JOIN account_account a ON (l.account_id = a.id) ''' LEFT JOIN res_partner p ON (l.partner_id=p.id)
+ WHERE + new_final_filter + ''' GROUP BY l.account_id, a.code, a.name, a.id''') JOIN account_journal j ON (l.journal_id=j.id)
JOIN account_account a ON (l.account_id = a.id) '''
+ WHERE + new_final_filter + ''' GROUP BY l.id, m.id, l.account_id, l.date, j.code, l.currency_id, l.amount_currency, l.ref, l.name, m.name, c.symbol, c.position, p.name''' )
if data.get('accounts'): if data.get('accounts'):
params = tuple(where_params) params = tuple(where_params)
else: else:
params = (tuple(accounts.ids),) + tuple(where_params) params = (tuple(accounts.ids),) + tuple(where_params)
cr.execute(sql, params) cr.execute(sql, params)
account_res = cr.dictfetchall()
return account_res for row in cr.dictfetchall():
balance = 0
for line in move_lines.get(row['account_id']):
balance += round(line['debit'],2) - round(line['credit'],2)
row['balance'] += round(balance,2)
row['m_id'] = row['account_id']
move_lines[row.pop('account_id')].append(row)
# for row in cr.dictfetchall(): # Calculate the debit, credit and balance for Accounts
# balance = 0 account_res = []
# for line in move_lines.get(row['account_id']): for account in accounts:
# balance += round(line['debit'],2) - round(line['credit'],2) currency = account.currency_id and account.currency_id or account.company_id.currency_id
# row['balance'] += round(balance,2) res = dict((fn, 0.0) for fn in ['credit', 'debit', 'balance'])
# row['m_id'] = row['account_id'] res['code'] = account.code
# move_lines[row.pop('account_id')].append(row) res['name'] = account.name
# res['id'] = account.id
# # Calculate the debit, credit and balance for Accounts res['move_lines'] = move_lines[account.id]
# account_res = [] for line in res.get('move_lines'):
# for account in accounts: res['debit'] += round(line['debit'],2)
# currency = account.currency_id and account.currency_id or account.company_id.currency_id res['credit'] += round(line['credit'],2)
# res = dict((fn, 0.0) for fn in ['credit', 'debit', 'balance']) res['balance'] = round(line['balance'],2)
# res['code'] = account.code if display_account == 'all':
# res['name'] = account.name account_res.append(res)
# res['id'] = account.id if display_account == 'movement' and res.get('move_lines'):
# res['move_lines'] = move_lines[account.id] account_res.append(res)
# for line in res.get('move_lines'): if display_account == 'not_zero' and not currency.is_zero(
# res['debit'] += round(line['debit'],2) res['balance']):
# res['credit'] += round(line['credit'],2) account_res.append(res)
# res['balance'] = round(line['balance'],2)
# if display_account == 'all': return account_res
# account_res.append(res)
# if display_account == 'movement' and res.get('move_lines'):
# account_res.append(res)
# if display_account == 'not_zero' and not currency.is_zero(
# res['balance']):
# account_res.append(res)
#
# return account_res
@api.model @api.model
def _get_currency(self): def _get_currency(self):
@ -501,16 +500,16 @@ class GeneralView(models.TransientModel):
# WHERE += ' AND anltag.account_analytic_tag_id IN %s' % str( # WHERE += ' AND anltag.account_analytic_tag_id IN %s' % str(
# tuple(self.analytic_tags.ids) + tuple([0])) # tuple(self.analytic_tags.ids) + tuple([0]))
sql = ("""SELECT 0 AS lid, l.account_id AS account_id, '' AS ldate, '' AS lcode, 0.0 AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance, '' AS lpartner_id,\ sql = ("""SELECT 0 AS lid, l.account_id AS account_id, '' AS ldate, '' AS lcode, 0.0 AS amount_currency, '' AS lref, 'Initial Balance' AS lname, COALESCE(SUM(l.debit),0.0) AS debit, COALESCE(SUM(l.credit),0.0) AS credit, COALESCE(SUM(l.debit),0) - COALESCE(SUM(l.credit), 0) as balance, '' AS lpartner_id,
'' AS move_name, '' AS mmove_id, '' AS currency_code,\ '' AS move_name, '' AS mmove_id, '' AS currency_code,
NULL AS currency_id,\ NULL AS currency_id,
'' AS invoice_id, '' AS invoice_type, '' AS invoice_number,\ '' AS invoice_id, '' AS invoice_type, '' AS invoice_number,
'' AS partner_name\ '' AS partner_name
FROM account_move_line l\ FROM account_move_line l
LEFT JOIN account_move m ON (l.move_id=m.id)\ LEFT JOIN account_move m ON (l.move_id=m.id)
LEFT JOIN res_currency c ON (l.currency_id=c.id)\ LEFT JOIN res_currency c ON (l.currency_id=c.id)
LEFT JOIN res_partner p ON (l.partner_id=p.id)\ LEFT JOIN res_partner p ON (l.partner_id=p.id)
LEFT JOIN account_move i ON (m.id =i.id)\ LEFT JOIN account_move i ON (m.id =i.id)
LEFT JOIN account_account_tag_account_move_line_rel acc ON (acc.account_move_line_id=l.id) LEFT JOIN account_account_tag_account_move_line_rel acc ON (acc.account_move_line_id=l.id)
JOIN account_journal j ON (l.journal_id=j.id)""" JOIN account_journal j ON (l.journal_id=j.id)"""
+ WHERE + new_filter + ' GROUP BY l.account_id') + WHERE + new_filter + ' GROUP BY l.account_id')
@ -558,16 +557,18 @@ class GeneralView(models.TransientModel):
# tuple(self.analytic_tags.ids) + tuple([0])) # tuple(self.analytic_tags.ids) + tuple([0]))
# Get move lines base on sql query and Calculate the total balance of move lines # Get move lines base on sql query and Calculate the total balance of move lines
sql = ('''SELECT l.id AS lid,m.id AS move_id, l.account_id AS account_id, l.date AS ldate, j.code AS lcode, l.currency_id, l.amount_currency, l.ref AS lref, l.name AS lname, COALESCE(SUM(l.debit),0) AS debit, COALESCE(SUM(l.credit),0) AS credit, COALESCE(SUM(l.balance),0) AS balance,\ sql = ('''SELECT l.id AS lid,m.id AS move_id, l.account_id AS account_id,
m.name AS move_name, c.symbol AS currency_code, p.name AS partner_name\ l.date AS ldate, j.code AS lcode, l.currency_id, l.amount_currency,
FROM account_move_line l\ l.ref AS lref, l.name AS lname, COALESCE(l.debit,0) AS debit,
JOIN account_move m ON (l.move_id=m.id)\ COALESCE(l.credit,0) AS credit, COALESCE(SUM(l.balance),0) AS balance,
LEFT JOIN res_currency c ON (l.currency_id=c.id)\ m.name AS move_name, c.symbol AS currency_code, p.name AS partner_name
LEFT JOIN res_partner p ON (l.partner_id=p.id)\ FROM account_move_line l
LEFT JOIN account_account_tag_account_move_line_rel acc ON (acc.account_move_line_id=l.id) JOIN account_move m ON (l.move_id=m.id)
JOIN account_journal j ON (l.journal_id=j.id)\ LEFT JOIN res_currency c ON (l.currency_id=c.id)
JOIN account_account a ON (l.account_id = a.id) ''' LEFT JOIN res_partner p ON (l.partner_id=p.id)
+ WHERE + new_final_filter + ''' GROUP BY l.id, m.id, l.account_id, l.date, j.code, l.currency_id, l.amount_currency, l.ref, l.name, m.name, c.symbol, c.position, p.name ORDER BY l.date''') JOIN account_journal j ON (l.journal_id=j.id)
JOIN account_account a ON (l.account_id = a.id) '''
+ WHERE + new_final_filter + ''' GROUP BY l.id, m.id, l.account_id, l.date, j.code, l.currency_id, l.amount_currency, l.ref, l.name, m.name, c.symbol, c.position, p.name''')
params = tuple(where_params) params = tuple(where_params)
@ -674,19 +675,19 @@ class GeneralView(models.TransientModel):
sheet.write(row + 1, col + 7, rec_data['debit'], txt) sheet.write(row + 1, col + 7, rec_data['debit'], txt)
sheet.write(row + 1, col + 8, rec_data['credit'], txt) sheet.write(row + 1, col + 8, rec_data['credit'], txt)
sheet.write(row + 1, col + 9, rec_data['balance'], txt) sheet.write(row + 1, col + 9, rec_data['balance'], txt)
# for line_data in rec_data['move_lines']: for line_data in rec_data['move_lines']:
# row += 1 row += 1
# sheet.write(row + 1, col, '', txt) sheet.write(row + 1, col, '', txt)
# sheet.write(row + 1, col + 1, '', txt) sheet.write(row + 1, col + 1, '', txt)
# sheet.write(row + 1, col + 2, line_data.get('ldate'), txt) sheet.write(row + 1, col + 2, line_data.get('ldate'), txt)
# sheet.write(row + 1, col + 3, line_data.get('lcode'), txt) sheet.write(row + 1, col + 3, line_data.get('lcode'), txt)
# sheet.write(row + 1, col + 4, line_data.get('partner_name'), sheet.write(row + 1, col + 4, line_data.get('partner_name'),
# txt) txt)
# sheet.write(row + 1, col + 5, line_data.get('move_name'), txt) sheet.write(row + 1, col + 5, line_data.get('move_name'), txt)
# sheet.write(row + 1, col + 6, line_data.get('lname'), txt) sheet.write(row + 1, col + 6, line_data.get('lname'), txt)
# sheet.write(row + 1, col + 7, line_data.get('debit'), txt) sheet.write(row + 1, col + 7, line_data.get('debit'), txt)
# sheet.write(row + 1, col + 8, line_data.get('credit'), txt) sheet.write(row + 1, col + 8, line_data.get('credit'), txt)
# sheet.write(row + 1, col + 9, line_data.get('balance'), txt) sheet.write(row + 1, col + 9, line_data.get('balance'), txt)
workbook.close() workbook.close()
output.seek(0) output.seek(0)

Write Preview
Loading…
Cancel
Save