pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:groupby no leaf support for printscreen rga's branch

Browse Source 
bzr revid: nch@tinyerp.com-20100702065219-oj3iwcm3gheb81o2
This commit is contained in:
nch@tinyerp.com
2010-07-02 12:22:19 +05:30
parent 063875402e
commit ec733aa36a
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/report/printscreen/ps_list.py
+14 -5
View File
@@ -62,6 +62,7 @@ class report_printscreen_list(report_int):
context={}
self.context = context
self.groupby = context.get('group_by',[])
self.groupby_no_leaf = context.get('group_by_no_leaf',False)
pool = pooler.get_pool(cr.dbname)
model = pool.get(datas['model'])
model_id = pool.get('ir.model').search(cr, uid, [('model','=',model._name)])
@@ -81,6 +82,7 @@ class report_printscreen_list(report_int):
records = model.read_group(cr, uid, domain, fields_order, groupby , 0, None, context)
for rec in records:
rec['__group'] = True
rec['__no_leaf'] = self.groupby_no_leaf
for f in fields_order:
if f not in rec:
rec.update({f:False})
@@ -92,10 +94,15 @@ class report_printscreen_list(report_int):
if groupby:
get_groupby_data(groupby, domain)
else:
if self.groupby_no_leaf:
continue
child_ids = model.search(cr, uid, domain)
res = model.read(cr, uid, child_ids, result['fields'].keys(), context)
rows.extend(res)
get_groupby_data(self.groupby, [('id','in',ids)])
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.read(cr, uid, datas['ids'], result['fields'].keys(), context)
ids2 = map(itemgetter('id'), rows) # getting the ids from read result
@@ -169,8 +176,6 @@ class report_printscreen_list(report_int):
if fields[f]['type']=='many2one' and line[f]:
if not line.get('__group'):
line[f]= line[f][1]
else:
line[f]= line[f]
if fields[f]['type']=='selection' and line[f]:
for key, value in fields[f]['selection']:
if key == line[f]:
@@ -209,12 +214,16 @@ class report_printscreen_list(report_int):
line[f] = new_d1
if line.get('__group'):
col = etree.SubElement(node_line, 'col', para='group', tree='no')
if fields[f]['type'] =='integer':
col.set('tree','float')
else:
col = etree.SubElement(node_line, 'col', para='yes', tree='no')
if line[f] != 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:
@@ -222,19 +231,19 @@ class report_printscreen_list(report_int):
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] != None:
if tsum[f] >= 0.01 :
prec = '%.' + str(tools.config['price_accuracy']) + 'f'
total = prec%(tsum[f])
txt = str(total or '')
col.set('tree','float')
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(