Browse Source

[pep8] review on account_financial_report, account_financial_report_horizontal, account_financial_report_webkit_xls, account_journal_report_xls, account_move_line_report_xls

pull/6/head
laetitia.gangloff@acsone.eu 11 years ago
parent
commit
746679c598
  1. 38
      account_financial_report/model/account_financial_report.py
  2. 4
      account_financial_report/report/parser.py
  3. 8
      account_financial_report/wizard/wizard.py
  4. 3
      account_financial_report_webkit_xls/report/partners_balance_xls.py
  5. 3
      account_financial_report_webkit_xls/report/trial_balance_xls.py

38
account_financial_report/model/account_financial_report.py

@ -39,8 +39,9 @@ class account_financial_report(osv.osv):
'company_id': fields.many2one('res.company', 'Company', required=True),
'currency_id': fields.many2one('res.currency', 'Currency',
help="Currency at which this report \
will be expressed. If not selected will\
be used the one set in the company"),
will be expressed. If not selected \
will be used the one set in the \
company"),
'inf_type': fields.selection([('BS', 'Balance Sheet'),
('IS', 'Income Statement')],
'Type',
@ -70,24 +71,21 @@ class account_financial_report(osv.osv):
'account.period', 'afr_period_rel', 'afr_id', 'period_id',
'Periods', help='All periods in the fiscal year if empty'),
'analytic_ledger': fields.boolean('Analytic Ledger',
help="Allows to Generate an Analytic\
Ledger for accounts with moves.\
Available when Balance Sheet and\
'Initial | Debit | Credit | YTD'\
are selected"),
'journal_ledger': fields.boolean('journal Ledger',
help="Allows to Generate an journal\
Ledger for accounts with moves.\
Available when Balance Sheet and\
'Initial | Debit | Credit | YTD'\
are selected"),
'partner_balance': fields.boolean('Partner Balance',
help="Allows to Generate a Partner\
Balance for accounts with moves.\
Available when Balance Sheet and\
'Initial | Debit | Credit | YTD'\
are selected"),
'analytic_ledger': fields.boolean(
'Analytic Ledger',
help="Allows to Generate an Analytic Ledger for accounts with \
moves. Available when Balance Sheet and 'Initial | Debit \
| Credit | YTD' are selected"),
'journal_ledger': fields.boolean(
'journal Ledger',
help="Allows to Generate an journal Ledger for accounts with \
moves. Available when Balance Sheet and 'Initial | Debit | \
Credit | YTD' are selected"),
'partner_balance': fields.boolean(
'Partner Balance',
help="Allows to Generate a Partner Balance for accounts with \
moves. Available when Balance Sheet and 'Initial | Debit | \
Credit | YTD' are selected"),
'tot_check': fields.boolean(
'Summarize?',
help='Checking will add a new line at the end of the Report which \

4
account_financial_report/report/parser.py

@ -127,8 +127,8 @@ class account_balance(report_sxw.rml_parse):
aux.append(period.date_start)
aux.append(period.date_stop)
sorted(aux)
return _('From ') + self.formatLang(aux[0], date=True) + _(' to ')\
+ self.formatLang(aux[-1], date=True)
return _('From ') + self.formatLang(aux[0], date=True) + \
_(' to ') + self.formatLang(aux[-1], date=True)
def get_periods_and_date_text(self, form):
"""

8
account_financial_report/wizard/wizard.py

@ -39,10 +39,10 @@ class wizard_report(osv.osv_memory):
'afr', 'Custom Report',
help='If you have already set a Custom Report, Select it Here.'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'currency_id': fields.many2one('res.currency', 'Currency',
help="Currency at which this report\
will be expressed. If not selected will\
be used the one set in the company"),
'currency_id': fields.many2one(
'res.currency', 'Currency',
help="Currency at which this report will be expressed. If not \
selected will be used the one set in the company"),
'inf_type': fields.selection([('BS', 'Balance Sheet'),
('IS', 'Income Statement')],
'Type',

3
account_financial_report_webkit_xls/report/partners_balance_xls.py

@ -186,7 +186,8 @@ class partners_balance_xls(report_xls):
_p.fiscalyear.name, None, cell_style_right)]
if _p.comparison_mode in ('single', 'multiple'):
for index in range(_p.nb_comparison):
if _p.comp_params[index]['comparison_filter'] == 'filter_year'\
if _p.comp_params[index][
'comparison_filter'] == 'filter_year' \
and _p.comp_params[index].get('fiscalyear', False):
c_specs += [('balance_%s' % index, 1, 0, 'text',
_('Balance %s') %

3
account_financial_report_webkit_xls/report/trial_balance_xls.py

@ -190,7 +190,8 @@ class trial_balance_xls(report_xls):
_p.fiscalyear.name, None, cell_style_right)]
if _p.comparison_mode in ('single', 'multiple'):
for index in range(_p.nb_comparison):
if _p.comp_params[index]['comparison_filter'] == 'filter_year'\
if _p.comp_params[index][
'comparison_filter'] == 'filter_year' \
and _p.comp_params[index].get('fiscalyear', False):
c_specs += [('balance_%s' % index, 1, 0, 'text',
_('Balance %s') %

Loading…
Cancel
Save