Browse Source

Merge pull request #63 from sergiocorato/fix_report_xls

[FIX][8.0] revert class renamed report_xls
pull/65/head
Pedro M. Baeza 8 years ago
committed by GitHub
parent
commit
a5c2e7799a
  1. 10
      report_xls/report_xls.py

10
report_xls/report_xls.py

@ -44,7 +44,7 @@ class AttrDict(dict):
self.__dict__ = self
class ReportXls(report_sxw):
class report_xls(report_sxw):
xls_types = {
'bool': xlwt.Row.set_cell_boolean,
@ -112,7 +112,7 @@ class ReportXls(report_sxw):
# use model from 'data' when no ir.actions.report.xml entry
self.table = data.get('model') or self.table
return self.create_source_xls(cr, uid, ids, data, context)
return super(ReportXls, self).create(cr, uid, ids, data, context)
return super(report_xls, self).create(cr, uid, ids, data, context)
def create_source_xls(self, cr, uid, ids, data, context=None):
if not context:
@ -206,7 +206,7 @@ class ReportXls(report_sxw):
c.append({'formula': s[5]})
else:
c.append({
'write_cell_func': ReportXls.xls_types[c[3]]})
'write_cell_func': report_xls.xls_types[c[3]]})
# Set custom cell style
if s_len > 6 and s[6] is not None:
c.append(s[6])
@ -221,7 +221,7 @@ class ReportXls(report_sxw):
col += c[1]
break
if not found:
_logger.warn("ReportXls.xls_row_template, "
_logger.warn("report_xls.xls_row_template, "
"column '%s' not found in specs", w)
return r
@ -235,7 +235,7 @@ class ReportXls(report_sxw):
style = spec[6] and spec[6] or row_style
if not data:
# if no data, use default values
data = ReportXls.xls_types_default[spec[3]]
data = report_xls.xls_types_default[spec[3]]
if size != 1:
if formula:
ws.write_merge(

Loading…
Cancel
Save