NaNtic
/
trytond-account_reports
mirror of https://github.com/NaN-tic/trytond-account_reports.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix 'ids' when call execute for print the report. 

Fix PEP8
This commit is contained in:
Bernat Brunet 2023-01-24 12:35:01 +01:00
parent 158f89002a
commit 626059d87d
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
general_ledger/general_ledger.py
View File

@ -42,8 +42,9 @@ class PrintGeneralLedgerStart(ModelView):
],
depends=['fiscalyear', 'start_period'])
accounts = fields.Many2Many('account.account', None, None, 'Accounts')
all_accounts = fields.Boolean('All accounts with and without balance', help='If unchecked only '
'print accounts with previous balance different from 0 or with moves')
all_accounts = fields.Boolean('All accounts with and without balance',
help='If unchecked only print accounts with previous balance different'
' from 0 or with moves')
parties = fields.Many2Many('party.party', None, None, 'Parties',
context={
'company': Eval('company'),
@ -64,8 +65,8 @@ class PrintGeneralLedgerStart(ModelView):
('name', '=', 'account_jasper_reports'),
('state', '=', 'activated')], limit=1)
if account_jasper_report_activated:
deactivate_menu_entry('account_jasper_reports', 'menu_print_general_ledger')
deactivate_menu_entry('account_jasper_reports',
'menu_print_general_ledger')
@staticmethod
def default_fiscalyear():
@ -207,8 +208,8 @@ class GeneralLedgerReport(HTMLReport):
parameters = {}
parameters['company'] = company.rec_name
parameters['company_vat'] = (company.party.tax_identifier and
company.party.tax_identifier.code) or ''
parameters['company_vat'] = (company.party.tax_identifier
and company.party.tax_identifier.code) or ''
parameters['start_period'] = start_period and start_period or ''
parameters['end_period'] = end_period and end_period or ''
parameters['fiscal_year'] = fiscalyear.rec_name
@ -260,13 +261,14 @@ class GeneralLedgerReport(HTMLReport):
""" % where)
line_ids = [x[0] for x in cursor.fetchall()]
start_date = start_period.start_date if start_period else fiscalyear.start_date
start_date = (start_period.start_date if start_period
else fiscalyear.start_date)
initial_balance_date = start_date - timedelta(days=1)
with Transaction().set_context(date=initial_balance_date):
init_values = {}
if not parties:
init_values = Account.read_account_vals(accounts, with_moves=False,
exclude_party_moves=True)
init_values = Account.read_account_vals(accounts,
with_moves=False, exclude_party_moves=True)
init_party_values = Party.get_account_values_by_party(
parties, accounts, fiscalyear.company)
@ -279,8 +281,7 @@ class GeneralLedgerReport(HTMLReport):
for line in Line.browse(group_lines):
if line.account not in accounts_w_moves:
accounts_w_moves.append(line.account.id)
if (line.account.type.receivable == True or
line.account.type.payable == True) :
if line.account.type.receivable or line.account.type.payable:
currentKey = (line.account, line.party and line.party
or None)
else:
@ -294,8 +295,8 @@ class GeneralLedgerReport(HTMLReport):
balance = init_party_values.get(account_id,
{}).get(party_id, {}).get('balance', Decimal(0))
else:
balance = init_values.get(account_id, {}).get('balance',
Decimal(0))
balance = init_values.get(account_id, {}).get(
'balance', Decimal(0))
credit = line.credit
debit = line.debit
balance += line.debit - line.credit
@ -304,8 +305,8 @@ class GeneralLedgerReport(HTMLReport):
rline = {
'sequence': sequence,
'line': line,
'ref': (line.origin.rec_name if line.origin and
hasattr(line.origin, 'rec_name') else None),
'ref': (line.origin.rec_name if line.origin
and hasattr(line.origin, 'rec_name') else None),
'credit': credit,
'debit': debit,
'balance': balance,
@ -331,7 +332,8 @@ class GeneralLedgerReport(HTMLReport):
if data.get('all_accounts', True):
init_values_account_wo_moves = {
k: init_values[k] for k in init_values if k not in accounts_w_moves}
k: init_values[k] for k in init_values
if k not in accounts_w_moves}
for account_id, values in init_values_account_wo_moves.items():
account = Account(account_id)
balance = values.get('balance', Decimal(0))
@ -405,7 +407,7 @@ class GeneralLedgerReport(HTMLReport):
os.path.dirname(__file__), 'translations')
with Transaction().set_context(**context):
return super(GeneralLedgerReport, cls).execute(records, {
return super(GeneralLedgerReport, cls).execute(ids, {
'name': 'account_reports.general_ledger',
'model': 'account.move.line',
'records': records,