Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp/openobject-server/6.0-opw-6111-olt into lp:openobject-server/6.0

  1. 6.0-opw-6111-olt
  2. Merge into 6.0
Proposed by Olivier Laurent (Open ERP)
Status: Merged
Merged at revision: 3451
Proposed branch: lp:~openerp/openobject-server/6.0-opw-6111-olt
Merge into: lp:openobject-server/6.0
Diff against target: 58 lines (+8/-5)
2 files modified
bin/addons/base/base.sql (+1/-0)
bin/osv/orm.py (+7/-5)
To merge this branch: bzr merge lp:~openerp/openobject-server/6.0-opw-6111-olt
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+65179@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/base/base.sql'
2--- bin/addons/base/base.sql 2010-12-14 13:28:40 +0000
3+++ bin/addons/base/base.sql 2011-06-20 11:16:12 +0000
4@@ -45,6 +45,7 @@
5 view_load boolean,
6 relate boolean default False,
7 relation_field varchar(128),
8+ translate boolean default False,
9 primary key(id)
10 );
11
12
13=== modified file 'bin/osv/orm.py'
14--- bin/osv/orm.py 2011-05-25 13:26:12 +0000
15+++ bin/osv/orm.py 2011-06-20 11:16:12 +0000
16@@ -458,8 +458,10 @@
17 'readonly': (f.readonly and 1) or 0,
18 'required': (f.required and 1) or 0,
19 'selectable': (f.selectable and 1) or 0,
20+ 'translate': (f.translate and 1) or 0,
21 'relation_field': (f._type=='one2many' and isinstance(f, fields.one2many)) and f._fields_id or '',
22 }
23+
24 # When its a custom field,it does not contain f.select
25 if context.get('field_state', 'base') == 'manual':
26 if context.get('field_name', '') == k:
27@@ -474,13 +476,13 @@
28 vals['id'] = id
29 cr.execute("""INSERT INTO ir_model_fields (
30 id, model_id, model, name, field_description, ttype,
31- relation,view_load,state,select_level,relation_field
32+ relation,view_load,state,select_level,relation_field, translate
33 ) VALUES (
34- %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
35+ %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s
36 )""", (
37 id, vals['model_id'], vals['model'], vals['name'], vals['field_description'], vals['ttype'],
38 vals['relation'], bool(vals['view_load']), 'base',
39- vals['select_level'], vals['relation_field']
40+ vals['select_level'], vals['relation_field'], bool(vals['translate'])
41 ))
42 if 'module' in context:
43 name1 = 'field_' + self._table + '_' + k
44@@ -497,12 +499,12 @@
45 cr.commit()
46 cr.execute("""UPDATE ir_model_fields SET
47 model_id=%s, field_description=%s, ttype=%s, relation=%s,
48- view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s
49+ view_load=%s, select_level=%s, readonly=%s ,required=%s, selectable=%s, relation_field=%s, translate=%s
50 WHERE
51 model=%s AND name=%s""", (
52 vals['model_id'], vals['field_description'], vals['ttype'],
53 vals['relation'], bool(vals['view_load']),
54- vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], vals['model'], vals['name']
55+ vals['select_level'], bool(vals['readonly']), bool(vals['required']), bool(vals['selectable']), vals['relation_field'], bool(vals['translate']), vals['model'], vals['name']
56 ))
57 break
58 cr.commit()