|
|
@ -1,4 +1,4 @@ |
|
|
|
# -*- encoding: utf-8 -*- |
|
|
|
# -*- coding: utf-8 -*- |
|
|
|
############################################################################## |
|
|
|
# |
|
|
|
# OpenERP, Open Source Management Solution |
|
|
@ -260,8 +260,8 @@ class open_invoices_xls(report_xls): |
|
|
|
partner_name): |
|
|
|
if regroupmode == "regroup": |
|
|
|
c_specs = [('acc_title', self.nbr_columns, 0, 'text', |
|
|
|
' - '.join([account.code, account.name, partner_name |
|
|
|
or _('No partner')])), ] |
|
|
|
' - '.join([account.code, account.name, partner_name or |
|
|
|
_('No partner')])), ] |
|
|
|
else: |
|
|
|
c_specs = [ |
|
|
|
('acc_title', self.nbr_columns, 0, 'text', ' - '. |
|
|
@ -332,10 +332,10 @@ class open_invoices_xls(report_xls): |
|
|
|
else: |
|
|
|
c_specs += [('datedue', 1, 0, 'text', None)] |
|
|
|
c_specs += [ |
|
|
|
('debit', 1, 0, 'number', line.get('debit') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('credit', 1, 0, 'number', line.get('credit') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('debit', 1, 0, 'number', line.get('debit') or 0.0, |
|
|
|
None, style_line_decimal), |
|
|
|
('credit', 1, 0, 'number', line.get('credit') or 0.0, |
|
|
|
None, style_line_decimal), |
|
|
|
] |
|
|
|
|
|
|
|
# determine the formula of the cumulated balance |
|
|
@ -357,8 +357,9 @@ class open_invoices_xls(report_xls): |
|
|
|
if _p.amount_currency(data): |
|
|
|
if account.currency_id: |
|
|
|
c_specs += [ |
|
|
|
('curramount', 1, 0, 'number', line.get('amount_currency') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('curramount', 1, 0, 'number', |
|
|
|
line.get('amount_currency') or 0.0, None, |
|
|
|
style_line_decimal), |
|
|
|
('currcode', 1, 0, 'text', line[ |
|
|
|
'currency_code'], None, style_line_right), |
|
|
|
] |
|
|
@ -428,18 +429,18 @@ class open_invoices_xls(report_xls): |
|
|
|
else: |
|
|
|
c_specs += [('datedue', 1, 0, 'text', None)] |
|
|
|
c_specs += [ |
|
|
|
('debit', 1, 0, 'number', line.get('debit') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('credit', 1, 0, 'number', line.get('credit') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('debit', 1, 0, 'number', line.get('debit') or 0.0, None, |
|
|
|
style_line_decimal), |
|
|
|
('credit', 1, 0, 'number', line.get('credit') or 0.0, None, |
|
|
|
style_line_decimal), |
|
|
|
('cumul', 1, 0, 'number', None, cumul_balance, style_line_decimal), |
|
|
|
] |
|
|
|
if account.currency_id: |
|
|
|
c_specs += [ |
|
|
|
('curramount', 1, 0, 'number', line.get('amount_currency') |
|
|
|
or 0.0, None, style_line_decimal), |
|
|
|
('currcode', 1, 0, 'text', line.get('currency_code') |
|
|
|
or '', None, style_line_right), |
|
|
|
('curramount', 1, 0, 'number', line.get('amount_currency') or |
|
|
|
0.0, None, style_line_decimal), |
|
|
|
('currcode', 1, 0, 'text', line.get('currency_code') or '', |
|
|
|
None, style_line_right), |
|
|
|
] |
|
|
|
else: |
|
|
|
c_specs += [ |
|
|
|