[pep8] - account_financial_report_webkit_xls

account_financial_report_webkit_xls/__init__.py

@@ -25,5 +25,5 @@ try:
     from . import report
 except ImportError:
     import logging
-    logging.getLogger('openerp.module').warning('report_xls not available in addons path. account_financial_report_webkit_xls will not be usable')
-
+    logging.getLogger('openerp.module').warning('''report_xls not available in
+    addons path. account_financial_report_webkit_xls will not be usable''')

account_financial_report_webkit_xls/__openerp__.py

@@ -25,7 +25,7 @@
     'license': 'AGPL-3',
     'author': 'Noviat',
     'category': 'Generic Modules/Accounting',
-    'description': """ 
+    'description': """
 
     This module adds XLS export to the following accounting reports:
         - general ledger
@@ -33,14 +33,14 @@
         - partner ledger
         - partner balance
         - open invoices
-        
+
     """,
     'depends': ['report_xls', 'account_financial_report_webkit'],
     'demo_xml': [],
     'init_xml': [],
-    'update_xml' : [
-        'wizard/general_ledger_wizard_view.xml',   
-        'wizard/trial_balance_wizard_view.xml',   
+    'update_xml': [
+        'wizard/general_ledger_wizard_view.xml',
+        'wizard/trial_balance_wizard_view.xml',
         'wizard/partners_ledger_wizard_view.xml',
         'wizard/partners_balance_wizard_view.xml',
         'wizard/open_invoices_wizard_view.xml',

account_financial_report_webkit_xls/report/__init__.py

@@ -26,4 +26,4 @@ from . import partners_balance_xls
 from . import partner_ledger_xls
 from . import open_invoices_xls
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

account_financial_report_webkit_xls/report/general_ledger_xls.py

@@ -21,12 +21,11 @@
 ##############################################################################
 
 import xlwt
-import time
 from datetime import datetime
-from openerp.report import report_sxw
 from openerp.addons.report_xls.report_xls import report_xls
 from openerp.addons.report_xls.utils import rowcol_to_cell
-from openerp.addons.account_financial_report_webkit.report.general_ledger import GeneralLedgerWebkit
+from openerp.addons.account_financial_report_webkit.report.general_ledger\
+    import GeneralLedgerWebkit
 from openerp.tools.translate import _
 #import logging
 #_logger = logging.getLogger(__name__)
@@ -40,47 +39,55 @@ _column_sizes = [
     ('partner', 30),
     ('label', 45),
     ('counterpart', 30),
-    ('debit', 15), 
+    ('debit', 15),
     ('credit', 15),
     ('cumul_bal', 15),
-    ('curr_bal', 15), 
+    ('curr_bal', 15),
     ('curr_code', 7),
 ]
 
+
 class general_ledger_xls(report_xls):
     column_sizes = [x[1] for x in _column_sizes]
-    
+
     def generate_xls_report(self, _p, _xs, data, objects, wb):
-        
+
         ws = wb.add_sheet(_p.report_name[:31])
         ws.panes_frozen = True
         ws.remove_splits = True
-        ws.portrait = 0 # Landscape
+        ws.portrait = 0  # Landscape
         ws.fit_width_to_pages = 1
         row_pos = 0
-        
+
         # set print header/footer
         ws.header_str = self.xls_headers['standard']
         ws.footer_str = self.xls_footers['standard']
-        
-        # cf. account_report_general_ledger.mako  
-        initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
+
+        # cf. account_report_general_ledger.mako
+        initial_balance_text = {'initial_balance': _('Computed'),
+                                'opening_balance': _('Opening Entries'),
+                                False: _('No')}
 
         # Title
         cell_style = xlwt.easyxf(_xs['xls_title'])
-        report_name =  ' - '.join([_p.report_name.upper(), _p.company.partner_id.name, _p.company.currency_id.name])
+        report_name = ' - '.join([_p.report_name.upper(),
+                                 _p.company.partner_id.name,
+                                 _p.company.currency_id.name])
         c_specs = [
             ('report_name', 1, 0, 'text', report_name),
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
 
         # write empty row to define column sizes
         c_sizes = self.column_sizes
-        c_specs = [('empty%s'%i, 1, c_sizes[i], 'text', None) for i in range(0,len(c_sizes))]
+        c_specs = [('empty%s' % i, 1, c_sizes[i], 'text', None)
+                   for i in range(0, len(c_sizes))]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, set_column_size=True)        
-        
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, set_column_size=True)
+
         # Header Table
         cell_format = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
@@ -88,14 +95,16 @@ class general_ledger_xls(report_xls):
         c_specs = [
             ('coa', 2, 0, 'text', _('Chart of Account')),
             ('fy', 1, 0, 'text', _('Fiscal Year')),
-            ('df', 3, 0, 'text', _p.filter_form(data) == 'filter_date' and _('Dates Filter') or _('Periods Filter')),
+            ('df', 3, 0, 'text', _p.filter_form(data) ==
+             'filter_date' and _('Dates Filter') or _('Periods Filter')),
             ('af', 1, 0, 'text', _('Accounts Filter')),
             ('tm', 2, 0, 'text',  _('Target Moves')),
             ('ib', 2, 0, 'text',  _('Initial Balance')),
 
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_center)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style_center)
 
         cell_format = _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
@@ -106,7 +115,7 @@ class general_ledger_xls(report_xls):
         ]
         df = _('From') + ': '
         if _p.filter_form(data) == 'filter_date':
-            df += _p.start_date if _p.start_date else u'' 
+            df += _p.start_date if _p.start_date else u''
         else:
             df += _p.start_period.name if _p.start_period else u''
         df += ' ' + _('To') + ': '
@@ -116,13 +125,16 @@ class general_ledger_xls(report_xls):
             df += _p.stop_period.name if _p.stop_period else u''
         c_specs += [
             ('df', 3, 0, 'text', df),
-            ('af', 1, 0, 'text', _p.accounts(data) and ', '.join([account.code for account in _p.accounts(data)]) or _('All')),
+            ('af', 1, 0, 'text', _p.accounts(data) and ', '.join(
+                [account.code for account in _p.accounts(data)]) or _('All')),
             ('tm', 2, 0, 'text', _p.display_target_move(data)),
-            ('ib', 2, 0, 'text', initial_balance_text[_p.initial_balance_mode]),
-        ]       
+            ('ib', 2, 0, 'text', initial_balance_text[
+             _p.initial_balance_mode]),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_center)  
-        ws.set_horz_split_pos(row_pos)   
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style_center)
+        ws.set_horz_split_pos(row_pos)
         row_pos += 1
 
         # Column Title Row
@@ -134,153 +146,208 @@ class general_ledger_xls(report_xls):
         c_hdr_cell_style = xlwt.easyxf(cell_format)
         c_hdr_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         c_hdr_cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
-        c_hdr_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
+        c_hdr_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
 
         # Column Initial Balance Row
         cell_format = _xs['italic'] + _xs['borders_all']
         c_init_cell_style = xlwt.easyxf(cell_format)
         c_init_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         c_init_cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
-        c_init_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
+        c_init_cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
 
         c_specs = [
             ('date', 1, 0, 'text', _('Date'), None, c_hdr_cell_style),
             ('period', 1, 0, 'text', _('Period'), None, c_hdr_cell_style),
             ('move', 1, 0, 'text', _('Entry'), None, c_hdr_cell_style),
             ('journal', 1, 0, 'text', _('Journal'), None, c_hdr_cell_style),
-            ('account_code', 1, 0, 'text', _('Account'), None, c_hdr_cell_style),
+            ('account_code', 1, 0, 'text',
+             _('Account'), None, c_hdr_cell_style),
             ('partner', 1, 0, 'text', _('Partner'), None, c_hdr_cell_style),
             ('label', 1, 0, 'text', _('Label'), None, c_hdr_cell_style),
-            ('counterpart', 1, 0, 'text', _('Counterpart'), None, c_hdr_cell_style),
+            ('counterpart', 1, 0, 'text',
+             _('Counterpart'), None, c_hdr_cell_style),
             ('debit', 1, 0, 'text', _('Debit'), None, c_hdr_cell_style_right),
-            ('credit', 1, 0, 'text', _('Credit'), None, c_hdr_cell_style_right),
-            ('cumul_bal', 1, 0, 'text', _('Cumul. Bal.'), None, c_hdr_cell_style_right),                    
-        ]  
+            ('credit', 1, 0, 'text', _('Credit'),
+             None, c_hdr_cell_style_right),
+            ('cumul_bal', 1, 0, 'text', _('Cumul. Bal.'),
+             None, c_hdr_cell_style_right),
+        ]
         if _p.amount_currency(data):
             c_specs += [
-            ('curr_bal', 1, 0, 'text', _('Curr. Bal.'), None, c_hdr_cell_style_right),
-            ('curr_code', 1, 0, 'text', _('Curr.'), None, c_hdr_cell_style_center),
+                ('curr_bal', 1, 0, 'text', _('Curr. Bal.'),
+                 None, c_hdr_cell_style_right),
+                ('curr_code', 1, 0, 'text', _('Curr.'),
+                 None, c_hdr_cell_style_center),
             ]
         c_hdr_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        
+
         # cell styles for ledger lines
         ll_cell_format = _xs['borders_all']
         ll_cell_style = xlwt.easyxf(ll_cell_format)
         ll_cell_style_right = xlwt.easyxf(ll_cell_format + _xs['right'])
         ll_cell_style_center = xlwt.easyxf(ll_cell_format + _xs['center'])
-        ll_cell_style_date = xlwt.easyxf(ll_cell_format + _xs['left'], num_format_str = report_xls.date_format)
-        ll_cell_style_decimal = xlwt.easyxf(ll_cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        
+        ll_cell_style_date = xlwt.easyxf(
+            ll_cell_format + _xs['left'],
+            num_format_str=report_xls.date_format)
+        ll_cell_style_decimal = xlwt.easyxf(
+            ll_cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+
         cnt = 0
         for account in objects:
 
-            display_initial_balance = account.init_balance and (account.init_balance.get('debit', 0.0) != 0.0 or account.init_balance.get('credit', 0.0) != 0.0)
+            display_initial_balance = account.init_balance and\
+                (account.init_balance.get(
+                    'debit', 0.0) != 0.0 or account.
+                    init_balance.get('credit', 0.0) != 0.0)
             display_ledger_lines = account.ledger_lines
 
-            if _p.display_account_raw(data) == 'all' or (display_ledger_lines or display_initial_balance):
-                #TO DO : replace cumul amounts by xls formulas
+            if _p.display_account_raw(data) == 'all' or\
+                    (display_ledger_lines or display_initial_balance):
+                # TO DO : replace cumul amounts by xls formulas
                 cnt += 1
                 cumul_debit = 0.0
                 cumul_credit = 0.0
-                cumul_balance =  0.0
+                cumul_balance = 0.0
                 cumul_balance_curr = 0.0
                 c_specs = [
-                    ('acc_title', 11, 0, 'text', ' - '.join([account.code, account.name])),
+                    ('acc_title', 11, 0, 'text',
+                     ' - '.join([account.code, account.name])),
                 ]
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, c_title_cell_style)    
-                row_pos = self.xls_write_row(ws, row_pos, c_hdr_data)   
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, c_title_cell_style)
+                row_pos = self.xls_write_row(ws, row_pos, c_hdr_data)
                 row_start = row_pos
 
                 if display_initial_balance:
                     cumul_debit = account.init_balance.get('debit') or 0.0
                     cumul_credit = account.init_balance.get('credit') or 0.0
-                    cumul_balance = account.init_balance.get('init_balance') or 0.0
-                    cumul_balance_curr = account.init_balance.get('init_balance_currency') or 0.0     
-                    debit_cell = rowcol_to_cell(row_pos, 8)                
+                    cumul_balance = account.init_balance.get(
+                        'init_balance') or 0.0
+                    cumul_balance_curr = account.init_balance.get(
+                        'init_balance_currency') or 0.0
+                    debit_cell = rowcol_to_cell(row_pos, 8)
                     credit_cell = rowcol_to_cell(row_pos, 9)
-                    bal_formula = debit_cell + '-' + credit_cell                              
-                    c_specs = [('empty%s' %x, 1, 0, 'text', None) for x in range(6)]
+                    bal_formula = debit_cell + '-' + credit_cell
+                    c_specs = [('empty%s' % x, 1, 0, 'text', None)
+                               for x in range(6)]
                     c_specs += [
                         ('init_bal', 1, 0, 'text', _('Initial Balance')),
                         ('counterpart', 1, 0, 'text', None),
-                        ('debit', 1, 0, 'number', cumul_debit, None, c_init_cell_style_decimal),
-                        ('credit', 1, 0, 'number', cumul_credit, None, c_init_cell_style_decimal),
-                        ('cumul_bal', 1, 0, 'number', cumul_balance, None, c_init_cell_style_decimal),                    
-                    ]  
+                        ('debit', 1, 0, 'number', cumul_debit,
+                         None, c_init_cell_style_decimal),
+                        ('credit', 1, 0, 'number', cumul_credit,
+                         None, c_init_cell_style_decimal),
+                        ('cumul_bal', 1, 0, 'number', cumul_balance,
+                         None, c_init_cell_style_decimal),
+                    ]
                     if _p.amount_currency(data):
                         c_specs += [
-                        ('curr_bal', 1, 0, 'number', cumul_balance_curr, None, c_init_cell_style_decimal),
-                        ('curr_code', 1, 0, 'text', None),
+                            ('curr_bal', 1, 0, 'number', cumul_balance_curr,
+                             None, c_init_cell_style_decimal),
+                            ('curr_code', 1, 0, 'text', None),
                         ]
-                    row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                    row_pos = self.xls_write_row(ws, row_pos, row_data, c_init_cell_style) 
+                    row_data = self.xls_row_template(
+                        c_specs, [x[0] for x in c_specs])
+                    row_pos = self.xls_write_row(
+                        ws, row_pos, row_data, c_init_cell_style)
 
                 for line in account.ledger_lines:
-                    
+
                     cumul_debit += line.get('debit') or 0.0
                     cumul_credit += line.get('credit') or 0.0
                     cumul_balance_curr += line.get('amount_currency') or 0.0
                     cumul_balance += line.get('balance') or 0.0
                     label_elements = [line.get('lname') or '']
                     if line.get('invoice_number'):
-                      label_elements.append("(%s)" % (line['invoice_number'],))
+                        label_elements.append(
+                            "(%s)" % (line['invoice_number'],))
                     label = ' '.join(label_elements)
 
                     if line.get('ldate'):
                         c_specs = [
-                            ('ldate', 1, 0, 'date', datetime.strptime(line['ldate'],'%Y-%m-%d'), None, ll_cell_style_date),
+                            ('ldate', 1, 0, 'date', datetime.strptime(
+                                line['ldate'], '%Y-%m-%d'), None,
+                             ll_cell_style_date),
                         ]
                     else:
                         c_specs = [
                             ('ldate', 1, 0, 'text', None),
-                        ]    
+                        ]
                     c_specs += [
-                        ('period', 1, 0, 'text', line.get('period_code') or ''),
+                        ('period', 1, 0, 'text',
+                         line.get('period_code') or ''),
                         ('move', 1, 0, 'text', line.get('move_name') or ''),
                         ('journal', 1, 0, 'text', line.get('jcode') or ''),
                         ('account_code', 1, 0, 'text', account.code),
-                        ('partner', 1, 0, 'text', line.get('partner_name') or ''),
+                        ('partner', 1, 0, 'text',
+                         line.get('partner_name') or ''),
                         ('label', 1, 0, 'text', label),
-                        ('counterpart', 1, 0, 'text', line.get('counterparts') or ''),
-                        ('debit', 1, 0, 'number', line.get('debit', 0.0), None, ll_cell_style_decimal),
-                        ('credit', 1, 0, 'number', line.get('credit', 0.0), None, ll_cell_style_decimal),
-                        ('cumul_bal', 1, 0, 'number', cumul_balance, None, ll_cell_style_decimal),
-                    ]  
+                        ('counterpart', 1, 0, 'text',
+                         line.get('counterparts') or ''),
+                        ('debit', 1, 0, 'number', line.get('debit', 0.0),
+                         None, ll_cell_style_decimal),
+                        ('credit', 1, 0, 'number', line.get('credit', 0.0),
+                         None, ll_cell_style_decimal),
+                        ('cumul_bal', 1, 0, 'number', cumul_balance,
+                         None, ll_cell_style_decimal),
+                    ]
                     if _p.amount_currency(data):
                         c_specs += [
-                        ('curr_bal', 1, 0, 'number', line.get('amount_currency') or 0.0, None, ll_cell_style_decimal),
-                        ('curr_code', 1, 0, 'text', line.get('currency_code') or '', None, ll_cell_style_center),
+                            ('curr_bal', 1, 0, 'number', line.get(
+                                'amount_currency') or 0.0, None,
+                             ll_cell_style_decimal),
+                            ('curr_code', 1, 0, 'text', line.get(
+                                'currency_code') or '', None,
+                             ll_cell_style_center),
                         ]
-                    row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                    row_pos = self.xls_write_row(ws, row_pos, row_data, ll_cell_style) 
-                
-                debit_start = rowcol_to_cell(row_start, 8)                
-                debit_end = rowcol_to_cell(row_pos-1, 8)
+                    row_data = self.xls_row_template(
+                        c_specs, [x[0] for x in c_specs])
+                    row_pos = self.xls_write_row(
+                        ws, row_pos, row_data, ll_cell_style)
+
+                debit_start = rowcol_to_cell(row_start, 8)
+                debit_end = rowcol_to_cell(row_pos - 1, 8)
                 debit_formula = 'SUM(' + debit_start + ':' + debit_end + ')'
-                credit_start = rowcol_to_cell(row_start, 9)                
-                credit_end = rowcol_to_cell(row_pos-1, 9)
+                credit_start = rowcol_to_cell(row_start, 9)
+                credit_end = rowcol_to_cell(row_pos - 1, 9)
                 credit_formula = 'SUM(' + credit_start + ':' + credit_end + ')'
-                balance_debit = rowcol_to_cell(row_pos, 8)                
+                balance_debit = rowcol_to_cell(row_pos, 8)
                 balance_credit = rowcol_to_cell(row_pos, 9)
                 balance_formula = balance_debit + '-' + balance_credit
                 c_specs = [
-                    ('acc_title', 7, 0, 'text', ' - '.join([account.code, account.name])),
-                    ('cum_bal', 1, 0, 'text', _('Cumulated Balance on Account'), None, c_hdr_cell_style_right),
-                    ('debit', 1, 0, 'number', None, debit_formula, c_hdr_cell_style_decimal),             
-                    ('credit', 1, 0, 'number', None, credit_formula, c_hdr_cell_style_decimal),             
-                    ('balance', 1, 0, 'number', None, balance_formula, c_hdr_cell_style_decimal),                       
+                    ('acc_title', 7, 0, 'text',
+                     ' - '.join([account.code, account.name])),
+                    ('cum_bal', 1, 0, 'text',
+                     _('Cumulated Balance on Account'),
+                     None, c_hdr_cell_style_right),
+                    ('debit', 1, 0, 'number', None,
+                     debit_formula, c_hdr_cell_style_decimal),
+                    ('credit', 1, 0, 'number', None,
+                     credit_formula, c_hdr_cell_style_decimal),
+                    ('balance', 1, 0, 'number', None,
+                     balance_formula, c_hdr_cell_style_decimal),
                 ]
                 if _p.amount_currency(data):
                     if account.currency_id:
-                        c_specs += [('curr_bal', 1, 0, 'number', cumul_balance_curr, None, c_hdr_cell_style_decimal)]
+                        c_specs += [('curr_bal', 1, 0, 'number',
+                                     cumul_balance_curr, None,
+                                     c_hdr_cell_style_decimal)]
                     else:
                         c_specs += [('curr_bal', 1, 0, 'text', None)]
                     c_specs += [('curr_code', 1, 0, 'text', None)]
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, c_hdr_cell_style) 
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, c_hdr_cell_style)
                 row_pos += 1
 
-general_ledger_xls('report.account.account_report_general_ledger_xls', 'account.account',
-    parser=GeneralLedgerWebkit)
+general_ledger_xls('report.account.account_report_general_ledger_xls',
+                   'account.account',
+                   parser=GeneralLedgerWebkit)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

account_financial_report_webkit_xls/report/partner_ledger_xls.py

@@ -21,12 +21,11 @@
 ##############################################################################
 
 import xlwt
-import time
 from datetime import datetime
-from openerp.report import report_sxw
 from openerp.addons.report_xls.report_xls import report_xls
 from openerp.addons.report_xls.utils import rowcol_to_cell
-from openerp.addons.account_financial_report_webkit.report.partners_ledger import PartnersLedgerWebkit
+from openerp.addons.account_financial_report_webkit.report.partners_ledger\
+    import PartnersLedgerWebkit
 from openerp.tools.translate import _
 #import logging
 #_logger = logging.getLogger(__name__)
@@ -39,65 +38,75 @@ _column_sizes = [
     ('partner', 30),
     ('label', 58),
     ('rec', 12),
-    ('debit', 15), 
+    ('debit', 15),
     ('credit', 15),
     ('cumul_bal', 15),
-    ('curr_bal', 15), 
+    ('curr_bal', 15),
     ('curr_code', 7),
 ]
 
+
 class partner_ledger_xls(report_xls):
     column_sizes = [x[1] for x in _column_sizes]
-    
+
     def generate_xls_report(self, _p, _xs, data, objects, wb):
-        
+
         ws = wb.add_sheet(_p.report_name[:31])
         ws.panes_frozen = True
         ws.remove_splits = True
-        ws.portrait = 0 # Landscape
+        ws.portrait = 0  # Landscape
         ws.fit_width_to_pages = 1
         row_pos = 0
-        
+
         # set print header/footer
         ws.header_str = self.xls_headers['standard']
         ws.footer_str = self.xls_footers['standard']
-        
-        # cf. account_report_partner_ledger.mako  
-        initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
+
+        # cf. account_report_partner_ledger.mako
+        initial_balance_text = {'initial_balance': _('Computed'),
+                                'opening_balance': _('Opening Entries'),
+                                False: _('No')}
 
         # Title
         cell_style = xlwt.easyxf(_xs['xls_title'])
-        report_name =  ' - '.join([_p.report_name.upper(), _p.company.partner_id.name, _p.company.currency_id.name])
+        report_name = ' - '.join([_p.report_name.upper(),
+                                 _p.company.partner_id.name,
+                                 _p.company.currency_id.name])
         c_specs = [
             ('report_name', 1, 0, 'text', report_name),
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
 
         # write empty row to define column sizes
         c_sizes = self.column_sizes
-        c_specs = [('empty%s'%i, 1, c_sizes[i], 'text', None) for i in range(0,len(c_sizes))]
+        c_specs = [('empty%s' % i, 1, c_sizes[i], 'text', None)
+                   for i in range(0, len(c_sizes))]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, set_column_size=True)        
-        
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, set_column_size=True)
+
         # Header Table
-        nbr_columns = 10  
+        nbr_columns = 10
         if _p.amount_currency(data):
-            nbr_columns = 12        
+            nbr_columns = 12
         cell_format = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
         c_specs = [
             ('coa', 2, 0, 'text', _('Chart of Account')),
             ('fy', 1, 0, 'text', _('Fiscal Year')),
-            ('df', 2, 0, 'text', _p.filter_form(data) == 'filter_date' and _('Dates Filter') or _('Periods Filter')),
+            ('df', 2, 0, 'text', _p.filter_form(data) ==
+             'filter_date' and _('Dates Filter') or _('Periods Filter')),
             ('af', 1, 0, 'text', _('Accounts Filter')),
             ('tm', 2, 0, 'text',  _('Target Moves')),
-            ('ib', nbr_columns-8, 0, 'text',  _('Initial Balance')),
+            ('ib', nbr_columns - 8, 0, 'text',  _('Initial Balance')),
 
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_center)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style_center)
 
         cell_format = _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
@@ -108,7 +117,7 @@ class partner_ledger_xls(report_xls):
         ]
         df = _('From') + ': '
         if _p.filter_form(data) == 'filter_date':
-            df += _p.start_date if _p.start_date else u'' 
+            df += _p.start_date if _p.start_date else u''
         else:
             df += _p.start_period.name if _p.start_period else u''
         df += ' ' + _('To') + ': '
@@ -118,20 +127,26 @@ class partner_ledger_xls(report_xls):
             df += _p.stop_period.name if _p.stop_period else u''
         c_specs += [
             ('df', 2, 0, 'text', df),
-            ('af', 1, 0, 'text', _('Custom Filter') if _p.partner_ids else _p.display_partner_account(data)),
+            ('af', 1, 0, 'text', _('Custom Filter')
+             if _p.partner_ids else _p.display_partner_account(data)),
             ('tm', 2, 0, 'text', _p.display_target_move(data)),
-            ('ib', nbr_columns-8, 0, 'text', initial_balance_text[_p.initial_balance_mode]),
-        ]       
+            ('ib', nbr_columns - 8, 0, 'text',
+             initial_balance_text[_p.initial_balance_mode]),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_center)  
-        ws.set_horz_split_pos(row_pos)          
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style_center)
+        ws.set_horz_split_pos(row_pos)
         row_pos += 1
 
         # Account Title Row
-        cell_format = _xs['xls_title'] + _xs['bold'] + _xs['fill'] + _xs['borders_all']
+        cell_format = _xs['xls_title'] + _xs['bold'] + \
+            _xs['fill'] + _xs['borders_all']
         account_cell_style = xlwt.easyxf(cell_format)
-        account_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])        
-        account_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
+        account_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
+        account_cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
 
         # Column Title Row
         cell_format = _xs['bold']
@@ -142,26 +157,32 @@ class partner_ledger_xls(report_xls):
         c_hdr_cell_style = xlwt.easyxf(cell_format)
         c_hdr_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         c_hdr_cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
-        c_hdr_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
+        c_hdr_cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
 
         # Column Initial Balance Row
         cell_format = _xs['italic'] + _xs['borders_all']
         c_init_cell_style = xlwt.easyxf(cell_format)
         c_init_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         c_init_cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
-        c_init_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        
+        c_init_cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+
         # Column Cumulated balance Row
         cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all']
         c_cumul_cell_style = xlwt.easyxf(cell_format)
         c_cumul_cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         c_cumul_cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
-        c_cumul_cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        
-         # Column Partner Row
+        c_cumul_cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+
+        # Column Partner Row
         cell_format = _xs['bold']
         c_part_cell_style = xlwt.easyxf(cell_format)
-        
+
         c_specs = [
             ('date', 1, 0, 'text', _('Date'), None, c_hdr_cell_style),
             ('period', 1, 0, 'text', _('Period'), None, c_hdr_cell_style),
@@ -171,13 +192,17 @@ class partner_ledger_xls(report_xls):
             ('label', 1, 0, 'text', _('Label'), None, c_hdr_cell_style),
             ('rec', 1, 0, 'text', _('Rec.'), None, c_hdr_cell_style),
             ('debit', 1, 0, 'text', _('Debit'), None, c_hdr_cell_style_right),
-            ('credit', 1, 0, 'text', _('Credit'), None, c_hdr_cell_style_right),
-            ('cumul_bal', 1, 0, 'text', _('Cumul. Bal.'), None, c_hdr_cell_style_right),                    
+            ('credit', 1, 0, 'text', _('Credit'),
+             None, c_hdr_cell_style_right),
+            ('cumul_bal', 1, 0, 'text', _('Cumul. Bal.'),
+             None, c_hdr_cell_style_right),
         ]
         if _p.amount_currency(data):
             c_specs += [
-                ('curr_bal', 1, 0, 'text', _('Curr. Bal.'), None, c_hdr_cell_style_right),
-                ('curr_code', 1, 0, 'text', _('Curr.'), None, c_hdr_cell_style_center),
+                ('curr_bal', 1, 0, 'text', _('Curr. Bal.'),
+                 None, c_hdr_cell_style_right),
+                ('curr_code', 1, 0, 'text', _('Curr.'),
+                 None, c_hdr_cell_style_center),
             ]
         c_hdr_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
 
@@ -186,12 +211,16 @@ class partner_ledger_xls(report_xls):
         ll_cell_style = xlwt.easyxf(ll_cell_format)
         ll_cell_style_right = xlwt.easyxf(ll_cell_format + _xs['right'])
         ll_cell_style_center = xlwt.easyxf(ll_cell_format + _xs['center'])
-        ll_cell_style_date = xlwt.easyxf(ll_cell_format + _xs['left'], num_format_str = report_xls.date_format)
-        ll_cell_style_decimal = xlwt.easyxf(ll_cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        
+        ll_cell_style_date = xlwt.easyxf(
+            ll_cell_format + _xs['left'],
+            num_format_str=report_xls.date_format)
+        ll_cell_style_decimal = xlwt.easyxf(
+            ll_cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+
         cnt = 0
         for account in objects:
-            if account.ledger_lines or account.init_balance:            
+            if account.ledger_lines or account.init_balance:
                 if not account.partners_order:
                     continue
                 cnt += 1
@@ -200,15 +229,20 @@ class partner_ledger_xls(report_xls):
                 account_balance_cumul = 0.0
                 account_balance_cumul_curr = 0.0
                 c_specs = [
-                    ('acc_title', nbr_columns, 0, 'text', ' - '.join([account.code, account.name]), None, account_cell_style),
+                    ('acc_title', nbr_columns, 0, 'text',
+                     ' - '.join([account.code, account.name]), None,
+                     account_cell_style),
                 ]
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, c_title_cell_style)    
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, c_title_cell_style)
                 row_pos += 1
                 row_start_account = row_pos
-            
-                for partner_name, p_id, p_ref, p_name in account.partners_order:
-                    
+
+                for partner_name, p_id, p_ref, p_name in\
+                        account.partners_order:
+
                     total_debit = 0.0
                     total_credit = 0.0
                     cumul_balance = 0.0
@@ -216,48 +250,67 @@ class partner_ledger_xls(report_xls):
                     part_cumul_balance = 0.0
                     part_cumul_balance_curr = 0.0
                     c_specs = [
-                        ('partner_title', nbr_columns, 0, 'text', partner_name or _('No Partner'), None, c_part_cell_style),
+                        ('partner_title', nbr_columns, 0, 'text',
+                         partner_name or _('No Partner'), None,
+                         c_part_cell_style),
                     ]
-                    row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                    row_pos = self.xls_write_row(ws, row_pos, row_data, c_title_cell_style)    
-                    row_pos = self.xls_write_row(ws, row_pos, c_hdr_data)   
+                    row_data = self.xls_row_template(
+                        c_specs, [x[0] for x in c_specs])
+                    row_pos = self.xls_write_row(
+                        ws, row_pos, row_data, c_title_cell_style)
+                    row_pos = self.xls_write_row(ws, row_pos, c_hdr_data)
                     row_start_partner = row_pos
 
-                    total_debit = account.init_balance.get(p_id, {}).get('debit') or 0.0
-                    total_credit = account.init_balance.get(p_id, {}).get('credit') or 0.0
-                    
+                    total_debit = account.init_balance.get(
+                        p_id, {}).get('debit') or 0.0
+                    total_credit = account.init_balance.get(
+                        p_id, {}).get('credit') or 0.0
+
                     init_line = False
-                    if _p.initial_balance_mode and (total_debit or total_credit):
+                    if _p.initial_balance_mode and\
+                            (total_debit or total_credit):
                         init_line = True
-                        
-                        part_cumul_balance = account.init_balance.get(p_id, {}).get('init_balance') or 0.0
-                        part_cumul_balance_curr = account.init_balance.get(p_id, {}).get('init_balance_currency') or 0.0
-                        balance_forward_currency = account.init_balance.get(p_id, {}).get('currency_name') or ''
+
+                        part_cumul_balance = account.init_balance.get(
+                            p_id, {}).get('init_balance') or 0.0
+                        part_cumul_balance_curr = account.init_balance.get(
+                            p_id, {}).get('init_balance_currency') or 0.0
+                        balance_forward_currency = account.init_balance.get(
+                            p_id, {}).get('currency_name') or ''
 
                         cumul_balance += part_cumul_balance
                         cumul_balance_curr += part_cumul_balance_curr
 
-                        debit_cell = rowcol_to_cell(row_pos, 7)                
+                        debit_cell = rowcol_to_cell(row_pos, 7)
                         credit_cell = rowcol_to_cell(row_pos, 8)
-                        init_bal_formula = debit_cell + '-' + credit_cell   
-    
-                        ################## Print row 'Initial Balance' by partner #################                            
-                        c_specs = [('empty%s' %x, 1, 0, 'text', None) for x in range(5)]
+                        init_bal_formula = debit_cell + '-' + credit_cell
+
+                        # Print row 'Initial Balance' by partn
+                        c_specs = [('empty%s' % x, 1, 0, 'text', None)
+                                   for x in range(5)]
                         c_specs += [
                             ('init_bal', 1, 0, 'text', _('Initial Balance')),
                             ('rec', 1, 0, 'text', None),
-                            ('debit', 1, 0, 'number', total_debit, None, c_init_cell_style_decimal),
-                            ('credit', 1, 0, 'number', total_credit, None, c_init_cell_style_decimal),
-                            ('cumul_bal', 1, 0, 'number', None, init_bal_formula, c_init_cell_style_decimal),                                                
-                        ]  
+                            ('debit', 1, 0, 'number', total_debit,
+                             None, c_init_cell_style_decimal),
+                            ('credit', 1, 0, 'number', total_credit,
+                             None, c_init_cell_style_decimal),
+                            ('cumul_bal', 1, 0, 'number', None,
+                             init_bal_formula, c_init_cell_style_decimal),
+                        ]
                         if _p.amount_currency(data):
                             c_specs += [
-                                ('curr_bal', 1, 0, 'number', part_cumul_balance_curr, None, c_init_cell_style_decimal),
-                                ('curr_code', 1, 0, 'text', balance_forward_currency),
+                                ('curr_bal', 1, 0, 'number',
+                                 part_cumul_balance_curr,
+                                 None, c_init_cell_style_decimal),
+                                ('curr_code', 1, 0, 'text',
+                                 balance_forward_currency),
                             ]
-                        row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                        row_pos = self.xls_write_row(ws, row_pos, row_data, c_init_cell_style) 
-                
+                        row_data = self.xls_row_template(
+                            c_specs, [x[0] for x in c_specs])
+                        row_pos = self.xls_write_row(
+                            ws, row_pos, row_data, c_init_cell_style)
+
                     for line in account.ledger_lines.get(p_id, []):
 
                         total_debit += line.get('debit') or 0.0
@@ -265,101 +318,148 @@ class partner_ledger_xls(report_xls):
 
                         label_elements = [line.get('lname') or '']
                         if line.get('invoice_number'):
-                            label_elements.append("(%s)" % (line['invoice_number'],))
+                            label_elements.append(
+                                "(%s)" % (line['invoice_number'],))
                         label = ' '.join(label_elements)
                         cumul_balance += line.get('balance') or 0.0
-                        
+
                         if init_line or row_pos > row_start_partner:
-                            cumbal_formula = rowcol_to_cell(row_pos-1, 9) + '+'
+                            cumbal_formula = rowcol_to_cell(
+                                row_pos - 1, 9) + '+'
                         else:
                             cumbal_formula = ''
-                        debit_cell = rowcol_to_cell(row_pos, 7)                
+                        debit_cell = rowcol_to_cell(row_pos, 7)
                         credit_cell = rowcol_to_cell(row_pos, 8)
-                        cumbal_formula += debit_cell + '-' + credit_cell   
-                        ################## Print row ledger line data #################
-                        
+                        cumbal_formula += debit_cell + '-' + credit_cell
+                        ################## Print row ledger line data #########
+
                         if line.get('ldate'):
                             c_specs = [
-                                ('ldate', 1, 0, 'date', datetime.strptime(line['ldate'],'%Y-%m-%d'), None, ll_cell_style_date),
+                                ('ldate', 1, 0, 'date', datetime.strptime(
+                                    line['ldate'], '%Y-%m-%d'), None,
+                                 ll_cell_style_date),
                             ]
                         else:
                             c_specs = [
                                 ('ldate', 1, 0, 'text', None),
-                            ]    
+                            ]
                         c_specs += [
-                            ('period', 1, 0, 'text', line.get('period_code') or ''),
-                            ('move', 1, 0, 'text', line.get('move_name') or ''),
+                            ('period', 1, 0, 'text',
+                             line.get('period_code') or ''),
+                            ('move', 1, 0, 'text',
+                             line.get('move_name') or ''),
                             ('journal', 1, 0, 'text', line.get('jcode') or ''),
-                            ('partner', 1, 0, 'text', line.get('partner_name') or ''),
+                            ('partner', 1, 0, 'text',
+                             line.get('partner_name') or ''),
                             ('label', 1, 0, 'text', label),
-                            ('rec_name', 1, 0, 'text', line.get('rec_name') or ''),
-                            ('debit', 1, 0, 'number', line.get('debit'), None, ll_cell_style_decimal),
-                            ('credit', 1, 0, 'number', line.get('credit'), None, ll_cell_style_decimal),
-                            ('cumul_bal', 1, 0, 'number', None, cumbal_formula, ll_cell_style_decimal),
-                        ]  
+                            ('rec_name', 1, 0, 'text',
+                             line.get('rec_name') or ''),
+                            ('debit', 1, 0, 'number', line.get('debit'),
+                             None, ll_cell_style_decimal),
+                            ('credit', 1, 0, 'number', line.get('credit'),
+                             None, ll_cell_style_decimal),
+                            ('cumul_bal', 1, 0, 'number', None,
+                             cumbal_formula, ll_cell_style_decimal),
+                        ]
                         if _p.amount_currency(data):
                             c_specs += [
-                                ('curr_bal', 1, 0, 'number', line.get('amount_currency') or 0.0, None, ll_cell_style_decimal),
-                                ('curr_code', 1, 0, 'text', line.get('currency_code') or '', None, ll_cell_style_center),
+                                ('curr_bal', 1, 0, 'number', line.get(
+                                    'amount_currency') or 0.0, None,
+                                 ll_cell_style_decimal),
+                                ('curr_code', 1, 0, 'text', line.get(
+                                    'currency_code') or '', None,
+                                 ll_cell_style_center),
                             ]
-                        row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                        row_pos = self.xls_write_row(ws, row_pos, row_data, ll_cell_style) 
-                    #end for line
-
-                    ################## Print row Cumulated Balance by partner #################  
-                    debit_partner_start = rowcol_to_cell(row_start_partner, 7)                
-                    debit_partner_end = rowcol_to_cell(row_pos-1, 7)
-                    debit_partner_total = 'SUM(' + debit_partner_start + ':' + debit_partner_end + ')'
-                      
-                    credit_partner_start = rowcol_to_cell(row_start_partner, 8)                
-                    credit_partner_end = rowcol_to_cell(row_pos-1, 8)
-                    credit_partner_total = 'SUM(' + credit_partner_start + ':' + credit_partner_end + ')'
-                      
-                    bal_partner_debit = rowcol_to_cell(row_pos, 7)                
+                        row_data = self.xls_row_template(
+                            c_specs, [x[0] for x in c_specs])
+                        row_pos = self.xls_write_row(
+                            ws, row_pos, row_data, ll_cell_style)
+                    # end for line
+
+                    ################## Print row Cumulated Balance by partner #
+                    debit_partner_start = rowcol_to_cell(row_start_partner, 7)
+                    debit_partner_end = rowcol_to_cell(row_pos - 1, 7)
+                    debit_partner_total = 'SUM(' + debit_partner_start + \
+                        ':' + debit_partner_end + ')'
+
+                    credit_partner_start = rowcol_to_cell(row_start_partner, 8)
+                    credit_partner_end = rowcol_to_cell(row_pos - 1, 8)
+                    credit_partner_total = 'SUM(' + credit_partner_start + \
+                        ':' + credit_partner_end + ')'
+
+                    bal_partner_debit = rowcol_to_cell(row_pos, 7)
                     bal_partner_credit = rowcol_to_cell(row_pos, 8)
-                    bal_partner_total = bal_partner_debit + '-' + bal_partner_credit                 
-                                         
-                    c_specs = [('empty%s' %x, 1, 0, 'text', None) for x in range(5)]
+                    bal_partner_total = bal_partner_debit + \
+                        '-' + bal_partner_credit
+
+                    c_specs = [('empty%s' % x, 1, 0, 'text', None)
+                               for x in range(5)]
                     c_specs += [
-                         ('init_bal', 1, 0, 'text', _('Cumulated balance on Partner')),
-                         ('rec', 1, 0, 'text', None),
-                         ('debit', 1, 0, 'number', None, debit_partner_total, c_cumul_cell_style_decimal),  
-                         ('credit', 1, 0, 'number', None, credit_partner_total, c_cumul_cell_style_decimal),  
-                         ('cumul_bal', 1, 0, 'number', None, bal_partner_total, c_cumul_cell_style_decimal),                   
-                    ]      
+                        ('init_bal', 1, 0, 'text',
+                         _('Cumulated balance on Partner')),
+                        ('rec', 1, 0, 'text', None),
+                        ('debit', 1, 0, 'number', None,
+                         debit_partner_total, c_cumul_cell_style_decimal),
+                        ('credit', 1, 0, 'number', None,
+                         credit_partner_total, c_cumul_cell_style_decimal),
+                        ('cumul_bal', 1, 0, 'number', None,
+                         bal_partner_total, c_cumul_cell_style_decimal),
+                    ]
                     if _p.amount_currency(data):
                         if account.currency_id:
-                            c_specs += [('curr_bal', 1, 0, 'number', cumul_balance_curr or 0.0, None, c_cumul_cell_style_decimal)]
+                            c_specs += [('curr_bal', 1, 0, 'number',
+                                         cumul_balance_curr or 0.0, None,
+                                         c_cumul_cell_style_decimal)]
                         else:
-                            c_specs += [('curr_bal', 1, 0, 'text', '-', None, c_cumul_cell_style_right)]
-                        c_specs += [('curr_code', 1, 0, 'text', account.currency_id.name if account.currency_id else u'', None, c_cumul_cell_style_center)]                   
-                    row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                    row_pos = self.xls_write_row(ws, row_pos, row_data, c_cumul_cell_style)
-                    row_pos += 1       
+                            c_specs += [('curr_bal', 1, 0, 'text',
+                                         '-', None, c_cumul_cell_style_right)]
+                        c_specs += [('curr_code', 1, 0, 'text',
+                                     account.currency_id.name if
+                                     account.currency_id else u'', None,
+                                     c_cumul_cell_style_center)]
+                    row_data = self.xls_row_template(
+                        c_specs, [x[0] for x in c_specs])
+                    row_pos = self.xls_write_row(
+                        ws, row_pos, row_data, c_cumul_cell_style)
+                    row_pos += 1
                     account_total_debit += total_debit
                     account_total_credit += total_credit
                     account_balance_cumul += cumul_balance
-                    account_balance_cumul_curr += cumul_balance_curr                                 
-                        
-                ################## Print row Cumulated Balance by account #################   
-                c_specs = [('acc_title', 5, 0, 'text', ' - '.join([account.code, account.name])),      ]
+                    account_balance_cumul_curr += cumul_balance_curr
+
+                ################## Print row Cumulated Balance by account #####
+                c_specs = [
+                    ('acc_title', 5, 0, 'text', ' - '.
+                     join([account.code, account.name])), ]
                 c_specs += [
                     ('label', 1, 0, 'text', _('Cumulated balance on Account')),
                     ('rec', 1, 0, 'text', None),
-                    ('debit', 1, 0, 'number', account_total_debit, None, account_cell_style_decimal),
-                    ('credit', 1, 0, 'number', account_total_credit, None, account_cell_style_decimal),
-                    ('cumul_bal', 1, 0, 'number', account_balance_cumul, None, account_cell_style_decimal),                    
-                ]      
+                    ('debit', 1, 0, 'number', account_total_debit,
+                     None, account_cell_style_decimal),
+                    ('credit', 1, 0, 'number', account_total_credit,
+                     None, account_cell_style_decimal),
+                    ('cumul_bal', 1, 0, 'number', account_balance_cumul,
+                     None, account_cell_style_decimal),
+                ]
                 if _p.amount_currency(data):
                     if account.currency_id:
-                        c_specs += [('curr_bal', 1, 0, 'number', account_balance_cumul_curr or 0.0, None, account_cell_style_decimal)]
+                        c_specs += [('curr_bal', 1, 0, 'number',
+                                     account_balance_cumul_curr or 0.0, None,
+                                     account_cell_style_decimal)]
                     else:
-                        c_specs += [('curr_bal', 1, 0, 'text', '-', None, account_cell_style_right)]
-                    c_specs += [('curr_code', 1, 0, 'text', account.currency_id.name if account.currency_id else u'', None, account_cell_style)]                   
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, account_cell_style) 
+                        c_specs += [('curr_bal', 1, 0, 'text',
+                                     '-', None, account_cell_style_right)]
+                    c_specs += [('curr_code', 1, 0, 'text',
+                                 account.currency_id.name if
+                                 account.currency_id else u'', None,
+                                 account_cell_style)]
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, account_cell_style)
                 row_pos += 2
 
-partner_ledger_xls('report.account.account_report_partner_ledger_xls', 'account.account',
-    parser=PartnersLedgerWebkit)
+partner_ledger_xls('report.account.account_report_partner_ledger_xls',
+                   'account.account',
+                   parser=PartnersLedgerWebkit)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

account_financial_report_webkit_xls/report/partners_balance_xls.py

@@ -21,67 +21,84 @@
 ##############################################################################
 
 import xlwt
-import time
-from openerp.report import report_sxw
 from openerp.addons.report_xls.report_xls import report_xls
 from openerp.addons.report_xls.utils import rowcol_to_cell
-from openerp.addons.account_financial_report_webkit.report.partner_balance import PartnerBalanceWebkit
+from openerp.addons.account_financial_report_webkit.report.partner_balance\
+    import PartnerBalanceWebkit
 from openerp.tools.translate import _
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 def display_line(all_comparison_lines):
     return any([line.get('balance') for line in all_comparison_lines])
 
+
 class partners_balance_xls(report_xls):
-    column_sizes = [12,40,25,17,17,17,17,17]
-    
-    def print_title(self, ws, _p, row_position, xlwt,_xs): 
-        cell_style = xlwt.easyxf(_xs['xls_title'])  
-        report_name =  ' - '.join([_p.report_name.upper(), _p.company.partner_id.name, _p.company.currency_id.name])
+    column_sizes = [12, 40, 25, 17, 17, 17, 17, 17]
+
+    def print_title(self, ws, _p, row_position, xlwt, _xs):
+        cell_style = xlwt.easyxf(_xs['xls_title'])
+        report_name = ' - '.join([_p.report_name.upper(),
+                                 _p.company.partner_id.name,
+                                 _p.company.currency_id.name])
         c_specs = [
             ('report_name', 1, 0, 'text', report_name),
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style)
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, row_style=cell_style)
         return row_position
-    
+
     def print_empty_row(self, ws, row_position):
         c_sizes = self.column_sizes
-        c_specs = [('empty%s'%i, 1, c_sizes[i], 'text', None) for i in range(0,len(c_sizes))]
+        c_specs = [('empty%s' % i, 1, c_sizes[i], 'text', None)
+                   for i in range(0, len(c_sizes))]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, set_column_size=True) 
-        return row_position    
-    
-    def print_header_titles(self, ws, _p, data, row_position, xlwt, _xs):    
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, set_column_size=True)
+        return row_position
+
+    def print_header_titles(self, ws, _p, data, row_position, xlwt, _xs):
         cell_format = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
 
         c_specs = [
             ('fy', 1, 0, 'text', _('Fiscal Year'), None, cell_style_center),
-            ('af', 1, 0, 'text', _('Accounts Filter'), None, cell_style_center),
-            ('df', 1, 0, 'text', _p.filter_form(data) == 'filter_date' and _('Dates Filter') or _('Periods Filter'), None, cell_style_center),
-            ('pf', 1, 0, 'text',  _('Partners Filter'), None, cell_style_center),
+            ('af', 1, 0, 'text', _('Accounts Filter'),
+             None, cell_style_center),
+            ('df', 1, 0, 'text', _p.filter_form(data) == 'filter_date' and _(
+                'Dates Filter') or _('Periods Filter'), None,
+             cell_style_center),
+            ('pf', 1, 0, 'text',  _('Partners Filter'),
+             None, cell_style_center),
             ('tm', 1, 0, 'text',  _('Target Moves'), None, cell_style_center),
-            ('ib', 1, 0, 'text',  _('Initial Balance'), None, cell_style_center),
-            ('coa', 1, 0, 'text', _('Chart of Account'), None, cell_style_center),
-        ]       
+            ('ib', 1, 0, 'text',  _('Initial Balance'),
+             None, cell_style_center),
+            ('coa', 1, 0, 'text', _('Chart of Account'),
+             None, cell_style_center),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style)
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, row_style=cell_style)
         return row_position
-    
-    def print_header_data(self, ws, _p, data, row_position, xlwt, _xs, initial_balance_text):   
+
+    def print_header_data(self, ws, _p, data, row_position, xlwt, _xs,
+                          initial_balance_text):
         cell_format = _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
         c_specs = [
-            ('fy', 1, 0, 'text', _p.fiscalyear.name if _p.fiscalyear else '-', None, cell_style_center),
-            ('af', 1, 0, 'text', _p.accounts(data) and ', '.join([account.code for account in _p.accounts(data)]) or _('All'), None, cell_style_center),
+            ('fy', 1, 0, 'text', _p.fiscalyear.name if _p.fiscalyear else '-',
+             None, cell_style_center),
+            ('af', 1, 0, 'text', _p.accounts(data) and ', '.join(
+                [account.code for account in _p.accounts(data)]) or _('All'),
+             None, cell_style_center),
         ]
         df = _('From') + ': '
         if _p.filter_form(data) == 'filter_date':
-            df += _p.start_date if _p.start_date else u'' 
+            df += _p.start_date if _p.start_date else u''
         else:
             df += _p.start_period.name if _p.start_period else u''
         df += ' ' + _('\nTo') + ': '
@@ -91,38 +108,56 @@ class partners_balance_xls(report_xls):
             df += _p.stop_period.name if _p.stop_period else u''
         c_specs += [
             ('df', 1, 0, 'text', df, None, cell_style_center),
-            ('tm', 1, 0, 'text', _p.display_partner_account(data), None, cell_style_center),
-            ('pf', 1, 0, 'text', _p.display_target_move(data), None, cell_style_center),
-            ('ib', 1, 0, 'text', initial_balance_text[_p.initial_balance_mode], None, cell_style_center),
-            ('coa', 1, 0, 'text', _p.chart_account.name, None, cell_style_center),
-        ]       
+            ('tm', 1, 0, 'text', _p.display_partner_account(
+                data), None, cell_style_center),
+            ('pf', 1, 0, 'text', _p.display_target_move(
+                data), None, cell_style_center),
+            ('ib', 1, 0, 'text', initial_balance_text[
+             _p.initial_balance_mode], None, cell_style_center),
+            ('coa', 1, 0, 'text', _p.chart_account.name,
+             None, cell_style_center),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style)
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, row_style=cell_style)
         return row_position
 
-    def print_comparison_header(self, _xs, xlwt, row_position, _p, ws, initial_balance_text ):    
+    def print_comparison_header(self, _xs, xlwt, row_position, _p, ws,
+                                initial_balance_text):
         cell_format_ct = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
         cell_style_ct = xlwt.easyxf(cell_format_ct)
-        c_specs = [('ct', 7, 0, 'text', _('Comparisons'))]       
+        c_specs = [('ct', 7, 0, 'text', _('Comparisons'))]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style_ct)     
-        cell_format = _xs['borders_all'] + _xs['wrap'] + _xs['top']       
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, row_style=cell_style_ct)
+        cell_format = _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style_center = xlwt.easyxf(cell_format)
         for index, params in enumerate(_p.comp_params):
-            c_specs = [('c', 2, 0, 'text', _('Comparison') + str(index + 1) + ' (C' + str(index + 1) + ')')]
+            c_specs = [
+                ('c', 2, 0, 'text', _('Comparison') + str(index + 1) +
+                 ' (C' + str(index + 1) + ')')]
             if params['comparison_filter'] == 'filter_date':
-                    c_specs += [('f', 2, 0, 'text', _('Dates Filter') + ': ' + _p.formatLang(params['start'], date=True) + ' - ' + _p.formatLang(params['stop'], date=True))]
+                c_specs += [('f', 2, 0, 'text', _('Dates Filter') + ': ' +
+                             _p.formatLang(params['start'], date=True) + ' - '
+                             + _p.formatLang(params['stop'], date=True))]
             elif params['comparison_filter'] == 'filter_period':
-                    c_specs += [('f', 2, 0, 'text', _('Periods Filter') + ': ' + params['start'].name + ' - ' + params['stop'].name)]
+                c_specs += [('f', 2, 0, 'text', _('Periods Filter') +
+                             ': ' + params['start'].name + ' - ' +
+                             params['stop'].name)]
             else:
-                    c_specs += [('f', 2, 0, 'text', _('Fiscal Year') + ': ' + params['fiscalyear'].name)]
-            c_specs += [('ib', 2, 0, 'text', _('Initial Balance') + ': ' + initial_balance_text[params['initial_balance_mode']])]
+                c_specs += [('f', 2, 0, 'text', _('Fiscal Year') +
+                             ': ' + params['fiscalyear'].name)]
+            c_specs += [('ib', 2, 0, 'text', _('Initial Balance') +
+                         ': ' +
+                         initial_balance_text[params['initial_balance_mode']])]
             row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-            row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style_center) 
+            row_position = self.xls_write_row(
+                ws, row_position, row_data, row_style=cell_style_center)
         return row_position
-    
-    def print_account_header(self, ws, _p, _xs, xlwt, row_position):            
-        cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] + _xs['wrap'] + _xs['top']
+
+    def print_account_header(self, ws, _p, _xs, xlwt, row_position):
+        cell_format = _xs['bold'] + _xs['fill'] + \
+            _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
@@ -136,97 +171,133 @@ class partners_balance_xls(report_xls):
         ]
         if _p.comparison_mode == 'no_comparison':
             if _p.initial_balance_mode:
-                c_specs += [('init_bal', 1, 0, 'text', _('Initial Balance'), None, cell_style_right)]
+                c_specs += [('init_bal', 1, 0, 'text',
+                             _('Initial Balance'), None, cell_style_right)]
             c_specs += [
                 ('debit', 1, 0, 'text', _('Debit'), None, cell_style_right),
                 ('credit', 1, 0, 'text', _('Credit'), None, cell_style_right),
-            ]       
+            ]
 
         if _p.comparison_mode == 'no_comparison' or not _p.fiscalyear:
-            c_specs += [('balance', 1, 0, 'text', _('Balance'), None, cell_style_right)]
+            c_specs += [('balance', 1, 0, 'text',
+                         _('Balance'), None, cell_style_right)]
         else:
-            c_specs += [('balance_fy', 1, 0, 'text', _('Balance %s') % _p.fiscalyear.name, None, cell_style_right)]
+            c_specs += [('balance_fy', 1, 0, 'text', _('Balance %s') %
+                         _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' and _p.comp_params[index].get('fiscalyear', False):
-                    c_specs += [('balance_%s' %index, 1, 0, 'text', _('Balance %s') % _p.comp_params[index]['fiscalyear'].name, None, cell_style_right)]
+                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') %
+                                 _p.comp_params[index]['fiscalyear'].name,
+                                 None, cell_style_right)]
                 else:
-                    c_specs += [('balance_%s' %index, 1, 0, 'text', _('Balance C%s') % (index + 1), None, cell_style_right)]
+                    c_specs += [('balance_%s' % index, 1, 0, 'text',
+                                 _('Balance C%s') % (index + 1), None,
+                                 cell_style_right)]
                 if _p.comparison_mode == 'single':
                     c_specs += [
-                        ('diff', 1, 0, 'text', _('Difference'), None, cell_style_right),
-                        ('diff_percent', 1, 0, 'text', _('% Difference'), None, cell_style_center),
-                    ]                  
+                        ('diff', 1, 0, 'text', _('Difference'),
+                         None, cell_style_right),
+                        ('diff_percent', 1, 0, 'text',
+                         _('% Difference'), None, cell_style_center),
+                    ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, row_style=cell_style)
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, row_style=cell_style)
         return row_position
-      
-    def print_row_code_account(self, ws, current_account, row_position, _xs, xlwt):
-        cell_format = _xs['xls_title'] + _xs['bold'] + _xs['fill'] + _xs['borders_all']
+
+    def print_row_code_account(self, ws, current_account, row_position, _xs,
+                               xlwt):
+        cell_format = _xs['xls_title'] + _xs['bold'] + \
+            _xs['fill'] + _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
-        c_specs = [ ('acc_title', 7, 0, 'text', ' - '.join([current_account.code, current_account.name])),  ]
+        c_specs = [
+            ('acc_title', 7, 0, 'text', ' - '.join([current_account.code,
+                                                    current_account.name])), ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, cell_style) 
-        return row_position      
- 
-    def print_account_totals(self, _xs, xlwt, ws, row_start_account, row_position, current_account,_p):
-        cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] + _xs['wrap'] + _xs['top']
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, cell_style)
+        return row_position
+
+    def print_account_totals(self, _xs, xlwt, ws, row_start_account,
+                             row_position, current_account, _p):
+        cell_format = _xs['bold'] + _xs['fill'] + \
+            _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style = xlwt.easyxf(cell_format)
-        cell_style_decimal = xlwt.easyxf(cell_format + _xs['right'], num_format_str = report_xls.decimal_format)           
-        c_specs = [ 
-                ('acc_title', 2, 0, 'text', current_account.name),
-                ('code', 1, 0, 'text', current_account.code),   
+        cell_style_decimal = xlwt.easyxf(
+            cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+        c_specs = [
+            ('acc_title', 2, 0, 'text', current_account.name),
+            ('code', 1, 0, 'text', current_account.code),
         ]
-        for column in range(3,7):
-           if (_p.comparison_mode == 'single' and column == 6): #in case of one single comparison, the column 6 will contain percentages
-                total_diff = rowcol_to_cell(row_position, column-1)
-                total_balance = rowcol_to_cell(row_position, column-2)
-                account_formula = 'Round('+ total_diff + '/' + total_balance + '*100;0)'
-           else:
-                account_start   = rowcol_to_cell(row_start_account, column)
-                account_end     = rowcol_to_cell(row_position -1, column)
-                account_formula = 'Round(SUM(' + account_start + ':' + account_end + ');2)'
-           c_specs += [('total%s' %column, 1, 0, 'text', None, account_formula, None, cell_style_decimal)]
+        for column in range(3, 7):
+            # in case of one single comparison, the column 6 will contain
+            # percentages
+            if (_p.comparison_mode == 'single' and column == 6):
+                total_diff = rowcol_to_cell(row_position, column - 1)
+                total_balance = rowcol_to_cell(row_position, column - 2)
+                account_formula = 'Round(' + total_diff + \
+                    '/' + total_balance + '*100;0)'
+            else:
+                account_start = rowcol_to_cell(row_start_account, column)
+                account_end = rowcol_to_cell(row_position - 1, column)
+                account_formula = 'Round(SUM(' + \
+                    account_start + ':' + account_end + ');2)'
+            c_specs += [('total%s' % column, 1, 0, 'text', None,
+                         account_formula, None, cell_style_decimal)]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_position = self.xls_write_row(ws, row_position, row_data, cell_style) 
+        row_position = self.xls_write_row(
+            ws, row_position, row_data, cell_style)
         return row_position + 1
-        
+
     def generate_xls_report(self, _p, _xs, data, objects, wb):
-       
+
         # Initialisations
         ws = wb.add_sheet(_p.report_name[:31])
         ws.panes_frozen = True
         ws.remove_splits = True
-        ws.portrait = 0 # Landscape
+        ws.portrait = 0  # Landscape
         ws.fit_width_to_pages = 1
         row_pos = 0
         ws.header_str = self.xls_headers['standard']
-        ws.footer_str = self.xls_footers['standard']    
-               
+        ws.footer_str = self.xls_footers['standard']
+
         # Print Title
-        row_pos = self.print_title(ws, _p, row_pos, xlwt, _xs)   
+        row_pos = self.print_title(ws, _p, row_pos, xlwt, _xs)
         # Print empty row to define column sizes
-        row_pos = self.print_empty_row(ws, row_pos)   
-        # Print Header Table titles (Fiscal Year - Accounts Filter - Periods Filter...)
+        row_pos = self.print_empty_row(ws, row_pos)
+        # Print Header Table titles (Fiscal Year - Accounts Filter - Periods
+        # Filter...)
         row_pos = self.print_header_titles(ws, _p, data, row_pos, xlwt, _xs)
-        
-        initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}  # cf. account_report_partner_balance.mako  
+
+        initial_balance_text = {
+            'initial_balance': _('Computed'),
+            'opening_balance': _('Opening Entries'),
+            False: _('No')}  # cf. account_report_partner_balance.mako
         # Print Header Table data
-        row_pos = self.print_header_data(ws, _p, data, row_pos, xlwt, _xs, initial_balance_text)
+        row_pos = self.print_header_data(
+            ws, _p, data, row_pos, xlwt, _xs, initial_balance_text)
         # Print comparison header table
         if _p.comparison_mode in ('single', 'multiple'):
             row_pos += 1
-            row_pos = self.print_comparison_header(_xs, xlwt, row_pos, _p, ws, initial_balance_text)
+            row_pos = self.print_comparison_header(
+                _xs, xlwt, row_pos, _p, ws, initial_balance_text)
 
         # Freeze the line
-        ws.set_horz_split_pos(row_pos)   
-                              
+        ws.set_horz_split_pos(row_pos)
+
         # cell styles for account data
         regular_cell_format = _xs['borders_all']
         regular_cell_style = xlwt.easyxf(regular_cell_format)
-        regular_cell_style_center = xlwt.easyxf(regular_cell_format + _xs['center'])
-        regular_cell_style_decimal = xlwt.easyxf(regular_cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        regular_cell_style_pct = xlwt.easyxf(regular_cell_format + _xs['center'], num_format_str = '0')        
+        regular_cell_style_center = xlwt.easyxf(
+            regular_cell_format + _xs['center'])
+        regular_cell_style_decimal = xlwt.easyxf(
+            regular_cell_format + _xs['right'], num_format_str=report_xls.decimal_format)
+        regular_cell_style_pct = xlwt.easyxf(
+            regular_cell_format + _xs['center'], num_format_str='0')
 
         row_pos += 1
         for current_account in objects:
@@ -238,14 +309,15 @@ class partners_balance_xls(report_xls):
                 continue
 
             comparisons = current_account.comparisons
-            
-            # in multiple columns mode, we do not want to print accounts without any rows
+
+            # in multiple columns mode, we do not want to print accounts
+            # without any rows
             if _p.comparison_mode in ('single', 'multiple'):
                 all_comparison_lines = [comp['partners_amounts'][partner_id[1]]
-                                      for partner_id in partners_order 
-                                      for comp in comparisons]
+                                        for partner_id in partners_order
+                                        for comp in comparisons]
                 if not display_line(all_comparison_lines):
-                    continue            
+                    continue
 
             current_partner_amounts = current_account.partners_amounts
 
@@ -255,30 +327,42 @@ class partners_balance_xls(report_xls):
                     comparison_total[i] = {'balance': 0.0}
 
             # print row: Code - Account name
-            row_pos = self.print_row_code_account(ws, current_account, row_pos, _xs, xlwt)
+            row_pos = self.print_row_code_account(
+                ws, current_account, row_pos, _xs, xlwt)
             row_account_start = row_pos
-            # Print row: Titles "Account/Partner Name-Code/ref-Initial Balance-Debit-Credit-Balance" or  "Account/Partner Name-Code/ref-Balance Year-Balance Year2-Balance C2-Balance C3"   
-            row_pos = self.print_account_header(ws, _p, _xs, xlwt, row_pos) 
+            # Print row: Titles "Account/Partner Name-Code/ref-Initial
+            # Balance-Debit-Credit-Balance" or  "Account/Partner
+            # Name-Code/ref-Balance Year-Balance Year2-Balance C2-Balance C3"
+            row_pos = self.print_account_header(ws, _p, _xs, xlwt, row_pos)
 
-            for (partner_code_name, partner_id, partner_ref, partner_name) in partners_order:
+            for (partner_code_name, partner_id, partner_ref, partner_name)\
+                    in partners_order:
                 partner = current_partner_amounts.get(partner_id, {})
-                # in single mode, we have to display all the partners even if their balance is 0.0 because the initial balance should match with the previous year closings
-                # in multiple columns mode, we do not want to print partners which have a balance at 0.0 in each comparison column
+                # in single mode, we have to display all the partners even if
+                # their balance is 0.0 because the initial balance should match
+                # with the previous year closings
+                # in multiple columns mode, we do not want to print partners
+                # which have a balance at 0.0 in each comparison column
                 if _p.comparison_mode in ('single', 'multiple'):
-                    all_comparison_lines = [comp['partners_amounts'][partner_id]
-                                                for comp in comparisons 
-                                                if comp['partners_amounts'].get(partner_id)]
+                    all_comparison_lines = [comp['partners_amounts']
+                                            [partner_id]
+                                            for comp in comparisons
+                                            if comp['partners_amounts'].
+                                            get(partner_id)]
                     if not display_line(all_comparison_lines):
                         continue
-   
+
                 # display data row
                 if len(_p.comp_params) == 2:
                     account_span = 3
                 else:
                     account_span = _p.initial_balance_mode and 2 or 3
-                
-                c_specs =  [('acc_title', account_span, 0, 'text', partner_name if partner_name else _('Unallocated'))] 
-                c_specs += [('partner_ref', 1, 0, 'text', partner_ref if partner_ref else '')]                       
+
+                c_specs = [('acc_title', account_span, 0, 'text',
+                            partner_name if partner_name else
+                            _('Unallocated'))]
+                c_specs += [('partner_ref', 1, 0, 'text',
+                             partner_ref if partner_ref else '')]
                 if _p.comparison_mode == 'no_comparison':
                     bal_formula = ''
                     if _p.initial_balance_mode:
@@ -286,43 +370,62 @@ class partners_balance_xls(report_xls):
                         bal_formula = init_bal_cell + '+'
                         debit_col = 4
                         c_specs += [
-                                    ('init_bal', 1, 0, 'number', partner.get('init_balance', 0.0), None, regular_cell_style_decimal),
-                                ]                
+                            ('init_bal', 1, 0, 'number', partner.get(
+                                'init_balance', 0.0), None,
+                             regular_cell_style_decimal),
+                        ]
                     else:
                         debit_col = 3
                     c_specs += [
-                                 ('debit', 1, 0, 'number', partner.get('debit', 0.0), None, regular_cell_style_decimal),
-                                 ('credit', 1, 0, 'number', partner.get('credit', 0.0), None, regular_cell_style_decimal), 
-                                 ]
+                        ('debit', 1, 0, 'number', partner.get('debit', 0.0),
+                         None, regular_cell_style_decimal),
+                        ('credit', 1, 0, 'number', partner.get('credit', 0.0),
+                         None, regular_cell_style_decimal),
+                    ]
                     debit_cell = rowcol_to_cell(row_pos, debit_col)
-                    credit_cell = rowcol_to_cell(row_pos, debit_col+1)
+                    credit_cell = rowcol_to_cell(row_pos, debit_col + 1)
                     bal_formula += debit_cell + '-' + credit_cell
-                    c_specs += [('bal', 1, 0, 'number', None, bal_formula, regular_cell_style_decimal),]                      
+                    c_specs += [('bal', 1, 0, 'number', None,
+                                 bal_formula, regular_cell_style_decimal), ]
                 else:
-                    c_specs += [('bal', 1, 0, 'number', partner.get('balance', 0.0), None, regular_cell_style_decimal),]                      
+                    c_specs += [('bal', 1, 0, 'number', partner.get('balance',
+                                                                    0.0),
+                                 None, regular_cell_style_decimal), ]
 
                 if _p.comparison_mode in ('single', 'multiple'):
                     for i, comp in enumerate(comparisons):
-                         comp_partners = comp['partners_amounts']
-                         balance = diff = percent_diff = 0
-                         if comp_partners.get(partner_id):
-                              balance = comp_partners[partner_id]['balance']
-                              diff = comp_partners[partner_id]['diff']
-                              percent_diff = comp_partners[partner_id]['percent_diff']
-                              comparison_total[i]['balance'] += balance
-                         c_specs += [('balance_%s' %i, 1, 0, 'number', balance, None, regular_cell_style_decimal), ]  
-                if _p.comparison_mode == 'single':  ## no diff in multiple comparisons because it shows too much data
-                    c_specs += [('balance_diff', 1, 0, 'number', diff, None, regular_cell_style_decimal), ]  
+                        comp_partners = comp['partners_amounts']
+                        balance = diff = percent_diff = 0
+                        if comp_partners.get(partner_id):
+                            balance = comp_partners[partner_id]['balance']
+                            diff = comp_partners[partner_id]['diff']
+                            percent_diff = comp_partners[
+                                partner_id]['percent_diff']
+                            comparison_total[i]['balance'] += balance
+                        c_specs += [('balance_%s' % i, 1, 0, 'number',
+                                     balance, None,
+                                     regular_cell_style_decimal), ]
+                # no diff in multiple comparisons because it shows too much
+                # data
+                if _p.comparison_mode == 'single':
+                    c_specs += [('balance_diff', 1, 0, 'number',
+                                 diff, None, regular_cell_style_decimal), ]
                     if percent_diff is False:
-                        c_specs += [('balance', 1, 0, 'number', diff, None, regular_cell_style_decimal), ]
+                        c_specs += [('balance', 1, 0, 'number',
+                                     diff, None, regular_cell_style_decimal), ]
                     else:
-                        c_specs += [('perc_diff', 1, 0, 'number', int(round(percent_diff))), ]             
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, regular_cell_style)
-
-            row_pos = self.print_account_totals(_xs, xlwt, ws, row_account_start, row_pos, current_account,_p)
-            
-partners_balance_xls('report.account.account_report_partner_balance_xls', 'account.account',
-    parser=PartnerBalanceWebkit)
+                        c_specs += [('perc_diff', 1, 0, 'number',
+                                     int(round(percent_diff))), ]
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, regular_cell_style)
+
+            row_pos = self.print_account_totals(
+                _xs, xlwt, ws, row_account_start, row_pos, current_account, _p)
+
+partners_balance_xls('report.account.account_report_partner_balance_xls',
+                     'account.account',
+                     parser=PartnerBalanceWebkit)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

account_financial_report_webkit_xls/report/trial_balance_xls.py

@@ -21,49 +21,56 @@
 ##############################################################################
 
 import xlwt
-import time
-from openerp.report import report_sxw
 from openerp.addons.report_xls.report_xls import report_xls
 from openerp.addons.report_xls.utils import rowcol_to_cell
-from openerp.addons.account_financial_report_webkit.report.trial_balance import TrialBalanceWebkit
+from openerp.addons.account_financial_report_webkit.report.trial_balance\
+    import TrialBalanceWebkit
 from openerp.tools.translate import _
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class trial_balance_xls(report_xls):
-    column_sizes = [12,60,17,17,17,17,17,17]
-    
+    column_sizes = [12, 60, 17, 17, 17, 17, 17, 17]
+
     def generate_xls_report(self, _p, _xs, data, objects, wb):
-       
+
         ws = wb.add_sheet(_p.report_name[:31])
         ws.panes_frozen = True
         ws.remove_splits = True
-        ws.portrait = 0 # Landscape
+        ws.portrait = 0  # Landscape
         ws.fit_width_to_pages = 1
         row_pos = 0
-        
+
         # set print header/footer
         ws.header_str = self.xls_headers['standard']
         ws.footer_str = self.xls_footers['standard']
-        
-        # cf. account_report_trial_balance.mako  
-        initial_balance_text = {'initial_balance': _('Computed'), 'opening_balance': _('Opening Entries'), False: _('No')}
-        
+
+        # cf. account_report_trial_balance.mako
+        initial_balance_text = {'initial_balance': _('Computed'),
+                                'opening_balance': _('Opening Entries'),
+                                False: _('No')}
+
         # Title
         cell_style = xlwt.easyxf(_xs['xls_title'])
-        report_name =  ' - '.join([_p.report_name.upper(), _p.company.partner_id.name, _p.company.currency_id.name])
+        report_name = ' - '.join([_p.report_name.upper(),
+                                 _p.company.partner_id.name,
+                                 _p.company.currency_id.name])
         c_specs = [
             ('report_name', 1, 0, 'text', report_name),
-        ]       
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
 
         # write empty row to define column sizes
         c_sizes = self.column_sizes
-        c_specs = [('empty%s'%i, 1, c_sizes[i], 'text', None) for i in range(0,len(c_sizes))]
+        c_specs = [('empty%s' % i, 1, c_sizes[i], 'text', None)
+                   for i in range(0, len(c_sizes))]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, set_column_size=True)        
-        
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, set_column_size=True)
+
         # Header Table
         cell_format = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
         cell_style = xlwt.easyxf(cell_format)
@@ -71,24 +78,29 @@ class trial_balance_xls(report_xls):
         c_specs = [
             ('fy', 1, 0, 'text', _('Fiscal Year')),
             ('af', 2, 0, 'text', _('Accounts Filter')),
-            ('df', 1, 0, 'text', _p.filter_form(data) == 'filter_date' and _('Dates Filter') or _('Periods Filter')),
+            ('df', 1, 0, 'text', _p.filter_form(data) ==
+             'filter_date' and _('Dates Filter') or _('Periods Filter')),
             ('tm', 2, 0, 'text',  _('Target Moves'), None, cell_style_center),
-            ('ib', 1, 0, 'text',  _('Initial Balance'), None, cell_style_center),
-            ('coa', 1, 0, 'text', _('Chart of Account'), None, cell_style_center),
-        ]       
+            ('ib', 1, 0, 'text',  _('Initial Balance'),
+             None, cell_style_center),
+            ('coa', 1, 0, 'text', _('Chart of Account'),
+             None, cell_style_center),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
 
         cell_format = _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
         c_specs = [
             ('fy', 1, 0, 'text', _p.fiscalyear.name if _p.fiscalyear else '-'),
-            ('af', 2, 0, 'text', _p.accounts(data) and ', '.join([account.code for account in _p.accounts(data)]) or _('All')),
+            ('af', 2, 0, 'text', _p.accounts(data) and ', '.join(
+                [account.code for account in _p.accounts(data)]) or _('All')),
         ]
         df = _('From') + ': '
         if _p.filter_form(data) == 'filter_date':
-            df += _p.start_date if _p.start_date else u'' 
+            df += _p.start_date if _p.start_date else u''
         else:
             df += _p.start_period.name if _p.start_period else u''
         df += ' ' + _('\nTo') + ': '
@@ -98,38 +110,58 @@ class trial_balance_xls(report_xls):
             df += _p.stop_period.name if _p.stop_period else u''
         c_specs += [
             ('df', 1, 0, 'text', df),
-            ('tm', 2, 0, 'text', _p.display_target_move(data), None, cell_style_center),
-            ('ib', 1, 0, 'text', initial_balance_text[_p.initial_balance_mode], None, cell_style_center),
-            ('coa', 1, 0, 'text', _p.chart_account.name, None, cell_style_center),
-        ]       
+            ('tm', 2, 0, 'text', _p.display_target_move(
+                data), None, cell_style_center),
+            ('ib', 1, 0, 'text', initial_balance_text[
+             _p.initial_balance_mode], None, cell_style_center),
+            ('coa', 1, 0, 'text', _p.chart_account.name,
+             None, cell_style_center),
+        ]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)  
- 
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
+
         # comparison header table
         if _p.comparison_mode in ('single', 'multiple'):
             row_pos += 1
-            cell_format_ct = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all']
+            cell_format_ct = _xs['bold'] + \
+                _xs['fill_blue'] + _xs['borders_all']
             cell_style_ct = xlwt.easyxf(cell_format_ct)
-            c_specs = [('ct', 8, 0, 'text', _('Comparisons'))]       
+            c_specs = [('ct', 8, 0, 'text', _('Comparisons'))]
             row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-            row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_ct)            
+            row_pos = self.xls_write_row(
+                ws, row_pos, row_data, row_style=cell_style_ct)
             cell_style_center = xlwt.easyxf(cell_format)
             for index, params in enumerate(_p.comp_params):
-                c_specs = [('c', 3, 0, 'text', _('Comparison') + str(index + 1) + ' (C' + str(index + 1) + ')')]
+                c_specs = [
+                    ('c', 3, 0, 'text', _('Comparison') + str(index + 1) +
+                     ' (C' + str(index + 1) + ')')]
                 if params['comparison_filter'] == 'filter_date':
-                    c_specs += [('f', 3, 0, 'text', _('Dates Filter') + ': ' + _p.formatLang(params['start'], date=True) + ' - ' + _p.formatLang(params['stop'], date=True))]
+                    c_specs += [('f', 3, 0, 'text', _('Dates Filter') + ': ' +
+                                 _p.formatLang(
+                                     params['start'], date=True) + ' - ' +
+                                 _p.formatLang(params['stop'], date=True))]
                 elif params['comparison_filter'] == 'filter_period':
-                    c_specs += [('f', 3, 0, 'text', _('Periods Filter') + ': ' + params['start'].name + ' - ' + params['stop'].name)]
+                    c_specs += [('f', 3, 0, 'text', _('Periods Filter') +
+                                 ': ' + params['start'].name + ' - ' +
+                                 params['stop'].name)]
                 else:
-                    c_specs += [('f', 3, 0, 'text', _('Fiscal Year') + ': ' + params['fiscalyear'].name)]
-                c_specs += [('ib', 2, 0, 'text', _('Initial Balance') + ': ' + initial_balance_text[params['initial_balance_mode']])]
-                row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-                row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style_center)
+                    c_specs += [('f', 3, 0, 'text', _('Fiscal Year') +
+                                 ': ' + params['fiscalyear'].name)]
+                c_specs += [('ib', 2, 0, 'text', _('Initial Balance') +
+                             ': ' +
+                             initial_balance_text[
+                                 params['initial_balance_mode']])]
+                row_data = self.xls_row_template(
+                    c_specs, [x[0] for x in c_specs])
+                row_pos = self.xls_write_row(
+                    ws, row_pos, row_data, row_style=cell_style_center)
 
         row_pos += 1
- 
+
         # Column Header Row
-        cell_format = _xs['bold'] + _xs['fill_blue'] + _xs['borders_all'] + _xs['wrap'] + _xs['top']
+        cell_format = _xs['bold'] + _xs['fill_blue'] + \
+            _xs['borders_all'] + _xs['wrap'] + _xs['top']
         cell_style = xlwt.easyxf(cell_format)
         cell_style_right = xlwt.easyxf(cell_format + _xs['right'])
         cell_style_center = xlwt.easyxf(cell_format + _xs['center'])
@@ -143,46 +175,65 @@ class trial_balance_xls(report_xls):
         ]
         if _p.comparison_mode == 'no_comparison':
             if _p.initial_balance_mode:
-                c_specs += [('init_bal', 1, 0, 'text', _('Initial Balance'), None, cell_style_right)]
+                c_specs += [('init_bal', 1, 0, 'text',
+                             _('Initial Balance'), None, cell_style_right)]
             c_specs += [
                 ('debit', 1, 0, 'text', _('Debit'), None, cell_style_right),
                 ('credit', 1, 0, 'text', _('Credit'), None, cell_style_right),
-            ]       
+            ]
 
         if _p.comparison_mode == 'no_comparison' or not _p.fiscalyear:
-            c_specs += [('balance', 1, 0, 'text', _('Balance'), None, cell_style_right)]
+            c_specs += [('balance', 1, 0, 'text',
+                         _('Balance'), None, cell_style_right)]
         else:
-            c_specs += [('balance_fy', 1, 0, 'text', _('Balance %s') % _p.fiscalyear.name, None, cell_style_right)]
+            c_specs += [('balance_fy', 1, 0, 'text', _('Balance %s') %
+                         _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' and _p.comp_params[index].get('fiscalyear', False):
-                    c_specs += [('balance_%s' %index, 1, 0, 'text', _('Balance %s') % _p.comp_params[index]['fiscalyear'].name, None, cell_style_right)]
+                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') %
+                                 _p.comp_params[index]['fiscalyear'].name,
+                                 None, cell_style_right)]
                 else:
-                    c_specs += [('balance_%s' %index, 1, 0, 'text', _('Balance C%s') % (index + 1), None, cell_style_right)]
+                    c_specs += [('balance_%s' % index, 1, 0, 'text',
+                                 _('Balance C%s') % (index + 1), None,
+                                 cell_style_right)]
                 if _p.comparison_mode == 'single':
                     c_specs += [
-                        ('diff', 1, 0, 'text', _('Difference'), None, cell_style_right),
-                        ('diff_percent', 1, 0, 'text', _('% Difference'), None, cell_style_center),
-                    ]       
-        c_specs += [('type', 1, 0, 'text', _('Type'), None, cell_style_center)]             
+                        ('diff', 1, 0, 'text', _('Difference'),
+                         None, cell_style_right),
+                        ('diff_percent', 1, 0, 'text',
+                         _('% Difference'), None, cell_style_center),
+                    ]
+        c_specs += [('type', 1, 0, 'text', _('Type'), None, cell_style_center)]
         row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-        row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
-        ws.set_horz_split_pos(row_pos) 
-         
+        row_pos = self.xls_write_row(
+            ws, row_pos, row_data, row_style=cell_style)
+        ws.set_horz_split_pos(row_pos)
+
         last_child_consol_ids = []
         last_level = False
-        
+
         # cell styles for account data
         view_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all']
         view_cell_style = xlwt.easyxf(view_cell_format)
         view_cell_style_center = xlwt.easyxf(view_cell_format + _xs['center'])
-        view_cell_style_decimal = xlwt.easyxf(view_cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        view_cell_style_pct = xlwt.easyxf(view_cell_format + _xs['center'], num_format_str = '0')
+        view_cell_style_decimal = xlwt.easyxf(
+            view_cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+        view_cell_style_pct = xlwt.easyxf(
+            view_cell_format + _xs['center'], num_format_str='0')
         regular_cell_format = _xs['borders_all']
         regular_cell_style = xlwt.easyxf(regular_cell_format)
-        regular_cell_style_center = xlwt.easyxf(regular_cell_format + _xs['center'])
-        regular_cell_style_decimal = xlwt.easyxf(regular_cell_format + _xs['right'], num_format_str = report_xls.decimal_format)
-        regular_cell_style_pct = xlwt.easyxf(regular_cell_format + _xs['center'], num_format_str = '0')        
+        regular_cell_style_center = xlwt.easyxf(
+            regular_cell_format + _xs['center'])
+        regular_cell_style_decimal = xlwt.easyxf(
+            regular_cell_format + _xs['right'],
+            num_format_str=report_xls.decimal_format)
+        regular_cell_style_pct = xlwt.easyxf(
+            regular_cell_format + _xs['center'], num_format_str='0')
 
         for current_account in objects:
 
@@ -199,20 +250,24 @@ class trial_balance_xls(report_xls):
                 cell_style_center = regular_cell_style_center
                 cell_style_decimal = regular_cell_style_decimal
                 cell_style_pct = regular_cell_style_pct
-    
+
             comparisons = current_account.comparisons
-    
+
             if current_account.id in last_child_consol_ids:
-                # current account is a consolidation child of the last account: use the level of last account
+                # current account is a consolidation child of the last account:
+                # use the level of last account
                 level = last_level
                 level_class = 'account_level_consol'
             else:
-                # current account is a not a consolidation child: use its own level
+                # current account is a not a consolidation child: use its own
+                # level
                 level = current_account.level or 0
                 level_class = "account_level_%s" % (level,)
-                last_child_consol_ids = [child_consol_id.id for child_consol_id in current_account.child_consol_ids]
+                last_child_consol_ids = [
+                    child_consol_id.id for child_consol_id in
+                    current_account.child_consol_ids]
                 last_level = current_account.level
- 
+
             c_specs = [
                 ('code', 1, 0, 'text', current_account.code),
                 ('account', account_span, 0, 'text', current_account.name),
@@ -222,37 +277,53 @@ class trial_balance_xls(report_xls):
                 debit_cell = rowcol_to_cell(row_pos, 4)
                 credit_cell = rowcol_to_cell(row_pos, 5)
                 bal_formula = debit_cell + '-' + credit_cell
-                
+
                 if _p.initial_balance_mode:
                     init_cell = rowcol_to_cell(row_pos, 3)
-                    debit_cell = rowcol_to_cell(row_pos, 4)                
+                    debit_cell = rowcol_to_cell(row_pos, 4)
                     credit_cell = rowcol_to_cell(row_pos, 5)
-                    bal_formula = init_cell + '+' + debit_cell + '-' + credit_cell
-                    c_specs += [('init_bal', 1, 0, 'number', current_account.init_balance, None, cell_style_decimal)]
+                    bal_formula = init_cell + '+' + \
+                        debit_cell + '-' + credit_cell
+                    c_specs += [('init_bal', 1, 0, 'number',
+                                 current_account.init_balance, None,
+                                 cell_style_decimal)]
                 c_specs += [
-                    ('debit', 1, 0, 'number', current_account.debit, None, cell_style_decimal),
-                    ('credit', 1, 0, 'number', current_account.credit, None, cell_style_decimal),
-                ]       
-                c_specs += [('balance', 1, 0, 'number', None, bal_formula, cell_style_decimal)]
+                    ('debit', 1, 0, 'number', current_account.debit,
+                     None, cell_style_decimal),
+                    ('credit', 1, 0, 'number', current_account.credit,
+                     None, cell_style_decimal),
+                ]
+                c_specs += [('balance', 1, 0, 'number', None,
+                             bal_formula, cell_style_decimal)]
             else:
-                c_specs += [('balance', 1, 0, 'number', current_account.balance, None, cell_style_decimal)]
-                
-            if _p.comparison_mode in ('single', 'multiple'):                
+                c_specs += [('balance', 1, 0, 'number',
+                             current_account.balance, None,
+                             cell_style_decimal)]
+
+            if _p.comparison_mode in ('single', 'multiple'):
                 c = 1
                 for comp_account in comparisons:
-                    c_specs += [('balance_%s' %c, 1, 0, 'number', comp_account['balance'], None, cell_style_decimal)]
+                    c_specs += [('balance_%s' % c, 1, 0, 'number',
+                                 comp_account['balance'], None,
+                                 cell_style_decimal)]
                     c += 1
                     if _p.comparison_mode == 'single':
                         c_specs += [
-                            ('diff', 1, 0, 'number', comp_account['diff'], None, cell_style_decimal),
-                            ('diff_percent', 1, 0, 'number', comp_account['percent_diff'] and comp_account['percent_diff'] or 0, None, cell_style_pct),
-                        ]      
-                        
-            c_specs += [('type', 1, 0, 'text', current_account.type, None, cell_style_center)]          
+                            ('diff', 1, 0, 'number', comp_account[
+                             'diff'], None, cell_style_decimal),
+                            ('diff_percent', 1, 0, 'number', comp_account[
+                             'percent_diff'] and comp_account['percent_diff']
+                             or 0, None, cell_style_pct),
+                        ]
+
+            c_specs += [('type', 1, 0, 'text',
+                         current_account.type, None, cell_style_center)]
             row_data = self.xls_row_template(c_specs, [x[0] for x in c_specs])
-            row_pos = self.xls_write_row(ws, row_pos, row_data, row_style=cell_style)
-            
-trial_balance_xls('report.account.account_report_trial_balance_xls', 'account.account',
-    parser=TrialBalanceWebkit)
+            row_pos = self.xls_write_row(
+                ws, row_pos, row_data, row_style=cell_style)
+
+trial_balance_xls('report.account.account_report_trial_balance_xls',
+                  'account.account',
+                  parser=TrialBalanceWebkit)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

account_financial_report_webkit_xls/wizard/__init__.py

@@ -24,4 +24,4 @@ from . import general_ledger_wizard
 from . import trial_balance_wizard
 from . import partners_balance_wizard
 from . import partners_ledger_wizard
-from . import open_invoices_wizard
+from . import open_invoices_wizard

account_financial_report_webkit_xls/wizard/general_ledger_wizard.py

@@ -24,9 +24,10 @@ from openerp.osv import orm
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class general_ledger_webkit_wizard(orm.TransientModel):
     _inherit = 'general.ledger.webkit'
-       
+
     def xls_export(self, cr, uid, ids, context=None):
         return self.check_report(cr, uid, ids, context=context)
 
@@ -39,5 +40,5 @@ class general_ledger_webkit_wizard(orm.TransientModel):
                     'report_name': 'account.account_report_general_ledger_xls',
                     'datas': data}
         else:
-            return super(general_ledger_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context)
-        
+            return super(general_ledger_webkit_wizard, self)._print_report(
+                cr, uid, ids, data, context=context)

account_financial_report_webkit_xls/wizard/open_invoices_wizard.py

@@ -24,9 +24,10 @@ from openerp.osv import orm
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class open_invoices_webkit_wizard(orm.TransientModel):
     _inherit = 'open.invoices.webkit'
-       
+
     def xls_export(self, cr, uid, ids, context=None):
         return self.check_report(cr, uid, ids, context=context)
 
@@ -39,4 +40,5 @@ class open_invoices_webkit_wizard(orm.TransientModel):
                     'report_name': 'account.account_report_open_invoices_xls',
                     'datas': data}
         else:
-            return super(open_invoices_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context)
+            return super(open_invoices_webkit_wizard, self)._print_report(
+                cr, uid, ids, data, context=context)

account_financial_report_webkit_xls/wizard/partners_balance_wizard.py

@@ -24,9 +24,10 @@ from openerp.osv import orm
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class partner_balance_wizard(orm.TransientModel):
     _inherit = 'partner.balance.webkit'
-       
+
     def xls_export(self, cr, uid, ids, context=None):
         return self.check_report(cr, uid, ids, context=context)
 
@@ -35,9 +36,10 @@ class partner_balance_wizard(orm.TransientModel):
         if context.get('xls_export'):
             # we update form with display account value
             data = self.pre_print_report(cr, uid, ids, data, context=context)
-            return {'type': 'ir.actions.report.xml',
-                    'report_name': 'account.account_report_partner_balance_xls',
-                    'datas': data}
+            return {
+                'type': 'ir.actions.report.xml',
+                'report_name': 'account.account_report_partner_balance_xls',
+                'datas': data}
         else:
-            return super(partner_balance_wizard, self)._print_report(cr, uid, ids, data, context=context)
- 
+            return super(partner_balance_wizard, self)._print_report(
+                cr, uid, ids, data, context=context)

account_financial_report_webkit_xls/wizard/partners_ledger_wizard.py

@@ -24,9 +24,10 @@ from openerp.osv import orm
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class partner_ledger_webkit_wizard(orm.TransientModel):
     _inherit = 'partners.ledger.webkit'
-       
+
     def xls_export(self, cr, uid, ids, context=None):
         return self.check_report(cr, uid, ids, context=context)
 
@@ -39,4 +40,5 @@ class partner_ledger_webkit_wizard(orm.TransientModel):
                     'report_name': 'account.account_report_partner_ledger_xls',
                     'datas': data}
         else:
-            return super(partner_ledger_webkit_wizard, self)._print_report(cr, uid, ids, data, context=context)
+            return super(partner_ledger_webkit_wizard, self)._print_report(
+                cr, uid, ids, data, context=context)

account_financial_report_webkit_xls/wizard/trial_balance_wizard.py

@@ -24,9 +24,10 @@ from openerp.osv import orm
 #import logging
 #_logger = logging.getLogger(__name__)
 
+
 class trial_balance_wizard(orm.TransientModel):
     _inherit = 'trial.balance.webkit'
-       
+
     def xls_export(self, cr, uid, ids, context=None):
         return self.check_report(cr, uid, ids, context=context)
 
@@ -39,5 +40,5 @@ class trial_balance_wizard(orm.TransientModel):
                     'report_name': 'account.account_report_trial_balance_xls',
                     'datas': data}
         else:
-            return super(trial_balance_wizard, self)._print_report(cr, uid, ids, data, context=context)
-
+            return super(trial_balance_wizard, self)._print_report(
+                cr, uid, ids, data, context=context)