Browse Source

[REF] auto-fix conventions

pull/8/head
moylop260 10 years ago
parent
commit
20066d6705
  1. 1
      base_report_assembler/__init__.py
  2. 5
      base_report_assembler/assembled_report.py
  3. 14
      base_report_assembler/ir_report.py
  4. 19
      base_report_assembler/report_assembler.py
  5. 4
      report_xls/report_xls.py

1
base_report_assembler/__init__.py

@ -21,4 +21,3 @@
from . import report_assembler
from . import assembled_report
from . import ir_report

5
base_report_assembler/assembled_report.py

@ -20,6 +20,7 @@
##############################################################################
from openerp.osv import orm, fields
class AssembledReport(orm.Model):
_name = 'assembled.report'
@ -33,10 +34,10 @@ class AssembledReport(orm.Model):
'model': fields.char('Object model'),
'sequence': fields.integer('Sequence', required=True),
'company_id': fields.many2one('res.company', 'Company', required=True),
}
}
_defaults = {
'sequence': 1,
'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(
cr, uid, 'assembled.report', context=c)
}
}

14
base_report_assembler/ir_report.py

@ -21,7 +21,7 @@
from openerp.osv import orm
from openerp import netsvc
from openerp.report.report_sxw import rml_parse
from report_assembler import PDFReportAssembler
from .report_assembler import PDFReportAssembler
def register_report(name, model, parser=rml_parse):
@ -30,7 +30,7 @@ def register_report(name, model, parser=rml_parse):
if netsvc.Service._services.get(name, False):
service = netsvc.Service._services[name]
if isinstance(service, PDFReportAssembler):
#already instantiated properly, skip it
# already instantiated properly, skip it
return
if hasattr(service, 'parser'):
parser = service.parser
@ -48,7 +48,8 @@ class ReportAssembleXML(orm.Model):
def register_all(self, cursor):
value = super(ReportAssembleXML, self).register_all(cursor)
cursor.execute("SELECT * FROM ir_act_report_xml WHERE report_type = 'assemblage'")
cursor.execute(
"SELECT * FROM ir_act_report_xml WHERE report_type = 'assemblage'")
records = cursor.dictfetchall()
for record in records:
register_report(record['report_name'], record['model'])
@ -61,7 +62,7 @@ class ReportAssembleXML(orm.Model):
cursor,
user,
[('type', '=', 'report'), ('res_id', 'in', ids)]
)
)
trans_obj.unlink(cursor, user, trans_ids)
# Warning: we cannot unregister the services at the moment
@ -77,7 +78,8 @@ class ReportAssembleXML(orm.Model):
def create(self, cursor, user, vals, context=None):
""" Create report and register it """
res = super(ReportAssembleXML, self).create(cursor, user, vals, context)
res = super(ReportAssembleXML, self).create(
cursor, user, vals, context)
if vals.get('report_type', '') == 'assemblage':
# I really look forward to virtual functions :S
register_report(
@ -102,7 +104,7 @@ class ReportAssembleXML(orm.Model):
report_name,
vals.get('model', rep.model),
False
)
)
res = super(ReportAssembleXML, self).write(cr, uid, ids, vals, context)
return res

19
base_report_assembler/report_assembler.py

@ -38,12 +38,12 @@ def assemble_pdf(pdf_list):
# as this issue still exists in mostly used wktohtml reports version
# http://code.google.com/p/wkhtmltopdf/issues/detail?id=635
#merger = PdfFileMerger()
#merger.append(fileobj=StringIO(invoice_pdf))
#merger.append(fileobj=StringIO(bvr_pdf))
# merger.append(fileobj=StringIO(invoice_pdf))
# merger.append(fileobj=StringIO(bvr_pdf))
#with tempfile.TemporaryFile() as merged_pdf:
#merger.write(merged_pdf)
#return merged_pdf.read(), 'pdf'
# with tempfile.TemporaryFile() as merged_pdf:
# merger.write(merged_pdf)
# return merged_pdf.read(), 'pdf'
output = PdfFileWriter()
for pdf in pdf_list:
@ -56,6 +56,7 @@ def assemble_pdf(pdf_list):
class PDFReportAssembler(report_sxw.report_sxw):
""" PDFReportAssembler allows to put 2 pdf reports in one single pdf"""
def _generate_all_pdf(self, cr, uid, ids, data, report_ids, context=None):
@ -93,7 +94,8 @@ class PDFReportAssembler(report_sxw.report_sxw):
report_ids = self._get_report_ids(cr, uid, ids, context=context)
pdf_reports = self._generate_all_pdf(cr, uid, ids, data, report_ids, context=context)
pdf_reports = self._generate_all_pdf(
cr, uid, ids, data, report_ids, context=context)
pdf_assemblage = assemble_pdf(pdf_reports)
return pdf_assemblage, 'pdf'
@ -104,7 +106,7 @@ class PDFReportAssembler(report_sxw.report_sxw):
pool = pooler.get_pool(cr.dbname)
ir_obj = pool.get('ir.actions.report.xml')
report_xml_ids = ir_obj.search(cr, uid,
[('report_name', '=', self.name[7:])], context=context)
[('report_name', '=', self.name[7:])], context=context)
if report_xml_ids:
report_xml = ir_obj.browse(cr,
@ -120,7 +122,8 @@ class PDFReportAssembler(report_sxw.report_sxw):
return super(PDFReportAssembler, self).create(cr, uid, ids, data, context)
if report_xml.report_type != 'assemblage':
return super(PDFReportAssembler, self).create(cr, uid, ids, data, context)
result = self.create_source_pdf(cr, uid, ids, data, report_xml, context)
result = self.create_source_pdf(
cr, uid, ids, data, report_xml, context)
if not result:
return (False, False)
return result

4
report_xls/report_xls.py

@ -30,12 +30,12 @@ import inspect
from types import CodeType
from openerp.report.report_sxw import *
from openerp import pooler
from openerp.tools.translate import translate, _
import logging
_logger = logging.getLogger(__name__)
class AttrDict(dict):
def __init__(self, *args, **kwargs):
super(AttrDict, self).__init__(*args, **kwargs)
self.__dict__ = self
@ -134,7 +134,7 @@ class report_xls(report_sxw):
'standard': (
'&L&%(font_size)s&%(font_style)s' + report_date +
'&R&%(font_size)s&%(font_style)s&P / &N'
) % self.hf_params,
) % self.hf_params,
}
self.generate_xls_report(_p, _xs, data, objs, wb)
wb.save(n)

Loading…
Cancel
Save