odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]:Avg/sum for groupby 

bzr revid: nch@tinyerp.com-20100308094036-hpvzsvlygup7s0e7
This commit is contained in:
nch@tinyerp.com 2010-03-08 15:10:36 +05:30
parent 325bcd1c5b
commit 8856a549f7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/osv/fields.py
View File

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@ -80,6 +80,7 @@ class _column(object):
self.view_load = 0
self.select = select
self.selectable = True
self.group_operator = args.get('group_operator', False)
for a in args:
if args[a]:
setattr(self, a, args[a])
@ -177,6 +178,7 @@ class float(_column):
self.digits = digits
self.digits_compute = digits_compute
def digits_change(self, cr):
if self.digits_compute:
t = self.digits_compute(cr)
@ -320,8 +322,8 @@ class many2one(_column):
except except_orm:
record_name = {}
record_name[record] = '// Access Denied //'
names.update(record_name)
names.update(record_name)
for r in res.keys():
if res[r] and res[r] in names:
res[r] = (res[r], names[res[r]])
@ -629,7 +631,7 @@ class function(_column):
self._multi = multi
if 'relation' in args:
self._obj = args['relation']
self.digits = args.get('digits', (16,2))
self.digits_compute = args.get('digits_compute', None)
@ -642,7 +644,7 @@ class function(_column):
if not fnct_search and not store:
self.selectable = False
if store:
self._classic_read = True
self._classic_write = True
@ -681,14 +683,14 @@ class function(_column):
if self._type == "many2one" :
# Filtering only integer/long values if passed
res_ids = [x for x in res.values() if x and isinstance(x, (int,long))]
if res_ids:
obj_model = obj.pool.get(self._obj)
dict_names = dict(obj_model.name_get(cr, user, res_ids, context))
for r in res.keys():
if res[r] and res[r] in dict_names:
res[r] = (res[r], dict_names[res[r]])
if self._type == 'binary' and context.get('bin_size', False):
# convert the data returned by the function with the size of that data...
res = dict(map( get_nice_size, res.items()))
@ -838,7 +840,7 @@ class dummy(function):
def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
return {}
def __init__(self, *arg, **args):
self.arg = arg
self._relations = []

5
bin/osv/orm.py
View File

@ -1007,7 +1007,7 @@ class orm_template(object):
if fields and f not in fields:
continue
res[f] = {'type': self._columns[f]._type}
for arg in ('string', 'readonly', 'states', 'size', 'required',
for arg in ('string', 'readonly', 'states', 'size', 'required', 'group_operator',
'change_default', 'translate', 'help', 'select', 'selectable'):
if getattr(self._columns[f], arg):
res[f][arg] = getattr(self._columns[f], arg)
@ -1873,7 +1873,8 @@ class orm(orm_template):
or (f in self._columns and getattr(self._columns[f], '_classic_write'))]
for f in fields_pre:
if f not in ['id','sequence']:
flist += ',sum('+f+') as '+f
operator = fget[f].get('group_operator','sum')
flist += ','+operator+'('+f+') as '+f
cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + ' group by '+ groupby + limit_str + offset_str, where_params)
alldata = {}