-
+
@@ -164,7 +164,7 @@
VAT:
-
+
Page:
@@ -182,7 +182,7 @@
![]()
-
+
@@ -204,7 +204,7 @@
Web:
VAT:
-
+
-
Page: /
@@ -238,14 +238,14 @@
-
+
-
+
-
@@ -262,9 +262,9 @@
+
@@ -293,7 +293,7 @@
-
diff --git a/odoo/models.py b/odoo/models.py
index b993596f332..a1535123c9d 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -1304,24 +1304,18 @@ class BaseModel(object):
# Add related action information if aksed
if toolbar:
- toclean = ('report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml', 'report_sxw_content_data', 'report_rml_content_data')
- def clean(x):
- x = x[2]
- for key in toclean:
- x.pop(key, None)
- return x
IrValues = self.env['ir.values']
resprint = IrValues.get_actions('client_print_multi', self._name)
resaction = IrValues.get_actions('client_action_multi', self._name)
resrelate = IrValues.get_actions('client_action_relate', self._name)
- resprint = [clean(print_)
+ resprint = [print_[2]
for print_ in resprint
if view_type == 'tree' or not print_[2].get('multi')]
- resaction = [clean(action)
+ resaction = [action[2]
for action in resaction
if view_type == 'tree' or not action[2].get('multi')]
#When multi="True" set it will display only in More of the list view
- resrelate = [clean(action)
+ resrelate = [action[2]
for action in resrelate
if (action[2].get('multi') and view_type == 'tree') or (not action[2].get('multi') and view_type == 'form')]
@@ -3981,17 +3975,6 @@ class BaseModel(object):
get_xml_id = get_external_id
_get_xml_ids = _get_external_ids
- @api.multi
- def print_report(self, name, data):
- """
- Render the report ``name`` for the given IDs. The report must be defined
- for this model, not another.
- """
- report = self.env['ir.actions.report.xml']._lookup_report(name)
- assert self._name == report.table
- cr, uid, context = self.env.args
- return report.create(cr, uid, self.ids, data, context)
-
# Transience
@classmethod
def is_transient(cls):
diff --git a/odoo/netsvc.py b/odoo/netsvc.py
index 3832ae10cd6..a44984f391c 100644
--- a/odoo/netsvc.py
+++ b/odoo/netsvc.py
@@ -25,26 +25,6 @@ def log(logger, level, prefix, msg, depth=None):
logger.log(level, indent+line)
indent=indent_after
-def LocalService(name):
- """
- The odoo.netsvc.LocalService() function is deprecated. It still works
- in one case: reports. For reports, odoo.report.render_report() should
- be used (methods on the Model should be provided too in the future).
- """
- assert odoo.conf.deprecation.allow_local_service
- _logger.warning("LocalService() is deprecated since march 2013 (it was called with '%s')." % name)
-
- if name.startswith('report.'):
- report = odoo.report.interface.report_int._reports.get(name)
- if report:
- return report
- else:
- dbname = getattr(threading.currentThread(), 'dbname', None)
- if dbname:
- registry = odoo.registry(dbname)
- with registry.cursor() as cr:
- return registry['ir.actions.report.xml']._lookup_report(cr, name[len('report.'):])
-
path_prefix = os.path.realpath(os.path.dirname(os.path.dirname(__file__)))
class PostgreSQLHandler(logging.Handler):
diff --git a/odoo/report/__init__.py b/odoo/report/__init__.py
deleted file mode 100644
index 1000d4991c6..00000000000
--- a/odoo/report/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api
-from . import custom
-from . import int_to_text
-from . import interface
-from . import print_fnc
-from . import print_xml
-from . import printscreen
-from . import render
-from . import report_sxw
-
-def render_report(cr, uid, ids, name, data, context=None):
- """
- Helper to call ``ir.actions.report.xml.render_report()``.
- """
- env = api.Environment(cr, uid, context or {})
- return env['ir.actions.report.xml'].render_report(ids, name, data)
diff --git a/odoo/report/common.py b/odoo/report/common.py
deleted file mode 100644
index dffcffa859c..00000000000
--- a/odoo/report/common.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-pageSize = {
- 'A4': (210,297),
- 'A5': (148.5,105)
-}
-
-odt_namespace = {
- "office":"{urn:oasis:names:tc:opendocument:xmlns:office:1.0}",
- "style":"{urn:oasis:names:tc:opendocument:xmlns:style:1.0}",
- "text":"{urn:oasis:names:tc:opendocument:xmlns:text:1.0}",
- "table":"{urn:oasis:names:tc:opendocument:xmlns:table:1.0}",
- "draw":"{urn:oasis:names:tc:opendocument:xmlns:drawing:1.0}",
- "fo":"{urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0}",
- "xlink":"{http://www.w3.org/1999/xlink}",
- "dc":"{http://purl.org/dc/elements/1.1/}",
- "meta":"{urn:oasis:names:tc:opendocument:xmlns:meta:1.0}",
- "number":"{urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0}",
- "svg":"{urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0}",
- "chart":"{urn:oasis:names:tc:opendocument:xmlns:chart:1.0}",
- "dr3d":"{urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0}",
- "math":"{http://www.w3.org/1998/Math/MathML}",
- "form":"{urn:oasis:names:tc:opendocument:xmlns:form:1.0}",
- "script":"{urn:oasis:names:tc:opendocument:xmlns:script:1.0}",
- "ooo":"{http://openoffice.org/2004/office}",
- "ooow":"{http://openoffice.org/2004/writer}",
- "oooc":"{http://openoffice.org/2004/calc}",
- "dom":"{http://www.w3.org/2001/xml-events}" }
-
-sxw_namespace = {
- "office":"{http://openoffice.org/2000/office}",
- "style":"{http://openoffice.org/2000/style}",
- "text":"{http://openoffice.org/2000/text}",
- "table":"{http://openoffice.org/2000/table}",
- "draw":"{http://openoffice.org/2000/drawing}",
- "fo":"{http://www.w3.org/1999/XSL/Format}",
- "xlink":"{http://www.w3.org/1999/xlink}",
- "dc":"{http://purl.org/dc/elements/1.1/}",
- "meta":"{http://openoffice.org/2000/meta}",
- "number":"{http://openoffice.org/2000/datastyle}",
- "svg":"{http://www.w3.org/2000/svg}",
- "chart":"{http://openoffice.org/2000/chart}",
- "dr3d":"{http://openoffice.org/2000/dr3d}",
- "math":"{http://www.w3.org/1998/Math/MathML}",
- "form":"{http://openoffice.org/2000/form}",
- "script":"{http://openoffice.org/2000/script}",
- "ooo":"{http://openoffice.org/2004/office}",
- "ooow":"{http://openoffice.org/2004/writer}",
- "oooc":"{http://openoffice.org/2004/calc}",
- "dom":"{http://www.w3.org/2001/xml-events}"}
diff --git a/odoo/report/custom.py b/odoo/report/custom.py
deleted file mode 100644
index 1eb68f0890f..00000000000
--- a/odoo/report/custom.py
+++ /dev/null
@@ -1,587 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import cStringIO
-import os
-import time
-
-from lxml import etree
-from pychart import area, arrow, axis, bar_plot, canvas, category_coord, \
- fill_style, legend, line_plot, line_style, pie_plot, theme
-
-import odoo
-import odoo.tools as tools
-from odoo.exceptions import UserError
-from odoo.models import BaseModel
-from odoo.tools.safe_eval import safe_eval
-from odoo.tools.translate import _
-from . import common
-from . import misc
-from . import render
-from .interface import report_int
-
-
-class external_pdf(render.render):
- def __init__(self, pdf):
- render.render.__init__(self)
- self.pdf = pdf
- self.output_type='pdf'
- def _render(self):
- return self.pdf
-
-theme.use_color = 1
-
-
-#TODO: devrait heriter de report_rml a la place de report_int
-# -> pourrait overrider que create_xml a la place de tout create
-# heuu, ca marche pas ds tous les cas car graphs sont generes en pdf directment
-# par pychart, et on passe donc pas par du rml
-class report_custom(report_int):
- def __init__(self, name):
- report_int.__init__(self, name)
-
- #
- # PRE:
- # fields = [['address','city'],['name'], ['zip']]
- # conditions = [[('zip','==','3'),(,)],(,),(,)] #same structure as fields
- # row_canvas = ['Rue', None, None]
- # POST:
- # [ ['ville','name','zip'] ]
- #
- def _row_get(self, cr, uid, objs, fields, conditions, row_canvas=None, group_by=None):
- result = []
- for obj in objs:
- tobreak = False
- for cond in conditions:
- if cond and cond[0]:
- c = cond[0]
- temp = c[0](safe_eval('obj.'+c[1],{'obj': obj}))
- if not safe_eval('\''+temp+'\''+' '+c[2]+' '+'\''+str(c[3])+'\''):
- tobreak = True
- if tobreak:
- break
- levels = {}
- row = []
- for i in range(len(fields)):
- if not fields[i]:
- row.append(row_canvas and row_canvas[i])
- if row_canvas[i]:
- row_canvas[i]=False
- elif len(fields[i])==1:
- if obj:
- row.append(str(safe_eval('obj.'+fields[i][0],{'obj': obj})))
- else:
- row.append(None)
- else:
- row.append(None)
- levels[fields[i][0]]=True
- if not levels:
- result.append(row)
- else:
- # Process group_by data first
- key = []
- if group_by is not None and fields[group_by] is not None:
- if fields[group_by][0] in levels.keys():
- key.append(fields[group_by][0])
- for l in levels.keys():
- if l != fields[group_by][0]:
- key.append(l)
- else:
- key = levels.keys()
- for l in key:
- objs = safe_eval('obj.'+l,{'obj': obj})
- if not isinstance(objs, (BaseModel, list)):
- objs = [objs]
- field_new = []
- cond_new = []
- for f in range(len(fields)):
- if (fields[f] and fields[f][0])==l:
- field_new.append(fields[f][1:])
- cond_new.append(conditions[f][1:])
- else:
- field_new.append(None)
- cond_new.append(None)
- if len(objs):
- result += self._row_get(cr, uid, objs, field_new, cond_new, row, group_by)
- else:
- result.append(row)
- return result
-
- def create(self, cr, uid, ids, datas, context=None):
- env = odoo.api.Environment(cr, uid, context or {})
- report = env['ir.report.custom'].browse([datas['report_id']])
- datas['model'] = report.model_id.model
- if report.menu_id:
- ids = env[report.model_id.model].search([]).ids
- datas['ids'] = ids
-
- report = report.read()[0]
- fields = env['ir.report.custom.fields'].browse(report['fields_child0']).read()
- fields.sort(key=lambda x: x['sequence'])
- model_name = env['ir.model'].sudo().browse(report['model_id'][0]).model
-
- fct = {
- 'id': lambda x: x,
- 'gety': lambda x: x.split('-')[0],
- 'in': lambda x: x.split(',')
- }
- new_fields = []
- new_cond = []
- for f in fields:
- row = []
- cond = []
- for i in range(4):
- field_child = f['field_child'+str(i)]
- if field_child:
- row.append(
- env['ir.model.fields'].sudo().browse(field_child[0]).name
- )
- if f['fc'+str(i)+'_operande']:
- fct_name = 'id'
- cond_op = f['fc'+str(i)+'_op']
- if len(f['fc'+str(i)+'_op'].split(',')) == 2:
- cond_op = f['fc'+str(i)+'_op'].split(',')[1]
- fct_name = f['fc'+str(i)+'_op'].split(',')[0]
- cond.append((fct[fct_name], f['fc'+str(i)+'_operande'][1], cond_op, f['fc'+str(i)+'_condition']))
- else:
- cond.append(None)
- new_fields.append(row)
- new_cond.append(cond)
- objs = env[model_name].browse(ids)
-
- # Group by
- groupby = None
- idx = 0
- for f in fields:
- if f['groupby']:
- groupby = idx
- idx += 1
-
-
- results = []
- if report['field_parent']:
- level = []
- def build_tree(obj, level, depth):
- res = self._row_get(cr, uid, [obj], new_fields, new_cond)
- level.append(depth)
- new_obj = safe_eval('obj.'+report['field_parent'][1], {'obj': obj})
- if not isinstance(new_obj, list) :
- new_obj = [new_obj]
- for o in new_obj:
- if o:
- res += build_tree(o, level, depth+1)
- return res
-
- for obj in objs:
- results += build_tree(obj, level, 0)
- else:
- results = self._row_get(cr, uid, objs, new_fields, new_cond, group_by=groupby)
-
- fct = {
- 'calc_sum': lambda l: reduce(lambda x,y: float(x)+float(y), filter(None, l), 0),
- 'calc_avg': lambda l: reduce(lambda x,y: float(x)+float(y), filter(None, l), 0) / (len(filter(None, l)) or 1.0),
- 'calc_max': lambda l: reduce(lambda x,y: max(x,y), [(i or 0.0) for i in l], 0),
- 'calc_min': lambda l: reduce(lambda x,y: min(x,y), [(i or 0.0) for i in l], 0),
- 'calc_count': lambda l: len(filter(None, l)),
- 'False': lambda l: '\r\n'.join(filter(None, l)),
- 'groupby': lambda l: reduce(lambda x,y: x or y, l)
- }
- new_res = []
-
- prev = None
- if groupby is not None:
- res_dic = {}
- for line in results:
- if not line[groupby] and prev in res_dic:
- res_dic[prev].append(line)
- else:
- prev = line[groupby]
- res_dic.setdefault(line[groupby], [])
- res_dic[line[groupby]].append(line)
-
- #we use the keys in results since they are ordered, whereas in res_dic.heys() they aren't
- for key in filter(None, [x[groupby] for x in results]):
- row = []
- for col in range(len(fields)):
- if col == groupby:
- row.append(fct['groupby'](map(lambda x: x[col], res_dic[key])))
- else:
- row.append(fct[str(fields[col]['operation'])](map(lambda x: x[col], res_dic[key])))
- new_res.append(row)
- results = new_res
-
- if report['type']=='table':
- if report['field_parent']:
- res = self._create_tree(uid, ids, report, fields, level, results, context)
- else:
- sort_idx = 0
- for idx in range(len(fields)):
- if fields[idx]['name'] == report['sortby']:
- sort_idx = idx
- break
- try :
- results.sort(key=lambda x: float(x[sort_idx]))
- except :
- results.sort(key=lambda x: x[sort_idx])
- if report['limitt']:
- results = results[:int(report['limitt'])]
- res = self._create_table(uid, ids, report, fields, None, results, context)
-
- elif report['type'] in ('pie','bar', 'line'):
- results2 = []
- prev = False
- for r in results:
- row = []
- for j in range(len(r)):
- if j == 0 and not r[j]:
- row.append(prev)
- elif j == 0 and r[j]:
- prev = r[j]
- row.append(r[j])
- else:
- try:
- row.append(float(r[j]))
- except Exception:
- row.append(r[j])
- results2.append(row)
- if report['type']=='pie':
- res = self._create_pie(cr,uid, ids, report, fields, results2, context)
- elif report['type']=='bar':
- res = self._create_bars(cr,uid, ids, report, fields, results2, context)
- elif report['type']=='line':
- res = self._create_lines(cr,uid, ids, report, fields, results2, context)
-
- return self.obj.get(), 'pdf'
-
- def _create_tree(self, uid, ids, report, fields, level, results, context):
- pageSize=common.pageSize.get(report['print_format'], [210.0,297.0])
- if report['print_orientation']=='landscape':
- pageSize=[pageSize[1],pageSize[0]]
-
- new_doc = etree.Element('report')
-
- config = etree.SubElement(new_doc, 'config')
-
- def _append_node(name, text):
- n = etree.SubElement(config, name)
- n.text = text
-
- _append_node('date', time.strftime('%d/%m/%Y'))
- _append_node('PageFormat', '%s' % report['print_format'])
- _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize))
- _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,))
- _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
-
- length = pageSize[0]-30-reduce(lambda x,y:x+(y['width'] or 0), fields, 0)
- count = 0
- for f in fields:
- if not f['width']: count+=1
- for f in fields:
- if not f['width']:
- f['width']=round((float(length)/count)-0.5)
-
- _append_node('tableSize', '%s' % ','.join(map(lambda x: '%.2fmm' % (x['width'],), fields)))
- _append_node('report-header', '%s' % (report['title'],))
- _append_node('report-footer', '%s' % (report['footer'],))
-
- header = etree.SubElement(new_doc, 'header')
- for f in fields:
- field = etree.SubElement(header, 'field')
- field.text = f['name']
-
- lines = etree.SubElement(new_doc, 'lines')
- level.reverse()
- for line in results:
- shift = level.pop()
- node_line = etree.SubElement(lines, 'row')
- prefix = '+'
- for f in range(len(fields)):
- col = etree.SubElement(node_line, 'col')
- if f == 0:
- col.attrib.update(para='yes',
- tree='yes',
- space=str(3*shift)+'mm')
- if line[f] is not None:
- col.text = prefix+str(line[f]) or ''
- else:
- col.text = '/'
- prefix = ''
-
- transform = etree.XSLT(
- etree.parse(os.path.join(tools.config['root_path'],
- 'addons/base/report/custom_new.xsl')))
- rml = etree.tostring(transform(new_doc))
-
- self.obj = render.rml(rml)
- self.obj.render()
- return True
-
- def _create_lines(self, cr, uid, ids, report, fields, results, context):
- env = odoo.api.Environment(cr, uid, context or {})
- pdf_string = cStringIO.StringIO()
-
- can = canvas.init(fname=pdf_string, format='pdf')
- can.show(80,380,'/16/H'+report['title'])
-
- ar = area.T(size=(350,350),
- #x_coord = category_coord.T(['2005-09-01','2005-10-22'],0),
- x_axis=axis.X(label = fields[0]['name'], format="/a-30{}%s"),
- y_axis=axis.Y(label = ', '.join(map(lambda x : x['name'], fields[1:]))))
-
- process_date = {
- 'D': lambda x: reduce(lambda xx, yy: xx + '-' + yy, x.split('-')[1:3]),
- 'M': lambda x: x.split('-')[1],
- 'Y': lambda x: x.split('-')[0]
- }
-
- abscissa = []
-
- idx = 0
- date_idx = None
- fct = {}
- for f in fields:
- field_id = (f['field_child3'] and f['field_child3'][0]) or (f['field_child2'] and f['field_child2'][0]) or (f['field_child1'] and f['field_child1'][0]) or (f['field_child0'] and f['field_child0'][0])
- if field_id:
- ttype = env['ir.model.fields'].sudo().browse(field_id).ttype
- if ttype == 'date':
- date_idx = idx
- fct[idx] = process_date[report['frequency']]
- else:
- fct[idx] = lambda x : x
- else:
- fct[idx] = lambda x : x
- idx+=1
-
- # plots are usually displayed year by year
- # so we do so if the first field is a date
- data_by_year = {}
- if date_idx is not None:
- for r in results:
- key = process_date['Y'](r[date_idx])
- if key not in data_by_year:
- data_by_year[key] = []
- for i in range(len(r)):
- r[i] = fct[i](r[i])
- data_by_year[key].append(r)
- else:
- data_by_year[''] = results
-
- idx0 = 0
- nb_bar = len(data_by_year)*(len(fields)-1)
- colors = map(lambda x:line_style.T(color=x), misc.choice_colors(nb_bar))
- abscissa = {}
- for line in data_by_year.keys():
- fields_bar = []
- # sum data and save it in a list. An item for a fields
- for d in data_by_year[line]:
- for idx in range(len(fields)-1):
- fields_bar.append({})
- if d[0] in fields_bar[idx]:
- fields_bar[idx][d[0]] += d[idx+1]
- else:
- fields_bar[idx][d[0]] = d[idx+1]
- for idx in range(len(fields)-1):
- data = {}
- for k in fields_bar[idx].keys():
- if k in data:
- data[k] += fields_bar[idx][k]
- else:
- data[k] = fields_bar[idx][k]
- data_cum = []
- prev = 0.0
- keys = data.keys()
- keys.sort()
- # cumulate if necessary
- for k in keys:
- data_cum.append([k, float(data[k])+float(prev)])
- if fields[idx+1]['cumulate']:
- prev += data[k]
- idx0 = 0
- plot = line_plot.T(label=fields[idx+1]['name']+' '+str(line), data = data_cum, line_style=colors[idx0*(len(fields)-1)+idx])
- ar.add_plot(plot)
- abscissa.update(fields_bar[idx])
- idx0 += 1
-
- abscissa = map(lambda x : [x, None], abscissa)
- ar.x_coord = category_coord.T(abscissa,0)
- ar.draw(can)
-
- can.close()
- self.obj = external_pdf(pdf_string.getvalue())
- self.obj.render()
- pdf_string.close()
- return True
-
- def _create_bars(self, cr, uid, ids, report, fields, results, context):
- env = odoo.api.Environment(cr, uid, context or {})
- pdf_string = cStringIO.StringIO()
-
- can = canvas.init(fname=pdf_string, format='pdf')
- can.show(80,380,'/16/H'+report['title'])
-
- process_date = {
- 'D': lambda x: reduce(lambda xx, yy: xx + '-' + yy, x.split('-')[1:3]),
- 'M': lambda x: x.split('-')[1],
- 'Y': lambda x: x.split('-')[0]
- }
-
- ar = area.T(size=(350,350),
- x_axis=axis.X(label = fields[0]['name'], format="/a-30{}%s"),
- y_axis=axis.Y(label = ', '.join(map(lambda x : x['name'], fields[1:]))))
-
- idx = 0
- date_idx = None
- fct = {}
- for f in fields:
- field_id = (f['field_child3'] and f['field_child3'][0]) or (f['field_child2'] and f['field_child2'][0]) or (f['field_child1'] and f['field_child1'][0]) or (f['field_child0'] and f['field_child0'][0])
- if field_id:
- ttype = env['ir.model.fields'].sudo().browse(field_id).ttype
- if ttype == 'date':
- date_idx = idx
- fct[idx] = process_date[report['frequency']]
- else:
- fct[idx] = lambda x : x
- else:
- fct[idx] = lambda x : x
- idx+=1
-
- # plot are usually displayed year by year
- # so we do so if the first field is a date
- data_by_year = {}
- if date_idx is not None:
- for r in results:
- key = process_date['Y'](r[date_idx])
- if key not in data_by_year:
- data_by_year[key] = []
- for i in range(len(r)):
- r[i] = fct[i](r[i])
- data_by_year[key].append(r)
- else:
- data_by_year[''] = results
-
-
- nb_bar = len(data_by_year)*(len(fields)-1)
- colors = map(lambda x:fill_style.Plain(bgcolor=x), misc.choice_colors(nb_bar))
-
- abscissa = {}
- for line in data_by_year.keys():
- fields_bar = []
- # sum data and save it in a list. An item for a fields
- for d in data_by_year[line]:
- for idx in range(len(fields)-1):
- fields_bar.append({})
- if d[0] in fields_bar[idx]:
- fields_bar[idx][d[0]] += d[idx+1]
- else:
- fields_bar[idx][d[0]] = d[idx+1]
- for idx in range(len(fields)-1):
- data = {}
- for k in fields_bar[idx].keys():
- if k in data:
- data[k] += fields_bar[idx][k]
- else:
- data[k] = fields_bar[idx][k]
- data_cum = []
- prev = 0.0
- keys = data.keys()
- keys.sort()
- # cumulate if necessary
- for k in keys:
- data_cum.append([k, float(data[k])+float(prev)])
- if fields[idx+1]['cumulate']:
- prev += data[k]
-
- idx0 = 0
- plot = bar_plot.T(label=fields[idx+1]['name']+' '+str(line), data = data_cum, cluster=(idx0*(len(fields)-1)+idx,nb_bar), fill_style=colors[idx0*(len(fields)-1)+idx])
- ar.add_plot(plot)
- abscissa.update(fields_bar[idx])
- idx0 += 1
- abscissa = map(lambda x : [x, None], abscissa)
- abscissa.sort()
- ar.x_coord = category_coord.T(abscissa,0)
- ar.draw(can)
-
- can.close()
- self.obj = external_pdf(pdf_string.getvalue())
- self.obj.render()
- pdf_string.close()
- return True
-
- def _create_pie(self, cr, uid, ids, report, fields, results, context):
- pdf_string = cStringIO.StringIO()
- can = canvas.init(fname=pdf_string, format='pdf')
- ar = area.T(size=(350,350), legend=legend.T(),
- x_grid_style = None, y_grid_style = None)
- colors = map(lambda x:fill_style.Plain(bgcolor=x), misc.choice_colors(len(results)))
-
- if reduce(lambda x,y : x+y, map(lambda x : x[1],results)) == 0.0:
- raise UserError(_("The sum of the data (2nd field) is null.\nWe can't draw a pie chart !"))
-
- plot = pie_plot.T(data=results, arc_offsets=[0,10,0,10],
- shadow = (2, -2, fill_style.gray50),
- label_offset = 25,
- arrow_style = arrow.a3,
- fill_styles=colors)
- ar.add_plot(plot)
- ar.draw(can)
- can.close()
- self.obj = external_pdf(pdf_string.getvalue())
- self.obj.render()
- pdf_string.close()
- return True
-
- def _create_table(self, uid, ids, report, fields, tree, results, context):
- pageSize=common.pageSize.get(report['print_format'], [210.0,297.0])
- if report['print_orientation']=='landscape':
- pageSize=[pageSize[1],pageSize[0]]
-
- new_doc = etree.Element('report')
- config = etree.SubElement(new_doc, 'config')
-
- def _append_node(name, text):
- n = etree.SubElement(config, name)
- n.text = text
-
- _append_node('date', time.strftime('%d/%m/%Y'))
- _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize))
- _append_node('PageFormat', '%s' % report['print_format'])
- _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,))
- _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
-
- length = pageSize[0]-30-reduce(lambda x,y:x+(y['width'] or 0), fields, 0)
- count = 0
- for f in fields:
- if not f['width']: count+=1
- for f in fields:
- if not f['width']:
- f['width']=round((float(length)/count)-0.5)
-
- _append_node('tableSize', '%s' % ','.join(map(lambda x: '%.2fmm' % (x['width'],), fields)))
- _append_node('report-header', '%s' % (report['title'],))
- _append_node('report-footer', '%s' % (report['footer'],))
-
- header = etree.SubElement(new_doc, 'header')
- for f in fields:
- field = etree.SubElement(header, 'field')
- field.text = f['name']
-
- lines = etree.SubElement(new_doc, 'lines')
- for line in results:
- node_line = etree.SubElement(lines, 'row')
- for f in range(len(fields)):
- col = etree.SubElement(node_line, 'col', tree='no')
- if line[f] is not None:
- col.text = line[f] or ''
- else:
- col.text = '/'
-
- transform = etree.XSLT(
- etree.parse(os.path.join(tools.config['root_path'],
- 'addons/base/report/custom_new.xsl')))
- rml = etree.tostring(transform(new_doc))
-
- self.obj = render.rml(rml)
- self.obj.render()
- return True
-
-report_custom('report.custom')
diff --git a/odoo/report/int_to_text.py b/odoo/report/int_to_text.py
deleted file mode 100644
index 96e07f179bb..00000000000
--- a/odoo/report/int_to_text.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-unites = {
- 0: '', 1:'un', 2:'deux', 3:'trois', 4:'quatre', 5:'cinq', 6:'six', 7:'sept', 8:'huit', 9:'neuf',
- 10:'dix', 11:'onze', 12:'douze', 13:'treize', 14:'quatorze', 15:'quinze', 16:'seize',
- 21:'vingt et un', 31:'trente et un', 41:'quarante et un', 51:'cinquante et un', 61:'soixante et un',
- 71:'septante et un', 91:'nonante et un', 80:'quatre-vingts'
-}
-
-dizaine = {
- 1: 'dix', 2:'vingt', 3:'trente',4:'quarante', 5:'cinquante', 6:'soixante', 7:'septante', 8:'quatre-vingt', 9:'nonante'
-}
-
-centaine = {
- 0:'', 1: 'cent', 2:'deux cent', 3:'trois cent',4:'quatre cent', 5:'cinq cent', 6:'six cent', 7:'sept cent', 8:'huit cent', 9:'neuf cent'
-}
-
-mille = {
- 0:'', 1:'mille'
-}
-
-def _100_to_text(chiffre):
- if chiffre in unites:
- return unites[chiffre]
- else:
- if chiffre%10>0:
- return dizaine[chiffre / 10]+'-'+unites[chiffre % 10]
- else:
- return dizaine[chiffre / 10]
-
-def _1000_to_text(chiffre):
- d = _100_to_text(chiffre % 100)
- d2 = chiffre/100
- if d2>0 and d:
- return centaine[d2]+' '+d
- elif d2>1 and not d:
- return centaine[d2]+'s'
- else:
- return centaine[d2] or d
-
-def _10000_to_text(chiffre):
- if chiffre==0:
- return 'zero'
- part1 = _1000_to_text(chiffre % 1000)
- part2 = mille.get(chiffre / 1000, _1000_to_text(chiffre / 1000)+' mille')
- if part2 and part1:
- part1 = ' '+part1
- return part2+part1
-
-def int_to_text(i):
- return _10000_to_text(i)
-
-if __name__=='__main__':
- for i in range(1,999999,139):
- print int_to_text(i)
diff --git a/odoo/report/interface.py b/odoo/report/interface.py
deleted file mode 100644
index ef0784fb518..00000000000
--- a/odoo/report/interface.py
+++ /dev/null
@@ -1,238 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import os
-import re
-import urllib
-
-from lxml import etree
-
-import odoo
-import odoo.tools as tools
-from . import print_xml
-from . import render
-from odoo.modules import get_module_resource
-
-#
-# coerce any type to a unicode string (to preserve non-ascii characters)
-# and escape XML entities
-#
-def toxml(value):
- unicode_value = tools.ustr(value)
- return unicode_value.replace('&', '&').replace('<','<').replace('>','>')
-
-
-class report_int(object):
-
- _reports = {}
-
- def __init__(self, name, register=True):
- if register:
- assert odoo.conf.deprecation.allow_report_int_registration
- assert name.startswith('report.'), 'Report names should start with "report.".'
- assert name not in self._reports, 'The report "%s" already exists.' % name
- self._reports[name] = self
- else:
- # The report is instanciated at each use site, which is ok.
- pass
-
- self.__name = name
-
- self.name = name
- self.id = 0
- self.name2 = '.'.join(name.split('.')[1:])
- # TODO the reports have methods with a 'title' kwarg that is redundant with this attribute
- self.title = None
-
- def create(self, cr, uid, ids, datas, context=None):
- return False
-
-
-class report_rml(report_int):
- """
- Automatically builds a document using the transformation process:
- XML -> DATAS -> RML -> PDF -> HTML
- using a XSL:RML transformation
- """
- def __init__(self, name, table, tmpl, xsl, register=True):
- super(report_rml, self).__init__(name, register=register)
- self.table = table
- self.internal_header=False
- self.tmpl = tmpl
- self.xsl = xsl
- self.bin_datas = {}
- self.generators = {
- 'pdf': self.create_pdf,
- 'html': self.create_html,
- 'raw': self.create_raw,
- 'sxw': self.create_sxw,
- 'txt': self.create_txt,
- 'odt': self.create_odt,
- 'html2html' : self.create_html2html,
- 'makohtml2html' :self.create_makohtml2html,
- }
-
- def create(self, cr, uid, ids, datas, context=None):
- env = odoo.api.Environment(cr, uid, context or {})
- xml = self.create_xml(cr, uid, ids, datas, context)
- xml = tools.ustr(xml).encode('utf8')
- report_type = datas.get('report_type', 'pdf')
- if report_type == 'raw':
- return xml, report_type
-
- env['res.font'].sudo().font_scan(lazy=True)
-
- rml = self.create_rml(cr, xml, uid, context)
- reports = env['ir.actions.report.xml'].search([('report_name', '=', self.name[7:])])
- self.title = reports[0].name if reports else 'Odoo Report'
- create_doc = self.generators[report_type]
- pdf = create_doc(rml, title=self.title)
- return pdf, report_type
-
- def create_xml(self, cr, uid, ids, datas, context=None):
- doc = print_xml.document(cr, uid, datas, {})
- self.bin_datas.update( doc.bin_datas or {})
- doc.parse(self.tmpl, ids, self.table, context)
- xml = doc.xml_get()
- doc.close()
- return self.post_process_xml_data(cr, uid, xml, context)
-
- def post_process_xml_data(self, cr, uid, xml, context=None):
- # find the position of the 3rd tag
- # (skip the and the "root" tag)
- iter = re.finditer('<[^>]*>', xml)
- i = iter.next()
- i = iter.next()
- pos_xml = i.end()
-
- doc = print_xml.document(cr, uid, {}, {})
- tmpl_path = get_module_resource('base', 'report', 'corporate_defaults.xml')
- doc.parse(tmpl_path, [uid], 'res.users', context)
- corporate_header = doc.xml_get()
- doc.close()
-
- # find the position of the tag after the tag
- iter = re.finditer('<[^>]*>', corporate_header)
- i = iter.next()
- pos_header = i.end()
-
- return xml[:pos_xml] + corporate_header[pos_header:] + xml[pos_xml:]
-
- #
- # TODO: The translation doesn't work for "textext tex text "
- #
- def create_rml(self, cr, xml, uid, context=None):
- if self.tmpl=='' and not self.internal_header:
- self.internal_header=True
- env = odoo.api.Environment(cr, uid, context or {})
- Translation = env['ir.translation']
-
- # In some case we might not use xsl ...
- if not self.xsl:
- return xml
-
- stylesheet_file = tools.file_open(self.xsl)
- try:
- stylesheet = etree.parse(stylesheet_file)
- xsl_path, _ = os.path.split(self.xsl)
- for import_child in stylesheet.findall('./import'):
- if 'href' in import_child.attrib:
- imp_file = import_child.get('href')
- _, imp_file = tools.file_open(imp_file, subdir=xsl_path, pathinfo=True)
- import_child.set('href', urllib.quote(str(imp_file)))
- imp_file.close()
- finally:
- stylesheet_file.close()
-
- #TODO: get all the translation in one query. That means we have to:
- # * build a list of items to translate,
- # * issue the query to translate them,
- # * (re)build/update the stylesheet with the translated items
-
- def translate(doc, lang):
- translate_aux(doc, lang, False)
-
- def translate_aux(doc, lang, t):
- for node in doc:
- t = t or node.get("t")
- if t:
- text = None
- tail = None
- if node.text:
- text = node.text.strip().replace('\n',' ')
- if node.tail:
- tail = node.tail.strip().replace('\n',' ')
- if text:
- text1 = Translation._get_source(self.name2, 'xsl', lang, text)
- if text1:
- node.text = node.text.replace(text, text1)
- if tail:
- tail1 = Translation._get_source(self.name2, 'xsl', lang, tail)
- if tail1:
- node.tail = node.tail.replace(tail, tail1)
- translate_aux(node, lang, t)
-
- if env.lang:
- translate(stylesheet.iter(), env.lang)
-
- transform = etree.XSLT(stylesheet)
- xml = etree.tostring(
- transform(etree.fromstring(xml)))
-
- return xml
-
- def create_pdf(self, rml, localcontext=None, logo=None, title=None):
- if not localcontext:
- localcontext = {}
- localcontext.update({'internal_header':self.internal_header})
- if logo:
- self.bin_datas['logo'] = logo
- else:
- if 'logo' in self.bin_datas:
- del self.bin_datas['logo']
- obj = render.rml(rml, localcontext, self.bin_datas, self._get_path(), title)
- obj.render()
- return obj.get()
-
- def create_html(self, rml, localcontext=None, logo=None, title=None):
- obj = render.rml2html(rml, localcontext, self.bin_datas)
- obj.render()
- return obj.get()
-
- def create_txt(self, rml,localcontext, logo=None, title=None):
- obj = render.rml2txt(rml, localcontext, self.bin_datas)
- obj.render()
- return obj.get().encode('utf-8')
-
- def create_html2html(self, rml, localcontext=None, logo=None, title=None):
- obj = render.html2html(rml, localcontext, self.bin_datas)
- obj.render()
- return obj.get()
-
-
- def create_raw(self,rml, localcontext=None, logo=None, title=None):
- obj = render.odt2odt(etree.XML(rml),localcontext)
- obj.render()
- return etree.tostring(obj.get())
-
- def create_sxw(self,rml,localcontext=None):
- obj = render.odt2odt(rml,localcontext)
- obj.render()
- return obj.get()
-
- def create_odt(self,rml,localcontext=None):
- obj = render.odt2odt(rml,localcontext)
- obj.render()
- return obj.get()
-
- def create_makohtml2html(self,html,localcontext=None):
- obj = render.makohtml2html(html,localcontext)
- obj.render()
- return obj.get()
-
- def _get_path(self):
- return [
- self.tmpl.replace(os.path.sep, '/').rsplit('/', 1)[0],
- 'addons',
- tools.config['root_path']
- ]
diff --git a/odoo/report/misc.py b/odoo/report/misc.py
deleted file mode 100644
index 0b735abca7c..00000000000
--- a/odoo/report/misc.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from pychart import color
-
-colorline = [color.T(r=((r+3) % 11)/10.0,
- g=((g+6) % 11)/10.0,
- b=((b+9) % 11)/10.0)
- for r in range(11) for g in range(11) for b in range(11)]
-
-def choice_colors(n):
- if n:
- return colorline[0:-1:len(colorline)/n]
- return []
-
-if __name__=='__main__':
- print choice_colors(10)
diff --git a/odoo/report/preprocess.py b/odoo/report/preprocess.py
deleted file mode 100644
index 16f35e1f49a..00000000000
--- a/odoo/report/preprocess.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import re
-
-from lxml import etree
-
-rml_parents = ['tr','story','section']
-html_parents = ['tr','body','div']
-sxw_parents = ['{http://openoffice.org/2000/table}table-row','{http://openoffice.org/2000/office}body','{http://openoffice.org/2000/text}section']
-odt_parents = ['{urn:oasis:names:tc:opendocument:xmlns:office:1.0}body','{urn:oasis:names:tc:opendocument:xmlns:table:1.0}table-row','{urn:oasis:names:tc:opendocument:xmlns:text:1.0}section']
-
-
-class report(object):
- def preprocess_rml(self, root_node,type='pdf'):
- _regex1 = re.compile("\[\[(.*?)(repeatIn\(.*?\s*,\s*[\'\"].*?[\'\"]\s*(?:,\s*(.*?)\s*)?\s*\))(.*?)\]\]")
- _regex11= re.compile("\[\[(.*?)(repeatIn\(.*?\s*\(.*?\s*[\'\"].*?[\'\"]\s*\),[\'\"].*?[\'\"](?:,\s*(.*?)\s*)?\s*\))(.*?)\]\]")
- _regex2 = re.compile("\[\[(.*?)(removeParentNode\(\s*(?:['\"](.*?)['\"])\s*\))(.*?)\]\]")
- _regex3 = re.compile("\[\[\s*(.*?setTag\(\s*['\"](.*?)['\"]\s*,\s*['\"].*?['\"]\s*(?:,.*?)?\).*?)\s*\]\]")
- for node in root_node:
- if node.tag == etree.Comment:
- continue
- if node.text or node.tail:
- def _sub3(txt):
- n = node
- while n.tag != txt.group(2):
- n = n.getparent()
- n.set('rml_tag', txt.group(1))
- return "[[ '' ]]"
- def _sub2(txt):
- if txt.group(3):
- n = node
- try:
- while n.tag != txt.group(3):
- n = n.getparent()
- except Exception:
- n = node
- else:
- n = node.getparent()
- n.set('rml_except', txt.group(0)[2:-2])
- return txt.group(0)
- def _sub1(txt):
- if len(txt.group(4)) > 1:
- return " "
- match = rml_parents
- if type == 'odt':
- match = odt_parents
- if type == 'sxw':
- match = sxw_parents
- if type =='html2html':
- match = html_parents
- if txt.group(3):
- group_3 = txt.group(3)
- if group_3.startswith("'") or group_3.startswith('"'):
- group_3 = group_3[1:-1]
- match = [group_3]
- n = node
- while n.tag not in match:
- n = n.getparent()
- n.set('rml_loop', txt.group(2))
- return '[['+txt.group(1)+"''"+txt.group(4)+']]'
- t = _regex1.sub(_sub1, node.text or node.tail)
- if t == " ":
- t = _regex11.sub(_sub1, node.text or node.tail)
- t = _regex3.sub(_sub3, t)
- node.text = _regex2.sub(_sub2, t)
- self.preprocess_rml(node,type)
- return root_node
-
-if __name__=='__main__':
- node = etree.XML('''
- This is a test[[ setTag('para','xpre') ]]
-
-
- Row 1 [[ setTag('tr','tr',{'style':'TrLevel'+str(a['level']), 'paraStyle':('Level'+str(a['level']))}) ]] Row 2 [[ True and removeParentNode('td') ]]
-
- Row 1 [[repeatIn(o.order_line,'o')]]
- Row 2
-
-
- ''')
- a = report()
- result = a.preprocess_rml(node)
- print etree.tostring(result)
diff --git a/odoo/report/print_fnc.py b/odoo/report/print_fnc.py
deleted file mode 100644
index 80ad1154671..00000000000
--- a/odoo/report/print_fnc.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import time
-
-functions = {
- 'today': lambda x: time.strftime('%d/%m/%Y', time.localtime()).decode('latin1')
-}
-
-#
-# TODO: call an object internal function too
-#
-def print_fnc(fnc, arg):
- if fnc in functions:
- return functions[fnc](arg)
- return ''
diff --git a/odoo/report/print_xml.py b/odoo/report/print_xml.py
deleted file mode 100644
index 3fe9b959f88..00000000000
--- a/odoo/report/print_xml.py
+++ /dev/null
@@ -1,255 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from lxml import etree
-
-import odoo
-import odoo.tools as tools
-from . import print_fnc
-from odoo.models import BaseModel
-from odoo.tools.safe_eval import safe_eval
-
-
-class InheritDict(dict):
- # Might be useful when we're doing name lookup for call or eval.
- def __init__(self, parent=None):
- self.parent = parent
-
- def __getitem__(self, name):
- if name in self:
- return super(InheritDict, self).__getitem__(name)
- else:
- if not self.parent:
- raise KeyError
- else:
- return self.parent[name]
-
-
-def tounicode(val):
- if isinstance(val, str):
- unicode_val = unicode(val, 'utf-8')
- elif isinstance(val, unicode):
- unicode_val = val
- else:
- unicode_val = unicode(val)
- return unicode_val
-
-
-class document(object):
- def __init__(self, cr, uid, datas, func=False):
- # create a new document
- self.cr = cr
- self.uid = uid
- self.datas = datas
- self.func = func or {}
- self.bin_datas = {}
-
- def node_attrs_get(self, node):
- if len(node.attrib):
- return node.attrib
- return {}
-
- def get_value(self, browser, field_path):
- fields = field_path.split('.')
-
- if not len(fields):
- return ''
-
- value = browser
-
- for f in fields:
- if isinstance(value, (BaseModel, list)):
- if not value:
- return ''
- value = value[0]
- value = value[f]
-
- return value or ''
-
- def get_value2(self, browser, field_path):
- value = self.get_value(browser, field_path)
- if isinstance(value, BaseModel):
- return value.id
- else:
- return value
-
- def eval(self, record, expr):
-#TODO: support remote variables (eg address.title) in expr
-# how to do that: parse the string, find dots, replace those dotted variables by temporary
-# "simple ones", fetch the value of those variables and add them (temporarily) to the _data
-# dictionary passed to eval
-
-#FIXME: it wont work if the data hasn't been fetched yet... this could
-# happen if the eval node is the first one using this Record
-# the next line is a workaround for the problem: it causes the resource to be loaded
-#Pinky: Why not this ? eval(expr, browser) ?
-# name = browser.name
-# data_dict = browser._data[self.get_value(browser, 'id')]
- return safe_eval(expr, {}, {'obj': record})
-
- def parse_node(self, node, parent, browser, datas=None):
- env = odoo.api.Environment(self.cr, self.uid, {})
- attrs = self.node_attrs_get(node)
- if 'type' in attrs:
- if attrs['type']=='field':
- value = self.get_value(browser, attrs['name'])
- #TODO: test this
- if value == '' and 'default' in attrs:
- value = attrs['default']
- el = etree.SubElement(parent, node.tag)
- el.text = tounicode(value)
- #TODO: test this
- for key, value in attrs.iteritems():
- if key not in ('type', 'name', 'default'):
- el.set(key, value)
-
- elif attrs['type']=='attachment':
- model = browser._name
- value = self.get_value(browser, attrs['name'])
-
- atts = env['ir.attachment'].search([('res_model','=',model),('res_id','=',int(value))])
- datas = atts.read()
-
- if len(datas):
- # if there are several, pick first
- datas = datas[0]
- fname = str(datas['datas_fname'])
- ext = fname.split('.')[-1].lower()
- if ext in ('jpg','jpeg', 'png'):
- import base64
- from StringIO import StringIO
- dt = base64.decodestring(datas['datas'])
- fp = StringIO()
- fp.write(dt)
- i = str(len(self.bin_datas))
- self.bin_datas[i] = fp
- el = etree.SubElement(parent, node.tag)
- el.text = i
-
- elif attrs['type']=='data':
- #TODO: test this
- txt = self.datas.get('form', {}).get(attrs['name'], '')
- el = etree.SubElement(parent, node.tag)
- el.text = txt
-
- elif attrs['type']=='function':
- if attrs['name'] in self.func:
- txt = self.func[attrs['name']](node)
- else:
- txt = print_fnc.print_fnc(attrs['name'], node)
- el = etree.SubElement(parent, node.tag)
- el.text = txt
-
- elif attrs['type']=='eval':
- value = self.eval(browser, attrs['expr'])
- el = etree.SubElement(parent, node.tag)
- el.text = str(value)
-
- elif attrs['type']=='fields':
- fields = attrs['name'].split(',')
- vals = {}
- for b in browser:
- value = tuple([self.get_value2(b, f) for f in fields])
- if not value in vals:
- vals[value]=[]
- vals[value].append(b)
- keys = vals.keys()
- keys.sort()
-
- if 'order' in attrs and attrs['order']=='desc':
- keys.reverse()
-
- v_list = [vals[k] for k in keys]
- for v in v_list:
- el = etree.SubElement(parent, node.tag)
- for el_cld in node:
- self.parse_node(el_cld, el, v)
-
- elif attrs['type']=='call':
- if len(attrs['args']):
- #TODO: test this
- # fetches the values of the variables which names where passed in the args attribute
- args = [self.eval(browser, arg) for arg in attrs['args'].split(',')]
- else:
- args = []
- # get the object
- if 'model' in attrs:
- obj = env[attrs['model']]
- else:
- obj = browser # the record(set) is an instance of the model
-
- # get the ids
- if 'ids' in attrs:
- ids = self.eval(browser, attrs['ids'])
- else:
- ids = browser.ids
-
- # call the method itself
- newdatas = getattr(obj, attrs['name'])(*args)
-
- def parse_result_tree(node, parent, datas):
- if not node.tag == etree.Comment:
- el = etree.SubElement(parent, node.tag)
- atr = self.node_attrs_get(node)
- if 'value' in atr:
- if not isinstance(datas[atr['value']], (str, unicode)):
- txt = str(datas[atr['value']])
- else:
- txt = datas[atr['value']]
- el.text = txt
- else:
- for el_cld in node:
- parse_result_tree(el_cld, el, datas)
- if not isinstance(newdatas, (BaseModel, list)):
- newdatas = [newdatas]
- for newdata in newdatas:
- parse_result_tree(node, parent, newdata)
-
- elif attrs['type']=='zoom':
- value = self.get_value(browser, attrs['name'])
- if value:
- if not isinstance(value, (BaseModel, list)):
- v_list = [value]
- else:
- v_list = value
- for v in v_list:
- el = etree.SubElement(parent, node.tag)
- for el_cld in node:
- self.parse_node(el_cld, el, v)
- else:
- # if there is no "type" attribute in the node, copy it to the xml data and parse its children
- if not node.tag == etree.Comment:
- if node.tag == parent.tag:
- el = parent
- else:
- el = etree.SubElement(parent, node.tag)
- for el_cld in node:
- self.parse_node(el_cld,el, browser)
-
- def xml_get(self):
- return etree.tostring(self.doc,encoding="utf-8",xml_declaration=True,pretty_print=True)
-
- def parse_tree(self, ids, model, context=None):
- env = odoo.api.Environment(self.cr, self.uid, context or {})
- browser = env[model].browse(ids)
- self.parse_node(self.dom, self.doc, browser)
-
- def parse_string(self, xml, ids, model, context=None):
- # parses the xml template to memory
- self.dom = etree.XML(xml)
- # create the xml data from the xml template
- self.parse_tree(ids, model, context)
-
- def parse(self, filename, ids, model, context=None):
- # parses the xml template to memory
- src_file = tools.file_open(filename)
- try:
- self.dom = etree.XML(src_file.read())
- self.doc = etree.Element(self.dom.tag)
- self.parse_tree(ids, model, context)
- finally:
- src_file.close()
-
- def close(self):
- self.doc = None
- self.dom = None
diff --git a/odoo/report/printscreen/__init__.py b/odoo/report/printscreen/__init__.py
deleted file mode 100644
index 5c442c68695..00000000000
--- a/odoo/report/printscreen/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import ps_list
-from . import ps_form
-
-
-""" A special report, that is automatically formatted to look like the
- screen contents of Form/List Views.
-"""
diff --git a/odoo/report/printscreen/ps_form.py b/odoo/report/printscreen/ps_form.py
deleted file mode 100644
index c063d04f3d5..00000000000
--- a/odoo/report/printscreen/ps_form.py
+++ /dev/null
@@ -1,114 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import os
-import time
-
-from lxml import etree
-
-import odoo
-import odoo.tools as tools
-from odoo.report import render
-from odoo.report.interface import report_int
-
-
-class report_printscreen_list(report_int):
- def _parse_node(self, root_node):
- result = []
- for node in root_node:
- if node.tag == 'field':
- attrsa = node.attrib
- attrs = {}
- if not attrsa is None:
- for key,val in attrsa.items():
- attrs[key] = val
- result.append(attrs['name'])
- else:
- result.extend(self._parse_node(node))
- return result
-
- def _parse_string(self, view):
- dom = etree.XML(view)
- return self._parse_node(dom)
-
- def create(self, cr, uid, ids, datas, context=None):
- if not context:
- context={}
- env = odoo.api.Environment(cr, uid, context)
- datas['ids'] = ids
- records = env[datas['model']].browse(ids)
- # title come from description of model which are specified in py file.
- self.title = records._description
- result = records.fields_view_get(view_type='form')
-
- fields_order = self._parse_string(result['arch'])
- rows = records.read(list(result['fields']))
- self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, records._description)
- return self.obj.get(), 'pdf'
-
- def _create_table(self, uid, ids, fields, fields_order, results, context, title=''):
- pageSize=[297.0,210.0]
-
- new_doc = etree.Element("report")
- config = etree.SubElement(new_doc, 'config')
-
- # build header
- def _append_node(name, text):
- n = etree.SubElement(config, name)
- n.text = text
-
- _append_node('date', time.strftime('%d/%m/%Y'))
- _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize))
- _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,))
- _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
- _append_node('report-header', title)
-
- l = []
- t = 0
- strmax = (pageSize[0]-40) * 2.8346
- for f in fields_order:
- s = 0
- if fields[f]['type'] in ('date','time','float','integer'):
- s = 60
- strmax -= s
- else:
- t += fields[f].get('size', 56) / 28 + 1
- l.append(s)
- for pos in range(len(l)):
- if not l[pos]:
- s = fields[fields_order[pos]].get('size', 56) / 28 + 1
- l[pos] = strmax * s / t
- _append_node('tableSize', ','.join(map(str,l)) )
-
- header = etree.SubElement(new_doc, 'header')
- for f in fields_order:
- field = etree.SubElement(header, 'field')
- field.text = fields[f]['string'] or ''
-
- lines = etree.SubElement(new_doc, 'lines')
- for line in results:
- node_line = etree.SubElement(lines, 'row')
- for f in fields_order:
- if fields[f]['type']=='many2one' and line[f]:
- line[f] = line[f][1]
- if fields[f]['type'] in ('one2many','many2many') and line[f]:
- line[f] = '( '+str(len(line[f])) + ' )'
- if fields[f]['type'] == 'float':
- precision=(('digits' in fields[f]) and fields[f]['digits'][1]) or 2
- line[f]=round(line[f],precision)
- col = etree.SubElement(node_line, 'col', tree='no')
- if line[f] is not None:
- col.text = tools.ustr(line[f] or '')
- else:
- col.text = '/'
-
- transform = etree.XSLT(
- etree.parse(os.path.join(tools.config['root_path'],
- 'addons/base/report/custom_new.xsl')))
- rml = etree.tostring(transform(new_doc))
-
- self.obj = render.rml(rml, self.title)
- self.obj.render()
- return True
-
-report_printscreen_list('report.printscreen.form')
diff --git a/odoo/report/printscreen/ps_list.py b/odoo/report/printscreen/ps_list.py
deleted file mode 100644
index 5ef2ac83142..00000000000
--- a/odoo/report/printscreen/ps_list.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import locale
-import os
-import time
-from datetime import datetime
-
-from lxml import etree
-
-import odoo
-import odoo.tools as tools
-from odoo.report import render, report_sxw
-from odoo.report.interface import report_int
-from odoo.tools.safe_eval import safe_eval
-
-
-class report_printscreen_list(report_int):
- def __init__(self, name):
- super(report_printscreen_list, self).__init__(name)
- self.context = {}
- self.groupby = []
- self.cr = ''
-
- def _parse_node(self, root_node):
- result = []
- for node in root_node:
- field_name = node.get('name')
- if not safe_eval(str(node.attrib.get('invisible',False)),{'context':self.context}):
- if node.tag == 'field':
- if field_name in self.groupby:
- continue
- result.append(field_name)
- else:
- result.extend(self._parse_node(node))
- return result
-
- def _parse_string(self, view):
- try:
- dom = etree.XML(view.encode('utf-8'))
- except Exception:
- dom = etree.XML(view)
- return self._parse_node(dom)
-
- def create(self, cr, uid, ids, datas, context=None):
- if not context:
- context = {}
- self.cr = cr
- self.context = context
- self.groupby = context.get('group_by',[])
- self.groupby_no_leaf = context.get('group_by_no_leaf', False)
- env = odoo.api.Environment(cr, uid, context)
- Model = env[datas['model']]
- model = env['ir.model']._get(Model._name)
- model_desc = model.name or Model._description
- self.title = model_desc
- datas['ids'] = ids
- result = Model.fields_view_get(view_type='tree')
- fields_order = self.groupby + self._parse_string(result['arch'])
- if self.groupby:
- rows = []
- def get_groupby_data(groupby = [], domain = []):
- records = Model.read_group(domain, fields_order, groupby, 0, None)
- for rec in records:
- rec['__group'] = True
- rec['__no_leaf'] = self.groupby_no_leaf
- rec['__grouped_by'] = groupby[0] if (isinstance(groupby, list) and groupby) else groupby
- for f in fields_order:
- if f not in rec:
- rec.update({f:False})
- elif isinstance(rec[f], tuple):
- rec[f] = rec[f][1]
- rows.append(rec)
- inner_groupby = (rec.get('__context', {})).get('group_by',[])
- inner_domain = rec.get('__domain', [])
- if inner_groupby:
- get_groupby_data(inner_groupby, inner_domain)
- else:
- if self.groupby_no_leaf:
- continue
- children = Model.search(inner_domain)
- res = children.read(list(result['fields']))
- res.sort(key=lambda x: ids.index(x['id']))
- rows.extend(res)
- dom = [('id','in',ids)]
- if self.groupby_no_leaf and len(ids) and not ids[0]:
- dom = datas.get('_domain',[])
- get_groupby_data(self.groupby, dom)
- else:
- rows = Model.browse(ids).read(list(result['fields']))
- if datas['ids'] != rows.ids: # sorted ids were not taken into consideration for print screen
- rows_new = []
- for id in datas['ids']:
- rows_new += [elem for elem in rows if elem['id'] == id]
- rows = rows_new
- res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model_desc)
- return self.obj.get(), 'pdf'
-
- def _create_table(self, uid, ids, fields, fields_order, results, context, title=''):
- pageSize=[297.0, 210.0]
-
- new_doc = etree.Element("report")
- config = etree.SubElement(new_doc, 'config')
-
- def _append_node(name, text):
- n = etree.SubElement(config, name)
- n.text = text
-
- #_append_node('date', time.strftime('%d/%m/%Y'))
- _append_node('date', time.strftime(str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))))
- _append_node('PageSize', '%.2fmm,%.2fmm' % tuple(pageSize))
- _append_node('PageWidth', '%.2f' % (pageSize[0] * 2.8346,))
- _append_node('PageHeight', '%.2f' %(pageSize[1] * 2.8346,))
- _append_node('report-header', title)
-
- env = odoo.api.Environment(self.cr, uid, {})
- Users = env['res.users']
- _append_node('company', Users.browse(uid).company_id.name)
- rml_obj = report_sxw.rml_parse(self.cr, uid, Users._name, context)
- _append_node('header-date', str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")))
- l = []
- t = 0
- strmax = (pageSize[0]-40) * 2.8346
- temp = []
- tsum = []
- for i in range(0, len(fields_order)):
- temp.append(0)
- tsum.append(0)
- ince = -1
- for f in fields_order:
- s = 0
- ince += 1
- if fields[f]['type'] in ('date','time','datetime','float','integer'):
- s = 60
- strmax -= s
- if fields[f]['type'] in ('float','integer'):
- temp[ince] = 1
- else:
- t += fields[f].get('size', 80) / 28 + 1
-
- l.append(s)
- for pos in range(len(l)):
- if not l[pos]:
- s = fields[fields_order[pos]].get('size', 80) / 28 + 1
- l[pos] = strmax * s / t
-
- _append_node('tableSize', ','.join(map(str,l)) )
-
- header = etree.SubElement(new_doc, 'header')
- for f in fields_order:
- field = etree.SubElement(header, 'field')
- field.text = tools.ustr(fields[f]['string'] or '')
-
- lines = etree.SubElement(new_doc, 'lines')
- for line in results:
- node_line = etree.SubElement(lines, 'row')
- count = -1
- for f in fields_order:
- float_flag = 0
- count += 1
- if fields[f]['type']=='many2one' and line[f]:
- if not line.get('__group'):
- line[f] = line[f][1]
- if fields[f]['type']=='selection' and line[f]:
- for key, value in fields[f]['selection']:
- if key == line[f]:
- line[f] = value
- break
- if fields[f]['type'] in ('one2many','many2many') and line[f]:
- line[f] = '( '+tools.ustr(len(line[f])) + ' )'
- if fields[f]['type'] == 'float' and line[f]:
- precision=(('digits' in fields[f]) and fields[f]['digits'][1]) or 2
- prec ='%.' + str(precision) +'f'
- line[f]=prec%(line[f])
- float_flag = 1
-
- if fields[f]['type'] == 'date' and line[f]:
- new_d1 = line[f]
- if not line.get('__group'):
- format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))
- d1 = datetime.strptime(line[f],'%Y-%m-%d')
- new_d1 = d1.strftime(format)
- line[f] = new_d1
-
- if fields[f]['type'] == 'time' and line[f]:
- new_d1 = line[f]
- if not line.get('__group'):
- format = str(locale.nl_langinfo(locale.T_FMT))
- d1 = datetime.strptime(line[f], '%H:%M:%S')
- new_d1 = d1.strftime(format)
- line[f] = new_d1
-
- if fields[f]['type'] == 'datetime' and line[f]:
- new_d1 = line[f]
- if not line.get('__group'):
- format = str(locale.nl_langinfo(locale.D_FMT).replace('%y', '%Y'))+' '+str(locale.nl_langinfo(locale.T_FMT))
- d1 = datetime.strptime(line[f], '%Y-%m-%d %H:%M:%S')
- new_d1 = d1.strftime(format)
- line[f] = new_d1
-
-
- if line.get('__group'):
- col = etree.SubElement(node_line, 'col', para='group', tree='no')
- else:
- col = etree.SubElement(node_line, 'col', para='yes', tree='no')
-
- # Prevent empty labels in groups
- if f == line.get('__grouped_by') and line.get('__group') and not line[f] and not float_flag and not temp[count]:
- col.text = line[f] = 'Undefined'
- col.set('tree', 'undefined')
-
- if line[f] is not None:
- col.text = tools.ustr(line[f] or '')
- if float_flag:
- col.set('tree','float')
- if line.get('__no_leaf') and temp[count] == 1 and f != 'id' and not line['__context']['group_by']:
- tsum[count] = float(tsum[count]) + float(line[f])
- if not line.get('__group') and f != 'id' and temp[count] == 1:
- tsum[count] = float(tsum[count]) + float(line[f])
- else:
- col.text = '/'
-
- node_line = etree.SubElement(lines, 'row')
- for f in range(0, len(fields_order)):
- col = etree.SubElement(node_line, 'col', para='group', tree='no')
- col.set('tree', 'float')
- if tsum[f] is not None:
- if tsum[f] != 0.0:
- digits = fields[fields_order[f]].get('digits', (16, 2))
- prec = '%%.%sf' % (digits[1], )
- total = prec % (tsum[f], )
- txt = str(total or '')
- else:
- txt = str(tsum[f] or '')
- else:
- txt = '/'
- if f == 0:
- txt ='Total'
- col.set('tree','no')
- col.text = tools.ustr(txt or '')
-
- transform = etree.XSLT(
- etree.parse(os.path.join(tools.config['root_path'],
- 'addons/base/report/custom_new.xsl')))
- rml = etree.tostring(transform(new_doc))
- self.obj = render.rml(rml, title=self.title)
- self.obj.render()
- return True
-
-report_printscreen_list('report.printscreen.list')
diff --git a/odoo/report/render/__init__.py b/odoo/report/render/__init__.py
deleted file mode 100644
index 228de009bd1..00000000000
--- a/odoo/report/render/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from .simple import simple
-from .rml import rml, rml2html, rml2txt, odt2odt , html2html, makohtml2html
-from .render import render
-
-try:
- from PIL import Image
-except ImportError:
- import logging
- _logger = logging.getLogger(__name__)
- _logger.warning('Python Imaging not installed, you can use only .JPG pictures !')
diff --git a/odoo/report/render/html2html/__init__.py b/odoo/report/render/html2html/__init__.py
deleted file mode 100644
index 41fa95cf4a0..00000000000
--- a/odoo/report/render/html2html/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from .html2html import parseString
diff --git a/odoo/report/render/html2html/html2html.py b/odoo/report/render/html2html/html2html.py
deleted file mode 100644
index bb6ea8bae0d..00000000000
--- a/odoo/report/render/html2html/html2html.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-import base64
-import copy
-import cStringIO
-import re
-
-from reportlab.lib.utils import ImageReader
-
-from odoo.report.render.rml2pdf import utils
-
-_regex = re.compile('\[\[(.+?)\]\]')
-utils._regex = re.compile('\[\[\s*(.+?)\s*\]\]',re.DOTALL)
-class html2html(object):
- def __init__(self, html, localcontext):
- self.localcontext = localcontext
- self.etree = html
- self._node = None
-
-
- def render(self):
- def process_text(node,new_node):
- if new_node.tag in ['story','tr','section']:
- new_node.attrib.clear()
- for child in utils._child_get(node, self):
- new_child = copy.deepcopy(child)
- new_node.append(new_child)
- if len(child):
- for n in new_child:
- new_child.text = utils._process_text(self, child.text)
- new_child.tail = utils._process_text(self, child.tail)
- new_child.remove(n)
- process_text(child, new_child)
- else:
- if new_child.tag=='img' and new_child.get('name'):
- if _regex.findall(new_child.get('name')) :
- src = utils._process_text(self, new_child.get('name'))
- if src :
- new_child.set('src','data:image/gif;base64,%s'%src)
- output = cStringIO.StringIO(base64.decodestring(src))
- img = ImageReader(output)
- (width,height) = img.getSize()
- if not new_child.get('width'):
- new_child.set('width',str(width))
- if not new_child.get('height') :
- new_child.set('height',str(height))
- else :
- new_child.getparent().remove(new_child)
- new_child.text = utils._process_text(self, child.text)
- new_child.tail = utils._process_text(self, child.tail)
- self._node = copy.deepcopy(self.etree)
- for n in self._node:
- self._node.remove(n)
- process_text(self.etree, self._node)
- return self._node
-
- def url_modify(self,root):
- for n in root:
- if (n.text.find('=0 or n.text.find('<a')>=0) and n.text.find('href')>=0 and n.text.find('style')<=0 :
- node = (n.tag=='span' and n.getparent().tag=='u') and n.getparent().getparent() or ((n.tag=='span') and n.getparent()) or n
- style = node.get('color') and "style='color:%s; text-decoration: none;'"%node.get('color') or ''
- if n.text.find('<a')>=0:
- t = '<a '
- else :
- t = '
-
- var indexer = 0;
- var aryTest = %s ;
- function nextData()
- {
- if(indexer < aryTest.length -1)
- {
- indexer += 1;
- document.forms[0].prev.disabled = false;
- document.getElementById("openerp_data").innerHTML=aryTest[indexer];
- document.getElementById("counter").innerHTML= indexer + 1 + ' / ' + aryTest.length;
- }
- else
- {
- document.forms[0].next.disabled = true;
- }
- }
- function prevData()
- {
- if (indexer > 0)
- {
- indexer -= 1;
- document.forms[0].next.disabled = false;
- document.getElementById("openerp_data").innerHTML=aryTest[indexer];
- document.getElementById("counter").innerHTML= indexer + 1 + ' / ' + aryTest.length;
- }
- else
- {
- document.forms[0].prev.disabled = true;
- }
- }
-
-
-
-
- -
-
+
diff --git a/addons/report_intrastat/report/report_intrastat_report.xml b/addons/report_intrastat/report/report_intrastat_report.xml
index 12df16c12c6..126c059b109 100644
--- a/addons/report_intrastat/report/report_intrastat_report.xml
+++ b/addons/report_intrastat/report/report_intrastat_report.xml
@@ -8,7 +8,7 @@
name="report_intrastat.report_intrastatinvoice"
file="report_intrastat.report_intrastatinvoice"
/>
-
+
(object.type == 'out_invoice' and object.state == 'draft' and 'Intrastat Invoice' or
object.type == 'out_invoice' and object.state in ('open','paid') and 'Intrastat Invoice'+'-'+(object.number) or
object.type == 'out_refund' and object.state == 'draft' and 'Intrastat Credit Note' or
diff --git a/addons/report_intrastat/tests/test_report_intrastat.py b/addons/report_intrastat/tests/test_report_intrastat.py
index 90d688f922b..89b03830eb7 100644
--- a/addons/report_intrastat/tests/test_report_intrastat.py
+++ b/addons/report_intrastat/tests/test_report_intrastat.py
@@ -29,6 +29,6 @@ class RepoortIntrastatTest(common.TransactionCase):
})
def test_00_create_pdf(self):
- data, report_format = self.env['ir.actions.report.xml'].render_report(self.invoice.ids, 'report_intrastat.report_intrastatinvoice', {})
+ data, data_format = self.env.ref('report_intrastat.account_intrastatinvoices').render(self.invoice.ids)
if tools.config['test_report_directory']:
- open(os.path.join(tools.config['test_report_directory'], 'report_intrastat-intrastat_report.' + report_format), 'wb+').write(data)
+ open(os.path.join(tools.config['test_report_directory'], 'report_intrastat-intrastat_report.' + data_format), 'wb+').write(data)
diff --git a/addons/sale/report/sale_report.xml b/addons/sale/report/sale_report.xml
index 3e4996dffe2..ff8a1f5f15e 100644
--- a/addons/sale/report/sale_report.xml
+++ b/addons/sale/report/sale_report.xml
@@ -9,7 +9,7 @@
file="sale.report_saleorder"
name="sale.report_saleorder"
/>
-
+
(object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))
@@ -21,7 +21,7 @@
name="sale.report_saleproforma"
file="sale.report_saleorder"
/>
-
+
'Pro-Forma'+'-'+(object.name)
diff --git a/addons/stock/report/stock_report_views.xml b/addons/stock/report/stock_report_views.xml
index cb9af6d109e..84988bfdb6a 100644
--- a/addons/stock/report/stock_report_views.xml
+++ b/addons/stock/report/stock_report_views.xml
@@ -9,7 +9,7 @@
name="stock.report_picking"
file="stock.report_picking_operations"
/>
-
+
'Picking Operations'+'-'+(object.partner_id.name or '')+'-'+(object.name)
+
'Delivery Slip'+'-'+(object.partner_id.name or '')+'-'+(object.name)
+
'Inventory'+'-'+(object.name)
+
(object.name)+'-'+'Location'
+
'Lot/Serial'+'-'+(object.name)
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 700f19d8168..1a86ca97823 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1157,7 +1157,7 @@ class Action(http.Controller):
if base_action:
ctx = dict(request.context)
action_type = base_action[0]['type']
- if action_type == 'ir.actions.report.xml':
+ if action_type == 'ir.actions.report':
ctx.update({'bin_size': True})
if additional_context:
ctx.update(additional_context)
@@ -1498,7 +1498,7 @@ class Reports(http.Controller):
report_struct['format'], 'octet-stream')
file_name = action.get('name', 'report')
if 'name' not in action:
- reports = request.env['ir.actions.report.xml']
+ reports = request.env['ir.actions.report']
reports = reports.search([('report_name', '=', action['report_name'])])
if reports:
file_name = reports[0].name
diff --git a/addons/web/static/src/js/chrome/action_manager.js b/addons/web/static/src/js/chrome/action_manager.js
index 934473109a3..b02376ef6b7 100644
--- a/addons/web/static/src/js/chrome/action_manager.js
+++ b/addons/web/static/src/js/chrome/action_manager.js
@@ -861,7 +861,7 @@ var ActionManager = Widget.extend({
return self.do_action(action, options);
});
},
- ir_actions_report_xml: function(action, options) {
+ ir_actions_report: function(action, options) {
var self = this;
framework.blockUI();
action = _.clone(action);
diff --git a/addons/website_quote/report/sale_order_reports.xml b/addons/website_quote/report/sale_order_reports.xml
index 1aeaf7c6e0e..c3c8078545f 100644
--- a/addons/website_quote/report/sale_order_reports.xml
+++ b/addons/website_quote/report/sale_order_reports.xml
@@ -9,7 +9,7 @@
name="website_quote.report_quote"
menu="False"
/>
-
+
(object.state in ('draft', 'sent') and 'Quotation'+'-'+(object.name) or 'Order'+'-'+(object.name))
diff --git a/doc/api_integration.rst b/doc/api_integration.rst
index 1345915d797..612e91ed854 100644
--- a/doc/api_integration.rst
+++ b/doc/api_integration.rst
@@ -1298,7 +1298,7 @@ activated as actual fields on the model.
Report printing
---------------
-Available reports can be listed by searching the ``ir.actions.report.xml``
+Available reports can be listed by searching the ``ir.actions.report``
model, fields of interest being
``model``
diff --git a/doc/howtos/backend.rst b/doc/howtos/backend.rst
index 4d48a6d7de3..bffebe587bb 100644
--- a/doc/howtos/backend.rst
+++ b/doc/howtos/backend.rst
@@ -1502,7 +1502,7 @@ Odoo 8.0 comes with a new report engine based on :ref:`reference/qweb`,
A report is a combination two elements:
-* an ``ir.actions.report.xml``, for which a ```` shortcut element is
+* an ``ir.actions.report``, for which a ```` shortcut element is
provided, it sets up various basic parameters for the report (default
type, whether the report should be saved to the database after generation,…)
diff --git a/doc/reference/actions.rst b/doc/reference/actions.rst
index fb9d3255cdb..904cb89db13 100644
--- a/doc/reference/actions.rst
+++ b/doc/reference/actions.rst
@@ -358,8 +358,8 @@ server actions:
.. _reference/actions/report:
-Report Actions (``ir.actions.report.xml``)
-==========================================
+Report Actions (``ir.actions.report``)
+======================================
Triggers the printing of a report
diff --git a/doc/reference/data.rst b/doc/reference/data.rst
index c8ebf864a88..fd597fcb4a5 100644
--- a/doc/reference/data.rst
+++ b/doc/reference/data.rst
@@ -218,10 +218,10 @@ section of the view, and allowing a few *optional* attributes:
``report``
----------
-Creates a ``ir.actions.report.xml`` record with a few default values.
+Creates a ``ir.actions.report`` record with a few default values.
Mostly just proxies attributes to the corresponding fields on
-``ir.actions.report.xml``, but also automatically creates the item in the
+``ir.actions.report``, but also automatically creates the item in the
:guilabel:`More` menu of the report's ``model``.
.. ignored url, act_window and ir_set
diff --git a/odoo/__init__.py b/odoo/__init__.py
index 4c074c9beb3..3c3b14fdadc 100644
--- a/odoo/__init__.py
+++ b/odoo/__init__.py
@@ -61,7 +61,6 @@ from . import modules
from . import netsvc
from . import osv
from . import release
-from . import report
from . import service
from . import sql_db
from . import tools
diff --git a/odoo/addons/base/base_data.xml b/odoo/addons/base/base_data.xml
index 322cd3ae324..7c90d0b96e9 100644
--- a/odoo/addons/base/base_data.xml
+++ b/odoo/addons/base/base_data.xml
@@ -67,26 +67,6 @@ Administrator]]>
-
-
- Helvetica
- Helvetica
- /dev/null
- all
-
-
- Times
- Times
- /dev/null
- all
-
-
- Courier
- Courier
- /dev/null
- all
-
-
Public user
- ir.actions.report.xml
- ir.actions.report.xml
+ ir.actions.report
+ ir.actions.report
- ir.actions.report.xml.tree
- ir.actions.report.xml
+ ir.actions.report.tree
+ ir.actions.report
- ir.actions.report.xml.search
- ir.actions.report.xml
+ ir.actions.report.search
+ ir.actions.report
-
+
Reports
ir.actions.act_window
- ir.actions.report.xml
+ ir.actions.report
form
-
+
diff --git a/odoo/addons/base/ir/ir_ui_menu.py b/odoo/addons/base/ir/ir_ui_menu.py
index c8a39322835..b4bebf0e9a8 100644
--- a/odoo/addons/base/ir/ir_ui_menu.py
+++ b/odoo/addons/base/ir/ir_ui_menu.py
@@ -37,7 +37,7 @@ class IrUiMenu(models.Model):
"If this field is empty, Odoo will compute visibility based on the related object's read access.")
complete_name = fields.Char(compute='_compute_complete_name', string='Full Path')
web_icon = fields.Char(string='Web Icon File')
- action = fields.Reference(selection=[('ir.actions.report.xml', 'ir.actions.report.xml'),
+ action = fields.Reference(selection=[('ir.actions.report', 'ir.actions.report'),
('ir.actions.act_window', 'ir.actions.act_window'),
('ir.actions.act_url', 'ir.actions.act_url'),
('ir.actions.server', 'ir.actions.server'),
@@ -99,7 +99,7 @@ class IrUiMenu(models.Model):
access = self.env['ir.model.access']
MODEL_GETTER = {
'ir.actions.act_window': lambda action: action.res_model,
- 'ir.actions.report.xml': lambda action: action.model,
+ 'ir.actions.report': lambda action: action.model,
'ir.actions.server': lambda action: action.model_id.model,
}
for menu in action_menus:
diff --git a/odoo/addons/base/ir/ir_values.py b/odoo/addons/base/ir/ir_values.py
index ccd971e26e4..3672d7811c2 100644
--- a/odoo/addons/base/ir/ir_values.py
+++ b/odoo/addons/base/ir/ir_values.py
@@ -10,11 +10,6 @@ from odoo.tools import pickle
import logging
_logger = logging.getLogger(__name__)
-
-EXCLUDED_FIELDS = set(('code',
- 'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
- 'report_sxw_content_data', 'report_rml_content_data', 'search_view', ))
-
#: Possible slots to bind an action to with :meth:`~.set_action`
ACTION_SLOTS = [
"client_action_multi", # sidebar wizard action
@@ -419,14 +414,10 @@ class IrValues(models.Model):
# process values and their action
results = {}
for id, name, action in actions:
- fields = [field for field in action._fields if field not in EXCLUDED_FIELDS]
# FIXME: needs cleanup
try:
- action_def = {
- field: action._fields[field].convert_to_read(action[field], action)
- for field in fields
- }
- if action._name in ('ir.actions.report.xml', 'ir.actions.act_window'):
+ action_def = dict([(k, v.convert_to_read(action[k], action)) for k, v in action._fields.items()])
+ if action._name in ('ir.actions.report', 'ir.actions.act_window'):
if action.groups_id and not action.groups_id & self.env.user.groups_id:
if name == 'Menuitem':
raise AccessError(_('You do not have the permission to perform this operation!!!'))
diff --git a/odoo/addons/base/module/module.py b/odoo/addons/base/module/module.py
index f95c2b07dc1..ae36ccd1727 100644
--- a/odoo/addons/base/module/module.py
+++ b/odoo/addons/base/module/module.py
@@ -184,7 +184,7 @@ class Module(models.Model):
@api.depends('name', 'state')
def _get_views(self):
IrModelData = self.env['ir.model.data'].with_context(active_test=True)
- dmodels = ['ir.ui.view', 'ir.actions.report.xml', 'ir.ui.menu']
+ dmodels = ['ir.ui.view', 'ir.actions.report', 'ir.ui.menu']
for module in self:
# Skip uninstalled modules below, no data to find anyway.
@@ -210,7 +210,7 @@ class Module(models.Model):
return '%s%s (%s)' % (v.inherit_id and '* INHERIT ' or '', v.name, v.type)
module.views_by_module = "\n".join(sorted(map(format_view, browse('ir.ui.view'))))
- module.reports_by_module = "\n".join(sorted(map(attrgetter('name'), browse('ir.actions.report.xml'))))
+ module.reports_by_module = "\n".join(sorted(map(attrgetter('name'), browse('ir.actions.report'))))
module.menus_by_module = "\n".join(sorted(map(attrgetter('complete_name'), browse('ir.ui.menu'))))
@api.depends('icon')
diff --git a/odoo/addons/base/report/__init__.py b/odoo/addons/base/report/__init__.py
deleted file mode 100644
index 6ce403b6633..00000000000
--- a/odoo/addons/base/report/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import preview_report
diff --git a/odoo/addons/base/report/corporate_defaults.xml b/odoo/addons/base/report/corporate_defaults.xml
index 751693e7e89..3e99caf9d48 100644
--- a/odoo/addons/base/report/corporate_defaults.xml
+++ b/odoo/addons/base/report/corporate_defaults.xml
@@ -1,8 +1,8 @@
- [[ company.partner_id.name ]]
- [[ company.rml_header1 ]]
+ [[ company.report_header ]]
@@ -233,7 +233,7 @@
- [[ company.rml_footer ]]
+ [[ company.report_footer ]]
Contact : [[ user.name ]]
diff --git a/odoo/addons/base/report/preview_report.py b/odoo/addons/base/report/preview_report.py
deleted file mode 100644
index 68f38098421..00000000000
--- a/odoo/addons/base/report/preview_report.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo.report import report_sxw
-
-class rmlparser(report_sxw.rml_parse):
- def set_context(self, objects, data, ids, report_type = None):
- super(rmlparser,self).set_context(objects, data, ids, report_type)
- self.setCompany(objects[0])
-
-report_sxw.report_sxw('report.preview.report', 'res.company',
- 'addons/base/report/preview_report.rml', parser=rmlparser, header='external')
diff --git a/odoo/addons/base/report/preview_report.rml b/odoo/addons/base/report/preview_report.rml
deleted file mode 100644
index f3a54527a13..00000000000
--- a/odoo/addons/base/report/preview_report.rml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/odoo/addons/base/res/__init__.py b/odoo/addons/base/res/__init__.py
index ee904734c09..1e10e5ee9cd 100644
--- a/odoo/addons/base/res/__init__.py
+++ b/odoo/addons/base/res/__init__.py
@@ -7,7 +7,6 @@ from . import res_partner
from . import res_bank
from . import res_config
from . import res_currency
-from . import res_font
from . import res_company
from . import res_users
from . import res_request
diff --git a/odoo/addons/base/res/res_company.py b/odoo/addons/base/res/res_company.py
index 18fbd6a0a3e..b02255db4bd 100644
--- a/odoo/addons/base/res/res_company.py
+++ b/odoo/addons/base/res/res_company.py
@@ -13,98 +13,6 @@ class Company(models.Model):
_description = 'Companies'
_order = 'sequence, name'
- _header = """
-
-
-
-
-
-
-
- [[ formatLang(time.strftime("%%Y-%%m-%%d"), date=True) ]] [[ time.strftime("%%H:%%M") ]]
- [[ company.partner_id.name ]]
- %s
-
-
-
-
- """
-
- _header2 = _header % (539, 772, "1.0cm", "28.3cm", "11.1cm", "28.3cm", "1.0cm 28.1cm 20.1cm 28.1cm")
- _header3 = _header % (786, 525, 25, 555, 440, 555, "25 550 818 550")
-
- _header_main = """
-
-
-
-
-
-
-
-
- [[ company.logo or removeParentNode('image') ]]
- 1.3cm %s 20cm %s
- [[ company.rml_header1 ]]
- [[ company.partner_id.name ]]
-
- [[ display_address(company.partner_id) or '' ]]
-
- Phone:
- [[ company.partner_id.phone or '' ]]
- Mail:
- [[ company.partner_id.email or '' ]]
- 1.3cm %s 7cm %s
-
-
- generated by Odoo.com
- 1.2cm 2.65cm 19.9cm 2.65cm
-
- [[ company.rml_footer ]]
- Contact : [[ user.name ]] - Page:
-
-
-
- """
-
- _header_a4 = _header_main % ('21.7cm', '27.7cm', '27.7cm', '27.7cm', '27.8cm', '27.3cm', '25.3cm', '25.0cm', '25.0cm', '24.6cm', '24.6cm', '24.5cm', '24.5cm')
- _header_letter = _header_main % ('20cm', '26.0cm', '26.0cm', '26.0cm', '26.1cm', '25.6cm', '23.6cm', '23.3cm', '23.3cm', '22.9cm', '22.9cm', '22.8cm', '22.8cm')
-
- def _get_header(self):
- try:
- header_file = tools.file_open(os.path.join(
- 'base', 'report', 'corporate_rml_header.rml'))
- try:
- return header_file.read()
- finally:
- header_file.close()
- except:
- return self._header_a4
-
- def _get_font(self):
- return self.env['res.font'].search([('family', '=', 'Helvetica'), ('mode', '=', 'all')], limit=1)
-
def _get_logo(self):
return open(os.path.join(tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')
@@ -121,14 +29,8 @@ class Company(models.Model):
parent_id = fields.Many2one('res.company', string='Parent Company', index=True)
child_ids = fields.One2many('res.company', 'parent_id', string='Child Companies')
partner_id = fields.Many2one('res.partner', string='Partner', required=True)
- rml_header = fields.Text(required=True, default=_get_header)
- rml_header1 = fields.Text(string='Company Tagline', help="Appears by default on the top right corner of your printed documents (report header).")
- rml_header2 = fields.Text(string='RML Internal Header', required=True, default=_header2)
- rml_header3 = fields.Text(string='RML Internal Header for Landscape Reports', required=True, default=_header3)
- rml_footer = fields.Text(string='Report Footer', translate=True, help="Footer text displayed at the bottom of all reports.")
- font = fields.Many2one('res.font', string="Font", default=lambda self: self._get_font(),
- domain=[('mode', 'in', ('Normal', 'Regular', 'all', 'Book'))],
- help="Set the font into the report header, it will be used as default font in the RML reports of the user company")
+ report_header = fields.Text(string='Company Tagline', help="Appears by default on the top right corner of your printed documents (report header).")
+ report_footer = fields.Text(string='Report Footer', translate=True, help="Footer text displayed at the bottom of all reports.")
logo = fields.Binary(related='partner_id.image', default=_get_logo, string="Company Logo")
# logo_web: do not store in attachments, since the image is retrieved in SQL for
# performance reasons (see addons/web/controllers/main.py, Binary.company_logo)
@@ -149,7 +51,6 @@ class Company(models.Model):
website = fields.Char(related='partner_id.website')
vat = fields.Char(related='partner_id.vat', string="TIN")
company_registry = fields.Char()
- rml_paper_format = fields.Selection([('a4', 'A4'), ('us_letter', 'US Letter')], string="Paper Format", required=True, default='a4', oldname='paper_format')
sequence = fields.Integer(help='Used to order Companies in the company switcher', default=10)
_sql_constraints = [
@@ -213,20 +114,6 @@ class Company(models.Model):
def _onchange_state(self):
self.country_id = self.state_id.country_id
- @api.onchange('font')
- def _onchange_font_name(self):
- """ To change default header style of all and drawstring. """
- def _change_header(header, font):
- """ Replace default fontname use in header and setfont tag """
- default_para = re.sub(r'fontName.?=.?".*"', 'fontName="%s"' % font, header)
- return re.sub(r'("%s"\g<3>' % font, default_para)
-
- if self.font:
- fontname = self.font.name
- self.rml_header = _change_header(self.rml_header, fontname)
- self.rml_header2 = _change_header(self.rml_header2, fontname)
- self.rml_header3 = _change_header(self.rml_header3, fontname)
-
@api.multi
def on_change_country(self, country_id):
# This function is called from account/models/chart_template.py, hence decorated with `multi`.
@@ -324,18 +211,6 @@ class Company(models.Model):
self.clear_caches()
return super(Company, self).write(values)
- @api.onchange('rml_paper_format')
- def _onchange_rml_paper_format(self):
- if self.rml_paper_format == 'us_letter':
- self.rml_header = self._header_letter
- else:
- self.rml_header = self._header_a4
-
- @api.multi
- def act_discover_fonts(self):
- self.ensure_one()
- return self.env["res.font"].font_scan()
-
@api.constrains('parent_id')
def _check_parent_id(self):
if not self._check_recursion():
diff --git a/odoo/addons/base/res/res_company_view.xml b/odoo/addons/base/res/res_company_view.xml
index 4746deeb1b1..3a7168dc3f8 100644
--- a/odoo/addons/base/res/res_company_view.xml
+++ b/odoo/addons/base/res/res_company_view.xml
@@ -1,8 +1,6 @@
-
res.company.form
res.company
@@ -31,8 +29,8 @@
This isa test
-
- %s
-
-
- %s
-
- - -