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

[MERGE]

Browse Source 
bzr revid: nch@tinyerp.com-20100119100401-69j8cnbv7tvivmtk
bzr revid: nch@tinyerp.com-20100125060345-vxxhpcdgjyy22933
This commit is contained in:
nch@tinyerp.com
2010-01-25 11:33:45 +05:30
parent 3a3a5731c0 e099eddc14
commit 6f0bc4330e
6 changed files with 64 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/i18n/fr.po
+4 -4
View File
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-25 06:29+0000\n"
"PO-Revision-Date: 2010-01-21 05:27+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
#: model:res.country,name:base.sh
msgid "Saint Helena"
msgstr "Sainte-Hélène"
msgstr "Île Sainte-Hélène"
#. module: base
#: wizard_view:res.partner.sms_send,init:0
@@ -2574,7 +2574,7 @@ msgstr "Type d'évènement"
#: view:res.partner.bank:0
#: model:res.partner.bank.type,name:base.bank_normal
msgid "Bank account"
msgstr "Compte banquaire"
msgstr "Compte bancaire"
#. module: base
#: view:ir.sequence.type:0
bin/addons/base/i18n/ru.po
+5 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-15 06:51+0000\n"
"Last-Translator: Dmitry Tumaikin <nevly@mail.ru>\n"
"PO-Revision-Date: 2010-01-23 05:36+0000\n"
"Last-Translator: Paul Korotkov <korotkov.paul@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-01-24 04:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -1498,7 +1498,7 @@ msgstr ""
#. module: base
#: field:ir.ui.view_sc,name:0
msgid "Shortcut Name"
msgstr "Краткое название"
msgstr "Название закладки"
#. module: base
#: field:res.partner,credit_limit:0
@@ -3305,7 +3305,7 @@ msgstr "Рекомендуем вам перезагрузить вкладки
#: view:ir.ui.view_sc:0
#: field:res.partner.title,shortcut:0
msgid "Shortcut"
msgstr "Горячая клвиша"
msgstr "Закладка"
#. module: base
#: field:ir.model.data,date_init:0
bin/addons/base/i18n/tr.po
+4 -4
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2009-12-15 06:55+0000\n"
"Last-Translator: Mustafa Yılmaz <apshalasha@gmail.com>\n"
"PO-Revision-Date: 2010-01-24 18:52+0000\n"
"Last-Translator: Oktay Altunergil <oktaya@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -6187,7 +6187,7 @@ msgstr ""
#: field:workflow.instance,state:0
#: field:workflow.workitem,state:0
msgid "State"
msgstr "Eyalet"
msgstr "Durum"
#. module: base
#: selection:ir.module.module,license:0
bin/addons/base/i18n/uk.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-01-18 05:27+0000\n"
"PO-Revision-Date: 2010-01-24 05:48+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-19 04:41+0000\n"
"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_CN.po
+5 -5
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-01-10 09:34+0000\n"
"PO-Revision-Date: 2010-01-24 05:45+0000\n"
"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -4402,7 +4402,7 @@ msgstr "res.partner.event"
#. module: base
#: field:res.company,user_ids:0
msgid "Accepted Users"
msgstr ""
msgstr "接受的用户"
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -7675,7 +7675,7 @@ msgstr "选择组"
#. module: base
#: field:ir.sequence,weight:0
msgid "Weight"
msgstr ""
msgstr "重量"
#. module: base
#: view:res.lang:0
@@ -7752,7 +7752,7 @@ msgstr "设置向导"
#. module: base
#: field:res.lang,code:0
msgid "Locale Code"
msgstr ""
msgstr "地区代码"
#. module: base
#: field:workflow.activity,split_mode:0
bin/osv/orm.py
+44 -105
View File
@@ -348,111 +348,8 @@ class orm_template(object):
CONCURRENCY_CHECK_FIELD = '__last_update'
def read_group(self, cr, user, ids, fields, groupby, context=None):
context = context or {}
if not ids:return
if fields[groupby]['type'] not in ('many2one','date','datetime'):
raise Exception(_("Type Not supported for Group By: %s :Only many2one,date and datetime are supported ") %(fields[groupby]['type'],))
qu1 = ' where id in (' + ','.join([str(id) for id in ids]) + ')'
qu2 = ''
# construct a clause for the rules :
d1, d2, d3 = self.pool.get('ir.rule').domain_get(cr, user, self._name)
if d1:
qu1 = qu1 and qu1+' and '+d1 or ' where '+d1
qu2 += d2
float_int_fields = list(field_name for field_name,values in fields.items() if values['type'] in ('float','integer'))
sum = {}
cr.execute('select '+groupby+' from ' + self._table +qu1+' group by '+groupby+qu2)
parent_res = cr.fetchall()
try:
parent_res = [(m[0],m[1]) for m in parent_res if m[0]]
except:
parent_res = [(m[0],) for m in parent_res if m[0]]
groupby_ids = map(lambda x:x[0],parent_res)
groupby_name = {}
child_ids_dict = {}
if fields[groupby]['type'] == 'many2one':
groupby_name = dict(self.pool.get(fields[groupby]['relation']).name_get(cr,user,groupby_ids,context))
chqu1 =' where id in (' + ','.join([str(id) for id in ids]) + ') and '
# get child ids
for parent_id in groupby_ids:
cr.execute('select id from '+self._table+chqu1 +groupby+" = '%s'"%(parent_id,))
child_ids = cr.fetchall()
for val in child_ids:
if parent_id not in child_ids_dict:
child_ids_dict[parent_id] = [val[0]]
else:
child_ids_dict[parent_id].append(val[0])
#create [{},{}] for parent ids i.e for group by field
result = []
if fields[groupby]['type'] in ('date','datetime'):
curr_date = datetime.date.today()
yesterday = (curr_date - datetime.timedelta(days=1)).strftime('%Y-%m-%d')
lastweek = (curr_date + datetime.timedelta(weeks=-1)).strftime('%Y-%m-%d')
date_result = {'Today':{'group_child':[]},'Yesterday':{'group_child':[]},
'LastWeek':{'group_child':[]},'Old':{'group_child':[]}}
for x in parent_res:
db_date = x[0][:10]
if db_date == curr_date.strftime('%Y-%m-%d'):
date_format = 'Today'
elif db_date == yesterday:
date_format = 'Yesterday'
elif (db_date < yesterday) and (db_date >= lastweek):
date_format = 'LastWeek'
else:
date_format = 'Old'
date_result[date_format].update({'id':None,groupby:date_format})
date_result[date_format]['group_child'] += child_ids_dict[x[0]]
float_int_sum = self.read(cr, user, child_ids_dict[x[0]], float_int_fields, context)
for value in float_int_sum:
for field,val in value.items():
if field == 'id':continue
if field not in sum:
sum[field] = 0.0
sum[field] += val
for k,v in sum.items():
date_result[date_format][k] = v
sum = {}
for key,val in date_result.items():
if len(date_result[key]) == 1:
del date_result[key]
continue
for field in fields.keys():
if field not in val:
val[field] = False
if key in ('Today','Yesterday') and len(result):
result.insert(0,val)
else:
result.insert(-1,val)
return result
else:
for x in parent_res:
parent_val_dict = {'id':str(x[0])+':Gpby',groupby:(x[0],groupby_name[x[0]]),'group_child':child_ids_dict[x[0]]}
float_int_sum = self.read(cr, user, child_ids_dict[x[0]], float_int_fields, context)
for value in float_int_sum:
for field,val in value.items():
if field == 'id':continue
if field not in sum:
sum[field] = 0.0
sum[field] += val
for k,v in sum.items():
parent_val_dict[k] = v
sum = {}
for field in fields.keys():
if field not in parent_val_dict:
parent_val_dict[field] = False
result.append(parent_val_dict)
return result
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
raise _('The read_group method is not implemented on this object !')
def _field_create(self, cr, context={}):
cr.execute("SELECT id FROM ir_model WHERE model=%s", (self._name,))
@@ -1899,6 +1796,48 @@ class orm(orm_template):
_table = None
_protected = ['read','write','create','default_get','perm_read','unlink','fields_get','fields_view_get','search','name_get','distinct_field_get','name_search','copy','import_data','search_count', 'exists']
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
context = context or {}
self.pool.get('ir.model.access').check(cr, uid, self._name, 'read', context=context)
if not fields:
fields = self._columns.keys()
(qu1, qu2, tables) = self._where_calc(cr, uid, domain, context=context)
dom = self.pool.get('ir.rule').domain_get(cr, uid, self._name, context=context)
qu1 = qu1 + dom[0]
qu2 = qu2 + dom[1]
for t in dom[2]:
if t not in tables:
tables.append(t)
if len(qu1):
qu1 = ' where '+string.join(qu1, ' and ')
else:
qu1 = ''
limit_str = limit and ' limit %d' % limit or ''
offset_str = offset and ' offset %d' % offset or ''
fget = self.fields_get(cr, uid, fields)
float_int_fields = filter(lambda x: fget[x]['type'] in ('float','integer'), fields)
sum = {}
flist = groupby
for f in float_int_fields:
if f not in ['id','sequence']:
flist += ',sum('+f+') as '+f
cr.execute('select min(id) as id,'+flist+' from ' + self._table +qu1+' group by '+ groupby + limit_str + offset_str,qu2)
alldata = {}
for r in cr.dictfetchall():
alldata[r['id']] = r
del r['id']
data = self.read(cr, uid, alldata.keys(), [groupby], context=context)
for d in data:
d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
del alldata[d['id']][groupby]
d.update(alldata[d['id']])
del d['id']
return data
def _parent_store_compute(self, cr):
logger = netsvc.Logger()
logger.notifyChannel('orm', netsvc.LOG_INFO, 'Computing parent left and right for table %s...' % (self._table, ))