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

Merge with #1477 trunk

Browse Source 
bzr revid: jean-baptiste.aubort@camptocamp.com-20080812132457-6m5vixgnxdaituok
This commit is contained in:
Jean-Baptiste Aubort
2008-08-12 15:24:57 +02:00
parent 818c730ed5 5bcd697627
commit 420d1eaffe
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_analysis/account_analytic_analysis.py
+4 -5
View File
@@ -30,7 +30,6 @@
##############################################################################
import operator
from osv import osv, fields
from osv.orm import ID_MAX
from tools.translate import _
@@ -525,8 +524,8 @@ class account_analytic_account_summary_user(osv.osv):
max_user = cr.fetchone()[0]
if len(fields_pre) :
fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
for i in range((len(ids) / ID_MAX) + ((len(ids) % ID_MAX) and 1 or 0)):
sub_ids = ids[ID_MAX * i:ID_MAX * (i + 1)]
for i in range(0, len(ids), cr.IN_MAX):
sub_ids = ids[i:i+cr.IN_MAX]
if d1:
cr.execute('select %s from \"%s\" where id in (%s) ' \
'and account_id in (%s) ' \
@@ -702,8 +701,8 @@ class account_analytic_account_summary_month(osv.osv):
res = []
if len(fields_pre) :
fields_pre2 = map(lambda x: (x in ('create_date', 'write_date')) and ('date_trunc(\'second\', '+x+') as '+x) or '"'+x+'"', fields_pre)
for i in range((len(ids) / ID_MAX) + ((len(ids) % ID_MAX) and 1 or 0)):
sub_ids = ids[ID_MAX * i:ID_MAX * (i + 1)]
for i in range(0, len(ids), cr.IN_MAX):
sub_ids = ids[i:i+cr.IN_MAX]
if d1:
cr.execute('select %s from \"%s\" where id in (%s) ' \
'and account_id in (%s) ' \
addons/board/board.py
+12 -9
View File
@@ -68,16 +68,14 @@ class board_board(osv.osv):
result = super(board_board, self).write(cr, uid, ids, vals, context)
cr.commit()
board = self.pool.get('board.board').read(cr, uid, ids)[0]
board = self.pool.get('board.board').browse(cr, uid, ids[0])
view = self.create_view(cr, uid, ids[0], context)
id = board['view_id'][0]
id = board.view_id.id
cr.execute("update ir_ui_view set arch='%s' where id=%d" % (view, id))
cr.commit()
#self.pool.get('ir.ui.view').write(cr, uid, [], view, {'tiny':'base'})
return result
def create(self, cr, user, vals, context=None):
@@ -91,15 +89,20 @@ class board_board(osv.osv):
'type': 'form',
'arch': self.create_view(cr, user, id, context),
})
self.pool.get('board.board').write(cr, user, [id], {'view_id':view_id})
vals['view_id'] = view_id
super(board_board, self).write(cr, user, [id], vals, context)
return id
def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
res = {}
vids = self.pool.get('ir.ui.view').search(cr, user, [('user_id','=',user), ('ref_id','=',view_id)])
res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
vids = self.pool.get('ir.ui.view.custom').search(cr, user, [('user_id','=',user), ('ref_id','=',view_id)])
if vids:
view_id = vids[0]
res = super(board_board, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id)
res['arch'] = arch.arch
res['toolbar'] = {'print':[],'action':[],'relate':[]}
return res
@@ -114,7 +117,7 @@ class board_line(osv.osv):
_name = 'board.board.line'
_order = 'position,sequence'
_columns = {
'name': fields.char('Board', size=64, required=True),
'name': fields.char('Title', size=64, required=True),
'sequence': fields.integer('Sequence'),
'height': fields.integer('Height'),
'width': fields.integer('Width'),