From bff5f4222c1cdda535a9a58f10fedfbe9bc93625 Mon Sep 17 00:00:00 2001 From: "laetitia.gangloff@acsone.eu" Date: Thu, 7 Aug 2014 11:48:12 +0200 Subject: [PATCH] [pep8] - account_move_line_report_xls --- account_move_line_report_xls/__init__.py | 5 +- .../account_move_line.py | 12 +- .../report/move_line_list_xls.py | 219 ++++++++++++------ 3 files changed, 158 insertions(+), 78 deletions(-) diff --git a/account_move_line_report_xls/__init__.py b/account_move_line_report_xls/__init__.py index d4b510be..0d4ee376 100644 --- a/account_move_line_report_xls/__init__.py +++ b/account_move_line_report_xls/__init__.py @@ -25,5 +25,6 @@ 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''') diff --git a/account_move_line_report_xls/account_move_line.py b/account_move_line_report_xls/account_move_line.py index 62e81afc..67ffef00 100644 --- a/account_move_line_report_xls/account_move_line.py +++ b/account_move_line_report_xls/account_move_line.py @@ -21,8 +21,6 @@ ############################################################################## from openerp.osv import orm -from openerp.addons.report_xls.utils import rowcol_to_cell, _render -from openerp.tools.translate import _ class account_move_line(orm.Model): @@ -34,11 +32,11 @@ class account_move_line(orm.Model): 'move', 'name', 'date', 'journal', 'period', 'partner', 'account', 'date_maturity', 'debit', 'credit', 'balance', 'reconcile', 'reconcile_partial', 'analytic_account', - #'ref', 'partner_ref', 'tax_code', 'tax_amount', 'amount_residual', - #'amount_currency', 'currency_name', 'company_currency', - #'amount_residual_currency', - #'product', 'product_ref', 'product_uom', 'quantity', - #'statement', 'invoice', 'narration', 'blocked', + # 'ref', 'partner_ref', 'tax_code', 'tax_amount', + # 'amount_residual', 'amount_currency', 'currency_name', + # 'company_currency', 'amount_residual_currency', + # 'product', 'product_ref', 'product_uom', 'quantity', + # 'statement', 'invoice', 'narration', 'blocked', ] # Change/Add Template entries diff --git a/account_move_line_report_xls/report/move_line_list_xls.py b/account_move_line_report_xls/report/move_line_list_xls.py index 89fe7a58..6c1f0f3f 100644 --- a/account_move_line_report_xls/report/move_line_list_xls.py +++ b/account_move_line_report_xls/report/move_line_list_xls.py @@ -21,14 +21,12 @@ ############################################################################## import xlwt -import time from datetime import datetime from openerp.osv import orm 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, _render from openerp.tools.translate import translate, _ -from openerp import pooler import logging _logger = logging.getLogger(__name__) @@ -38,7 +36,8 @@ _ir_translation_name = 'move.line.list.xls' class move_line_xls_parser(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): - super(move_line_xls_parser, self).__init__(cr, uid, name, context=context) + super(move_line_xls_parser, self).__init__( + cr, uid, name, context=context) move_obj = self.pool.get('account.move.line') self.context = context wanted_list = move_obj._report_xls_fields(cr, uid, context) @@ -52,13 +51,16 @@ class move_line_xls_parser(report_sxw.rml_parse): def _(self, src): lang = self.context.get('lang', 'en_US') - return translate(self.cr, _ir_translation_name, 'report', lang, src) or src + return translate(self.cr, _ir_translation_name, 'report', lang, src)\ + or src class move_line_xls(report_xls): - def __init__(self, name, table, rml=False, parser=False, header=True, store=False): - super(move_line_xls, self).__init__(name, table, rml, parser, header, store) + def __init__(self, name, table, rml=False, parser=False, header=True, + store=False): + super(move_line_xls, self).__init__( + name, table, rml, parser, header, store) # Cell Styles _xs = self.xls_styles @@ -70,14 +72,21 @@ class move_line_xls(report_xls): # lines aml_cell_format = _xs['borders_all'] self.aml_cell_style = xlwt.easyxf(aml_cell_format) - self.aml_cell_style_center = xlwt.easyxf(aml_cell_format + _xs['center']) - self.aml_cell_style_date = xlwt.easyxf(aml_cell_format + _xs['left'], num_format_str=report_xls.date_format) - self.aml_cell_style_decimal = xlwt.easyxf(aml_cell_format + _xs['right'], num_format_str=report_xls.decimal_format) + self.aml_cell_style_center = xlwt.easyxf( + aml_cell_format + _xs['center']) + self.aml_cell_style_date = xlwt.easyxf( + aml_cell_format + _xs['left'], + num_format_str=report_xls.date_format) + self.aml_cell_style_decimal = xlwt.easyxf( + aml_cell_format + _xs['right'], + num_format_str=report_xls.decimal_format) # totals rt_cell_format = _xs['bold'] + _xs['fill'] + _xs['borders_all'] self.rt_cell_style = xlwt.easyxf(rt_cell_format) self.rt_cell_style_right = xlwt.easyxf(rt_cell_format + _xs['right']) - self.rt_cell_style_decimal = xlwt.easyxf(rt_cell_format + _xs['right'], num_format_str=report_xls.decimal_format) + self.rt_cell_style_decimal = xlwt.easyxf( + rt_cell_format + _xs['right'], + num_format_str=report_xls.decimal_format) # XLS Template self.col_specs_template = { @@ -95,19 +104,27 @@ class move_line_xls(report_xls): 'totals': [1, 0, 'text', None]}, 'date': { 'header': [1, 13, 'text', _render("_('Effective Date')")], - 'lines': [1, 0, 'date', _render("datetime.strptime(line.date,'%Y-%m-%d')"), None, self.aml_cell_style_date], + 'lines': [1, 0, 'date', + _render("datetime.strptime(line.date,'%Y-%m-%d')"), + None, self.aml_cell_style_date], 'totals': [1, 0, 'text', None]}, 'period': { 'header': [1, 12, 'text', _render("_('Period')")], - 'lines': [1, 0, 'text', _render("line.period_id.code or line.period_id.name")], + 'lines': + [1, 0, 'text', + _render("line.period_id.code or line.period_id.name")], 'totals': [1, 0, 'text', None]}, 'partner': { 'header': [1, 36, 'text', _render("_('Partner')")], - 'lines': [1, 0, 'text', _render("line.partner_id and line.partner_id.name or ''")], + 'lines': + [1, 0, 'text', + _render("line.partner_id and line.partner_id.name or ''")], 'totals': [1, 0, 'text', None]}, 'partner_ref': { 'header': [1, 36, 'text', _render("_('Partner Reference')")], - 'lines': [1, 0, 'text', _render("line.partner_id and line.partner_id.ref or ''")], + 'lines': + [1, 0, 'text', + _render("line.partner_id and line.partner_id.ref or ''")], 'totals': [1, 0, 'text', None]}, 'account': { 'header': [1, 12, 'text', _render("_('Account')")], @@ -115,47 +132,76 @@ class move_line_xls(report_xls): 'totals': [1, 0, 'text', None]}, 'date_maturity': { 'header': [1, 13, 'text', _render("_('Maturity Date')")], - 'lines': [1, 0, _render("line.date_maturity.val and 'date' or 'text'"), - _render("line.date_maturity.val and datetime.strptime(line.date_maturity,'%Y-%m-%d') or None"), + 'lines': + [1, 0, + _render("line.date_maturity.val and 'date' or 'text'"), + _render( + "line.date_maturity.val and datetime.strptime(line.date_maturity,'%Y-%m-%d') or None"), None, self.aml_cell_style_date], 'totals': [1, 0, 'text', None]}, 'debit': { - 'header': [1, 18, 'text', _render("_('Debit')"), None, self.rh_cell_style_right], - 'lines': [1, 0, 'number', _render("line.debit"), None, self.aml_cell_style_decimal], - 'totals': [1, 0, 'number', None, _render("debit_formula"), self.rt_cell_style_decimal]}, + 'header': [1, 18, 'text', _render("_('Debit')"), None, + self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("line.debit"), None, + self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("debit_formula"), + self.rt_cell_style_decimal]}, 'credit': { - 'header': [1, 18, 'text', _render("_('Credit')"), None, self.rh_cell_style_right], - 'lines': [1, 0, 'number', _render("line.credit"), None, self.aml_cell_style_decimal], - 'totals': [1, 0, 'number', None, _render("credit_formula"), self.rt_cell_style_decimal]}, + 'header': [1, 18, 'text', _render("_('Credit')"), None, + self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("line.credit"), None, + self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("credit_formula"), + self.rt_cell_style_decimal]}, 'balance': { - 'header': [1, 18, 'text', _render("_('Balance')"), None, self.rh_cell_style_right], - 'lines': [1, 0, 'number', None, _render("bal_formula"), self.aml_cell_style_decimal], - 'totals': [1, 0, 'number', None, _render("bal_formula"), self.rt_cell_style_decimal]}, + 'header': [1, 18, 'text', _render("_('Balance')"), None, + self.rh_cell_style_right], + 'lines': [1, 0, 'number', None, _render("bal_formula"), + self.aml_cell_style_decimal], + 'totals': [1, 0, 'number', None, _render("bal_formula"), + self.rt_cell_style_decimal]}, 'reconcile': { - 'header': [1, 12, 'text', _render("_('Rec.')"), None, self.rh_cell_style_center], - 'lines': [1, 0, 'text', _render("line.reconcile_id.name or ''"), None, self.aml_cell_style_center], + 'header': [1, 12, 'text', _render("_('Rec.')"), None, + self.rh_cell_style_center], + 'lines': [1, 0, 'text', + _render("line.reconcile_id.name or ''"), None, + self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, 'reconcile_partial': { - 'header': [1, 12, 'text', _render("_('Part. Rec.')"), None, self.rh_cell_style_center], - 'lines': [1, 0, 'text', _render("line.reconcile_partial_id.name or ''"), None, self.aml_cell_style_center], + 'header': [1, 12, 'text', _render("_('Part. Rec.')"), None, + self.rh_cell_style_center], + 'lines': [1, 0, 'text', + _render("line.reconcile_partial_id.name or ''"), + None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, 'tax_code': { - 'header': [1, 12, 'text', _render("_('Tax Code')"), None, self.rh_cell_style_center], - 'lines': [1, 0, 'text', _render("line.tax_code_id.code or ''"), None, self.aml_cell_style_center], + 'header': [1, 12, 'text', _render("_('Tax Code')"), None, + self.rh_cell_style_center], + 'lines': [1, 0, 'text', _render("line.tax_code_id.code or ''"), + None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, 'tax_amount': { - 'header': [1, 18, 'text', _render("_('Tax/Base Amount')"), None, self.rh_cell_style_right], - 'lines': [1, 0, 'number', _render("line.tax_amount"), None, self.aml_cell_style_decimal], + 'header': [1, 18, 'text', _render("_('Tax/Base Amount')"), + None, self.rh_cell_style_right], + 'lines': [1, 0, 'number', _render("line.tax_amount"), None, + self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, 'amount_currency': { - 'header': [1, 18, 'text', _render("_('Am. Currency')"), None, self.rh_cell_style_right], - 'lines': [1, 0, _render("line.amount_currency and 'number' or 'text'"), - _render("line.amount_currency or None"), - None, self.aml_cell_style_decimal], + 'header': [1, 18, 'text', _render("_('Am. Currency')"), None, + self.rh_cell_style_right], + 'lines': + [1, 0, + _render("line.amount_currency and 'number' or 'text'"), + _render("line.amount_currency or None"), + None, self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, 'currency_name': { - 'header': [1, 6, 'text', _render("_('Curr.')"), None, self.rh_cell_style_center], - 'lines': [1, 0, 'text', _render("line.currency_id and line.currency_id.name or ''"), None, self.aml_cell_style_center], + 'header': [1, 6, 'text', _render("_('Curr.')"), None, + self.rh_cell_style_center], + 'lines': + [1, 0, 'text', + _render("line.currency_id and line.currency_id.name or ''"), + None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, 'journal': { 'header': [1, 12, 'text', _render("_('Journal')")], @@ -163,11 +209,14 @@ class move_line_xls(report_xls): 'totals': [1, 0, 'text', None]}, 'company_currency': { 'header': [1, 10, 'text', _render("_('Comp. Curr.')")], - 'lines': [1, 0, 'text', _render("line.company_id.currency_id.name or ''"), None, self.aml_cell_style_center], + 'lines': [1, 0, 'text', + _render("line.company_id.currency_id.name or ''"), + None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, 'analytic_account': { 'header': [1, 36, 'text', _render("_('Analytic Account')")], - 'lines': [1, 0, 'text', _render("line.analytic_account_id.code or ''")], + 'lines': [1, 0, 'text', + _render("line.analytic_account_id.code or ''")], 'totals': [1, 0, 'text', None]}, 'product': { 'header': [1, 36, 'text', _render("_('Product')")], @@ -175,44 +224,64 @@ class move_line_xls(report_xls): 'totals': [1, 0, 'text', None]}, 'product_ref': { 'header': [1, 36, 'text', _render("_('Product Reference')")], - 'lines': [1, 0, 'text', _render("line.product_id.default_code or ''")], + 'lines': [1, 0, 'text', + _render("line.product_id.default_code or ''")], 'totals': [1, 0, 'text', None]}, 'product_uom': { 'header': [1, 20, 'text', _render("_('Unit of Measure')")], - 'lines': [1, 0, 'text', _render("line.product_uom_id.name or ''")], + 'lines': [1, 0, 'text', + _render("line.product_uom_id.name or ''")], 'totals': [1, 0, 'text', None]}, 'quantity': { - 'header': [1, 8, 'text', _render("_('Qty')"), None, self.rh_cell_style_right], - 'lines': [1, 0, _render("line.quantity and 'number' or 'text'"), - _render("line.quantity or None"), None, self.aml_cell_style_decimal], + 'header': [1, 8, 'text', _render("_('Qty')"), None, + self.rh_cell_style_right], + 'lines': [1, 0, + _render("line.quantity and 'number' or 'text'"), + _render("line.quantity or None"), None, + self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, 'statement': { 'header': [1, 20, 'text', _render("_('Statement')")], - 'lines': [1, 0, 'text', _render("line.statement_id and line.statement_id.name or ''")], + 'lines': + [1, 0, 'text', + _render("line.statement_id and line.statement_id.name or ''") + ], 'totals': [1, 0, 'text', None]}, 'invoice': { 'header': [1, 20, 'text', _render("_('Invoice')")], - 'lines': [1, 0, 'text', _render("line.invoice and line.invoice.number or ''")], + 'lines': + [1, 0, 'text', + _render("line.invoice and line.invoice.number or ''")], 'totals': [1, 0, 'text', None]}, 'amount_residual': { - 'header': [1, 18, 'text', _render("_('Residual Amount')"), None, self.rh_cell_style_right], - 'lines': [1, 0, _render("line.amount_residual and 'number' or 'text'"), - _render("line.amount_residual or None"), - None, self.aml_cell_style_decimal], + 'header': [1, 18, 'text', _render("_('Residual Amount')"), + None, self.rh_cell_style_right], + 'lines': + [1, 0, + _render("line.amount_residual and 'number' or 'text'"), + _render("line.amount_residual or None"), + None, self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, 'amount_residual_currency': { - 'header': [1, 18, 'text', _render("_('Res. Am. in Curr.')"), None, self.rh_cell_style_right], - 'lines': [1, 0, _render("line.amount_residual_currency and 'number' or 'text'"), - _render("line.amount_residual_currency or None"), - None, self.aml_cell_style_decimal], + 'header': [1, 18, 'text', _render("_('Res. Am. in Curr.')"), + None, self.rh_cell_style_right], + 'lines': + [1, 0, + _render( + "line.amount_residual_currency and 'number' or 'text'"), + _render("line.amount_residual_currency or None"), + None, self.aml_cell_style_decimal], 'totals': [1, 0, 'text', None]}, 'narration': { 'header': [1, 42, 'text', _render("_('Notes')")], - 'lines': [1, 0, 'text', _render("line.move_id.narration or ''")], + 'lines': [1, 0, 'text', + _render("line.move_id.narration or ''")], 'totals': [1, 0, 'text', None]}, 'blocked': { - 'header': [1, 4, 'text', _('Lit.'), None, self.rh_cell_style_right], - 'lines': [1, 0, 'text', _render("line.blocked and 'x' or ''"), None, self.aml_cell_style_center], + 'header': [1, 4, 'text', _('Lit.'), + None, self.rh_cell_style_right], + 'lines': [1, 0, 'text', _render("line.blocked and 'x' or ''"), + None, self.aml_cell_style_center], 'totals': [1, 0, 'text', None]}, } @@ -225,7 +294,8 @@ class move_line_xls(report_xls): debit_pos = 'debit' in wanted_list and wanted_list.index('debit') credit_pos = 'credit' in wanted_list and wanted_list.index('credit') if not (credit_pos and debit_pos) and 'balance' in wanted_list: - raise orm.except_orm(_('Customisation Error!'), + raise orm.except_orm( + _('Customisation Error!'), _("The 'Balance' field is a calculated XLS field requiring the presence of the 'Debit' and 'Credit' fields !")) #report_name = objects[0]._description or objects[0]._name @@ -247,13 +317,18 @@ class move_line_xls(report_xls): ('report_name', 1, 0, 'text', report_name), ] row_data = self.xls_row_template(c_specs, ['report_name']) - 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) row_pos += 1 # Column headers - c_specs = map(lambda x: self.render(x, self.col_specs_template, 'header', render_space={'_': _p._}), wanted_list) + c_specs = map(lambda x: self.render( + x, self.col_specs_template, 'header', render_space={'_': _p._}), + wanted_list) 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=self.rh_cell_style, set_column_size=True) + row_pos = self.xls_write_row( + ws, row_pos, row_data, row_style=self.rh_cell_style, + set_column_size=True) ws.set_horz_split_pos(row_pos) # account move lines @@ -261,9 +336,12 @@ class move_line_xls(report_xls): debit_cell = rowcol_to_cell(row_pos, debit_pos) credit_cell = rowcol_to_cell(row_pos, credit_pos) bal_formula = debit_cell + '-' + credit_cell - c_specs = map(lambda x: self.render(x, self.col_specs_template, 'lines'), wanted_list) + c_specs = map( + lambda x: self.render(x, self.col_specs_template, 'lines'), + wanted_list) 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=self.aml_cell_style) + row_pos = self.xls_write_row( + ws, row_pos, row_data, row_style=self.aml_cell_style) # Totals aml_cnt = len(objects) @@ -276,12 +354,15 @@ class move_line_xls(report_xls): debit_cell = rowcol_to_cell(row_pos, debit_pos) credit_cell = rowcol_to_cell(row_pos, credit_pos) bal_formula = debit_cell + '-' + credit_cell - c_specs = map(lambda x: self.render(x, self.col_specs_template, 'totals'), wanted_list) + c_specs = map( + lambda x: self.render(x, self.col_specs_template, 'totals'), + wanted_list) 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=self.rt_cell_style_right) + row_pos = self.xls_write_row( + ws, row_pos, row_data, row_style=self.rt_cell_style_right) move_line_xls('report.move.line.list.xls', - 'account.move.line', - parser=move_line_xls_parser) + 'account.move.line', + parser=move_line_xls_parser) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: