1
=== modified file 'doc/03_module_dev_02.rst'
2
--- doc/03_module_dev_02.rst	2013-06-19 09:13:32 +0000
3
+++ doc/03_module_dev_02.rst	2014-01-22 16:19:54 +0000
4
@@ -615,6 +615,7 @@
5
615
  	  reference. :guilabel:`relation` is the table to look up that
615
  	  reference. :guilabel:`relation` is the table to look up that
6
616
  	  reference in.
616
  	  reference in.
7
617
617
8
618
.. _fields-functional:
9
618
619
10
619
Functional Fields
620
Functional Fields
11
620
+++++++++++++++++
621
+++++++++++++++++
12
621
622
13
=== modified file 'doc/03_module_dev_03.rst'
14
--- doc/03_module_dev_03.rst	2013-09-04 12:58:42 +0000
15
+++ doc/03_module_dev_03.rst	2014-01-22 16:19:54 +0000
16
@@ -70,15 +70,21 @@
17
70
On Change
70
On Change
18
71
+++++++++
71
+++++++++
19
72
72
21
73
The on_change attribute defines a method that is called when the content of a view field has changed.
73
The on_change attribute defines a method that is called when the
22
74
content of a view field has changed.
23
74
75
25
75
This method takes at least arguments: cr, uid, ids, which are the three classical arguments and also the context dictionary. You can add parameters to the method. They must correspond to other fields defined in the view, and must also be defined in the XML with fields defined this way::
76
This method takes at least arguments: cr, uid, ids, which are the
26
77
three classical arguments and also the context dictionary. You can add
27
78
parameters to the method. They must correspond to other fields defined
28
79
in the view, and must also be defined in the XML with fields defined
29
80
this way::
30
76
81
31
77
        <field name="name_of_field" on_change="name_of_method(other_field'_1_', ..., other_field'_n_')"/> 
82
        <field name="name_of_field" on_change="name_of_method(other_field'_1_', ..., other_field'_n_')"/> 
32
78
83
33
79
The example below is from the sale order view.
84
The example below is from the sale order view.
34
80
85
36
81
You can use the 'context' keyword to access data in the context that can be used as params of the function.::
86
You can use the 'context' keyword to access data in the context that
37
87
can be used as params of the function.::
38
82
88
39
83
        <field name="shop_id" on_change="onchange_shop_id(shop_id)"/>
89
        <field name="shop_id" on_change="onchange_shop_id(shop_id)"/>
40
84
90
41
@@ -100,7 +106,10 @@
42
100
            return {'value':v} 
106
            return {'value':v} 
43
101
107
44
102
108
46
103
When editing the shop_id form field, the onchange_shop_id method of the sale_order object is called and returns a dictionary where the 'value' key contains a dictionary of the new value to use in the 'project_id', 'pricelist_id' and 'payment_default_id' fields.
109
When editing the shop_id form field, the onchange_shop_id method of
47
110
the sale_order object is called and returns a dictionary where the
48
111
'value' key contains a dictionary of the new value to use in the
49
112
'project_id', 'pricelist_id' and 'payment_default_id' fields.
50
104
113
51
105
Note that it is possible to change more than just the values of
114
Note that it is possible to change more than just the values of
52
106
fields. For example, it is possible to change the value of some fields
115
fields. For example, it is possible to change the value of some fields
53
107
116
54
=== modified file 'doc/api_models.rst'
55
--- doc/api_models.rst	2012-11-11 02:10:22 +0000
56
+++ doc/api_models.rst	2014-01-22 16:19:54 +0000
57
@@ -1,7 +1,21 @@
58
1
1
61
2
ORM and models
2
ORM and Models
62
3
--------------
3
==============
63
4
4
64
5
.. automodule:: openerp.osv.orm
5
.. automodule:: openerp.osv.orm
65
6
   :members:
6
   :members:
66
7
   :undoc-members:
7
   :undoc-members:
67
8
68
9
Scope Management
69
10
================
70
11
71
12
.. automodule:: openerp.osv.scope
72
13
   :members:
73
14
   :undoc-members:
74
15
75
16
API Decorators
76
17
==============
77
18
78
19
.. automodule:: openerp.osv.api
79
20
   :members:
80
21
   :undoc-members:
81
8
22
82
=== modified file 'doc/index.rst'
83
--- doc/index.rst	2013-07-31 15:16:36 +0000
84
+++ doc/index.rst	2014-01-22 16:19:54 +0000
85
@@ -38,9 +38,10 @@
86
38
.. toctree::
38
.. toctree::
87
39
   :maxdepth: 1
39
   :maxdepth: 1
88
40
40
92
41
   orm-methods.rst
41
   new_api
93
42
   api_models.rst
42
   orm-methods
94
43
   routing.rst
43
   api_models
95
44
   routing
96
44
45
97
45
Changelog
46
Changelog
98
46
'''''''''
47
'''''''''
99
47
48
100
=== added file 'doc/new_api.rst'
101
--- doc/new_api.rst	1970-01-01 00:00:00 +0000
102
+++ doc/new_api.rst	2014-01-22 16:19:54 +0000
103
@@ -0,0 +1,138 @@
104
1
==================
105
2
High-level ORM API
106
3
==================
107
4
108
5
.. _compute:
109
6
110
7
Computed fields: defaults and function fields
111
8
=============================================
112
9
113
10
The high-level API attempts to unify concepts of programmatic value generation
114
11
for function fields (stored or not) and default values through the use of
115
12
computed fields.
116
13
117
14
Fields are marked as computed by setting their ``compute`` attribute to the
118
15
name of the method used to compute then::
119
16
120
17
    has_sibling = fields.Integer(compute='compute_has_sibling')
121
18
122
19
by default computation methods behave as simple defaults in case no
123
20
corresponding value is found in the database::
124
21
125
22
    def default_number_of_employees(self):
126
23
        self.number_of_employees = 1
127
24
128
25
.. todo::
129
26
130
27
    literal defaults::
131
28
132
29
        has_sibling = fields.Integer(compute=fields.default(1))
133
30
134
31
but they can also be used for computed fields by specifying fields used for
135
32
the computation. The dependencies can be dotted for "cascading" through
136
33
related models::
137
34
138
35
    @api.depends('parent_id.children_count')
139
36
    def compute_has_sibling(self):
140
37
        self.has_sibling = self.parent_id.children_count >= 2
141
38
142
39
.. todo::
143
40
144
41
    function-based::
145
42
146
43
        has_sibling = fields.Integer()
147
44
        @has_sibling.computer
148
45
        @api.depends('parent_id.children_count')
149
46
        def compute_has_sibling(self):
150
47
            self.has_sibling = self.parent_id.children_count >= 2
151
48
152
49
note that computation methods (defaults or others) do not *return* a value,
153
50
they *set*  values the current object. This means the high-level API does not
154
51
need :ref:`an explicit multi <fields-functional>`: a ``multi`` method is
155
52
simply one which computes several values at once::
156
53
157
54
    @api.depends('company_id')
158
55
    def compute_relations(self):
159
56
        self.computed_company = self.company_id
160
57
        self.computed_companies = self.company_id.to_recordset()
161
58
162
59
Automatic onchange
163
60
==================
164
61
165
62
Using to the improved and expanded :ref:`computed fields <compute>`, the
166
63
high-level ORM API is able to infer the effect of fields on
167
64
one another, and thus automatically provide a basic form of onchange without
168
65
having to implement it by hand, or implement dozens of onchange functions to
169
66
get everything right.
170
67
171
68
172
69
173
70
174
71
.. todo::
175
72
176
73
    deferred records::
177
74
178
75
        partner = Partner.record(42, defer=True)
179
76
        partner.name = "foo"
180
77
        partner.user_id = juan
181
78
        partner.save() # only saved to db here
182
79
183
80
        with scope.defer():
184
81
            # all records in this scope or children scopes are deferred
185
82
            #   until corresponding scope poped or until *this* scope poped?
186
83
            partner = Partner.record(42)
187
84
            partner.name = "foo"
188
85
            partner.user_id = juan
189
86
        # saved here, also for recordset &al, ~transaction
190
87
191
88
        # temp deferment, maybe simpler? Or for bulk operations?:
192
89
        with Partner.record(42) as partner:
193
90
            partner.name = "foo"
194
91
            partner.user_id = juan
195
92
196
93
    ``id = False`` => always defered? null v draft?
197
94
198
95
.. todo:: keyword arguments passed positionally (common for context, completely breaks everything)
199
96
200
97
.. todo:: optional arguments (report_aged_receivable)
201
98
202
99
.. todo:: non-id ids? (mail thread_id)
203
100
204
101
.. todo:: partial signatures on overrides (e.g. message_post)
205
102
206
103
.. todo::
207
104
208
105
    ::
209
106
210
107
        field = fields.Char()
211
108
212
109
        @field.computer
213
110
        def foo(self):
214
111
            "compute foo here"
215
112
216
113
    ~
217
114
218
115
    ::
219
116
220
117
        field = fields.Char(compute='foo')
221
118
222
119
        def foo(self):
223
120
            "compute foo here"
224
121
225
122
.. todo:: doc
226
123
227
124
.. todo:: incorrect dependency spec?
228
125
229
126
.. todo:: dynamic dependencies?
230
127
231
128
    ::
232
129
233
130
        @api.depends(???)
234
131
        def foo(self)
235
132
            self.a = self[self.b]
236
133
237
134
.. todo:: recursive onchange
238
135
239
136
    Country & state. Change country -> remove state; set state -> set country
240
137
241
138
.. todo:: onchange list affected?
242
0
139
243
=== modified file 'openerp/__init__.py'
244
--- openerp/__init__.py	2013-09-09 23:19:46 +0000
245
+++ openerp/__init__.py	2014-01-22 16:19:54 +0000
246
@@ -58,6 +58,21 @@
247
58
import sql_db
58
import sql_db
248
59
import tools
59
import tools
249
60
import workflow
60
import workflow
250
61
251
62
# model classes
252
63
from openerp.osv.orm import BaseModel, AbstractModel, Model, TransientModel
253
64
254
65
# field classes
255
66
from openerp.osv import fields2 as fields
256
67
257
68
# api module and decorators
258
69
from openerp.osv import api
259
70
from openerp.osv.api import model, multi, one, constrains, depends, returns
260
71
261
72
# scope proxy
262
73
from openerp.osv.scope import proxy as scope
263
74
264
75
265
61
# backward compatilbility
76
# backward compatilbility
266
62
# TODO: This is for the web addons, can be removed later.
77
# TODO: This is for the web addons, can be removed later.
267
63
wsgi = service
78
wsgi = service
268
64
79
269
=== modified file 'openerp/addons/base/__openerp__.py'
270
--- openerp/addons/base/__openerp__.py	2013-10-06 15:18:27 +0000
271
+++ openerp/addons/base/__openerp__.py	2014-01-22 16:19:54 +0000
272
@@ -39,7 +39,6 @@
273
39
        'res/res_country_data.xml',
39
        'res/res_country_data.xml',
274
40
        'security/base_security.xml',
40
        'security/base_security.xml',
275
41
        'base_menu.xml',
41
        'base_menu.xml',
276
42
        'res/res_security.xml',
277
43
        'res/res_config.xml',
42
        'res/res_config.xml',
278
44
        'res/res.country.state.csv',
43
        'res/res.country.state.csv',
279
45
        'ir/ir_actions.xml',
44
        'ir/ir_actions.xml',
280
@@ -81,7 +80,7 @@
281
81
        'res/res_users_view.xml',
80
        'res/res_users_view.xml',
282
82
        'res/res_partner_data.xml',
81
        'res/res_partner_data.xml',
283
83
        'res/ir_property_view.xml',
82
        'res/ir_property_view.xml',
285
84
        'security/base_security.xml',
83
        'res/res_security.xml',
286
85
        'security/ir.model.access.csv',
84
        'security/ir.model.access.csv',
287
86
    ],
85
    ],
288
87
    'demo': [
86
    'demo': [
289
88
87
290
=== modified file 'openerp/addons/base/base.sql'
291
--- openerp/addons/base/base.sql	2013-11-08 13:02:08 +0000
292
+++ openerp/addons/base/base.sql	2014-01-22 16:19:54 +0000
293
@@ -124,16 +124,6 @@
294
124
    primary key(id)
124
    primary key(id)
295
125
);
125
);
296
126
126
297
127
CREATE TABLE ir_ui_menu (
298
128
    id serial NOT NULL,
299
129
    parent_id int references ir_ui_menu on delete set null,
300
130
    name varchar(64) DEFAULT ''::varchar NOT NULL,
301
131
    icon varchar(64) DEFAULT ''::varchar,
302
132
    primary key (id)
303
133
);
304
134
305
135
select setval('ir_ui_menu_id_seq', 2);
306
136
307
137
---------------------------------
127
---------------------------------
308
138
-- Res users
128
-- Res users
309
139
---------------------------------
129
---------------------------------
310
@@ -171,7 +161,6 @@
311
171
create index res_groups_users_rel_uid_idx on res_groups_users_rel (uid);
161
create index res_groups_users_rel_uid_idx on res_groups_users_rel (uid);
312
172
create index res_groups_users_rel_gid_idx on res_groups_users_rel (gid);
162
create index res_groups_users_rel_gid_idx on res_groups_users_rel (gid);
313
173
163
314
174
315
175
---------------------------------
164
---------------------------------
316
176
-- Workflows
165
-- Workflows
317
177
---------------------------------
166
---------------------------------
318
@@ -264,10 +253,6 @@
319
264
253
320
265
CREATE TABLE ir_module_category (
254
CREATE TABLE ir_module_category (
321
266
    id serial NOT NULL,
255
    id serial NOT NULL,
322
267
    create_uid integer references res_users on delete set null,
323
268
    create_date timestamp without time zone,
324
269
    write_date timestamp without time zone,
325
270
    write_uid integer references res_users on delete set null,
326
271
    parent_id integer REFERENCES ir_module_category ON DELETE SET NULL,
256
    parent_id integer REFERENCES ir_module_category ON DELETE SET NULL,
327
272
    name character varying(128) NOT NULL,
257
    name character varying(128) NOT NULL,
328
273
    primary key(id)
258
    primary key(id)
329
@@ -276,10 +261,6 @@
330
276
261
331
277
CREATE TABLE ir_module_module (
262
CREATE TABLE ir_module_module (
332
278
    id serial NOT NULL,
263
    id serial NOT NULL,
333
279
    create_uid integer references res_users on delete set null,
334
280
    create_date timestamp without time zone,
335
281
    write_date timestamp without time zone,
336
282
    write_uid integer references res_users on delete set null,
337
283
    website character varying(256),
264
    website character varying(256),
338
284
    summary character varying(256),
265
    summary character varying(256),
339
285
    name character varying(128) NOT NULL,
266
    name character varying(128) NOT NULL,
340
@@ -304,10 +285,6 @@
341
304
285
342
305
CREATE TABLE ir_module_module_dependency (
286
CREATE TABLE ir_module_module_dependency (
343
306
    id serial NOT NULL,
287
    id serial NOT NULL,
344
307
    create_uid integer references res_users on delete set null,
345
308
    create_date timestamp without time zone,
346
309
    write_date timestamp without time zone,
347
310
    write_uid integer references res_users on delete set null,
348
311
    name character varying(128),
288
    name character varying(128),
349
312
    version_pattern character varying(128) default NULL,
289
    version_pattern character varying(128) default NULL,
350
313
    module_id integer REFERENCES ir_module_module ON DELETE cascade,
290
    module_id integer REFERENCES ir_module_module ON DELETE cascade,
351
@@ -345,10 +322,6 @@
352
345
322
353
346
CREATE TABLE ir_model_data (
323
CREATE TABLE ir_model_data (
354
347
    id serial NOT NULL,
324
    id serial NOT NULL,
355
348
    create_uid integer,
356
349
    create_date timestamp without time zone,
357
350
    write_date timestamp without time zone,
358
351
    write_uid integer,
359
352
    noupdate boolean,
325
    noupdate boolean,
360
353
    name varchar NOT NULL,
326
    name varchar NOT NULL,
361
354
    date_init timestamp without time zone,
327
    date_init timestamp without time zone,
362
@@ -364,10 +337,6 @@
363
364
--   - for a constraint: type is 'u' (this is the convention PostgreSQL uses).
337
--   - for a constraint: type is 'u' (this is the convention PostgreSQL uses).
364
365
CREATE TABLE ir_model_constraint (
338
CREATE TABLE ir_model_constraint (
365
366
    id serial NOT NULL,
339
    id serial NOT NULL,
366
367
    create_uid integer,
367
368
    create_date timestamp without time zone,
368
369
    write_date timestamp without time zone,
369
370
    write_uid integer,
370
371
    date_init timestamp without time zone,
340
    date_init timestamp without time zone,
371
372
    date_update timestamp without time zone,
341
    date_update timestamp without time zone,
372
373
    module integer NOT NULL references ir_module_module on delete restrict,
342
    module integer NOT NULL references ir_module_module on delete restrict,
373
@@ -380,10 +349,6 @@
374
380
-- (so they can be removed when the module is uninstalled).
349
-- (so they can be removed when the module is uninstalled).
375
381
CREATE TABLE ir_model_relation (
350
CREATE TABLE ir_model_relation (
376
382
    id serial NOT NULL,
351
    id serial NOT NULL,
377
383
    create_uid integer,
378
384
    create_date timestamp without time zone,
379
385
    write_date timestamp without time zone,
380
386
    write_uid integer,
381
387
    date_init timestamp without time zone,
352
    date_init timestamp without time zone,
382
388
    date_update timestamp without time zone,
353
    date_update timestamp without time zone,
383
389
    module integer NOT NULL references ir_module_module on delete restrict,
354
    module integer NOT NULL references ir_module_module on delete restrict,
384
@@ -409,4 +374,4 @@
385
409
select setval('res_company_id_seq', 2);
374
select setval('res_company_id_seq', 2);
386
410
select setval('res_users_id_seq', 2);
375
select setval('res_users_id_seq', 2);
387
411
select setval('res_partner_id_seq', 2);
376
select setval('res_partner_id_seq', 2);
388
412
select setval('res_currency_id_seq', 2);
389
413
\ No newline at end of file
377
\ No newline at end of file
390
378
select setval('res_currency_id_seq', 2);
391
414
379
392
=== modified file 'openerp/addons/base/base_menu.xml'
393
--- openerp/addons/base/base_menu.xml	2013-10-06 11:26:08 +0000
394
+++ openerp/addons/base/base_menu.xml	2014-01-22 16:19:54 +0000
395
@@ -28,6 +28,10 @@
396
28
                <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
28
                <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
397
29
                <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
29
                <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
398
30
30
399
31
        <record model="ir.ui.menu" id="base.menu_administration">
400
32
            <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
401
33
        </record>
402
34
403
31
        <record id="action_client_base_menu" model="ir.actions.client">
35
        <record id="action_client_base_menu" model="ir.actions.client">
404
32
            <field name="name">Open Settings Menu</field>
36
            <field name="name">Open Settings Menu</field>
405
33
            <field name="tag">reload</field>
37
            <field name="tag">reload</field>
406
34
38
407
=== modified file 'openerp/addons/base/ir/ir_actions.py'
408
--- openerp/addons/base/ir/ir_actions.py	2014-01-15 20:53:57 +0000
409
+++ openerp/addons/base/ir/ir_actions.py	2014-01-22 16:19:54 +0000
410
@@ -324,7 +324,7 @@
411
324
        dataobj = self.pool.get('ir.model.data')
324
        dataobj = self.pool.get('ir.model.data')
412
325
        data_id = dataobj._get_id (cr, SUPERUSER_ID, module, xml_id)
325
        data_id = dataobj._get_id (cr, SUPERUSER_ID, module, xml_id)
413
326
        res_id = dataobj.browse(cr, uid, data_id, context).res_id
326
        res_id = dataobj.browse(cr, uid, data_id, context).res_id
415
327
        return self.read(cr, uid, res_id, [], context)
327
        return self.read(cr, uid, [res_id], [], context)[0]
416
328
328
417
329
VIEW_TYPES = [
329
VIEW_TYPES = [
418
330
    ('tree', 'Tree'),
330
    ('tree', 'Tree'),
419
@@ -544,7 +544,7 @@
420
544
        'sequence': 5,
544
        'sequence': 5,
421
545
        'code': """# You can use the following variables:
545
        'code': """# You can use the following variables:
422
546
#  - self: ORM model of the record on which the action is triggered
546
#  - self: ORM model of the record on which the action is triggered
424
547
#  - object: browse_record of the record on which the action is triggered if there is one, otherwise None
547
#  - object: Record on which the action is triggered if there is one, otherwise None
425
548
#  - pool: ORM model pool (i.e. self.pool)
548
#  - pool: ORM model pool (i.e. self.pool)
426
549
#  - cr: database cursor
549
#  - cr: database cursor
427
550
#  - uid: current user id
550
#  - uid: current user id
428
@@ -799,7 +799,7 @@
429
799
    def run_action_client_action(self, cr, uid, action, eval_context=None, context=None):
799
    def run_action_client_action(self, cr, uid, action, eval_context=None, context=None):
430
800
        if not action.action_id:
800
        if not action.action_id:
431
801
            raise osv.except_osv(_('Error'), _("Please specify an action to launch!"))
801
            raise osv.except_osv(_('Error'), _("Please specify an action to launch!"))
433
802
        return self.pool[action.action_id.type].read(cr, uid, action.action_id.id, context=context)
802
        return self.pool[action.action_id.type].read(cr, uid, [action.action_id.id], context=context)[0]
434
803
803
435
804
    def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
804
    def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
436
805
        eval(action.code.strip(), eval_context, mode="exec", nocopy=True)  # nocopy allows to return 'action'
805
        eval(action.code.strip(), eval_context, mode="exec", nocopy=True)  # nocopy allows to return 'action'
437
@@ -1038,10 +1038,10 @@
438
1038
            wizard.write({'state': 'done'})
1038
            wizard.write({'state': 'done'})
439
1039
1039
440
1040
        # Load action
1040
        # Load action
442
1041
        act_type = self.pool.get('ir.actions.actions').read(cr, uid, wizard.action_id.id, ['type'], context=context)
1041
        act_type = wizard.action_id.type
443
1042
1042
446
1043
        res = self.pool[act_type['type']].read(cr, uid, wizard.action_id.id, [], context=context)
1043
        res = self.pool[act_type].read(cr, uid, [wizard.action_id.id], [], context=context)[0]
447
1044
        if act_type['type'] != 'ir.actions.act_window':
1044
        if act_type != 'ir.actions.act_window':
448
1045
            return res
1045
            return res
449
1046
        res.setdefault('context','{}')
1046
        res.setdefault('context','{}')
450
1047
        res['nodestroy'] = True
1047
        res['nodestroy'] = True
451
1048
1048
452
=== modified file 'openerp/addons/base/ir/ir_attachment.py'
453
--- openerp/addons/base/ir/ir_attachment.py	2014-01-07 14:15:24 +0000
454
+++ openerp/addons/base/ir/ir_attachment.py	2014-01-22 16:19:54 +0000
455
@@ -242,7 +242,7 @@
456
242
        # performed in batch as much as possible.
242
        # performed in batch as much as possible.
457
243
        ima = self.pool.get('ir.model.access')
243
        ima = self.pool.get('ir.model.access')
458
244
        for model, targets in model_attachments.iteritems():
244
        for model, targets in model_attachments.iteritems():
460
245
            if not self.pool.get(model):
245
            if model not in self.pool:
461
246
                continue
246
                continue
462
247
            if not ima.check(cr, uid, model, 'read', False):
247
            if not ima.check(cr, uid, model, 'read', False):
463
248
                # remove all corresponding attachment ids
248
                # remove all corresponding attachment ids
464
@@ -266,7 +266,7 @@
465
266
        if isinstance(ids, (int, long)):
266
        if isinstance(ids, (int, long)):
466
267
            ids = [ids]
267
            ids = [ids]
467
268
        self.check(cr, uid, ids, 'read', context=context)
268
        self.check(cr, uid, ids, 'read', context=context)
469
269
        return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context, load)
269
        return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context=context, load=load)
470
270
270
471
271
    def write(self, cr, uid, ids, vals, context=None):
271
    def write(self, cr, uid, ids, vals, context=None):
472
272
        if isinstance(ids, (int, long)):
272
        if isinstance(ids, (int, long)):
473
273
273
474
=== modified file 'openerp/addons/base/ir/ir_cron.py'
475
--- openerp/addons/base/ir/ir_cron.py	2013-04-22 09:36:55 +0000
476
+++ openerp/addons/base/ir/ir_cron.py	2014-01-22 16:19:54 +0000
477
@@ -149,10 +149,10 @@
478
149
        except Exception, e:
149
        except Exception, e:
479
150
            self._handle_callback_exception(cr, uid, model_name, method_name, args, job_id, e)
150
            self._handle_callback_exception(cr, uid, model_name, method_name, args, job_id, e)
480
151
151
482
152
    def _process_job(self, job_cr, job, cron_cr):
152
    def _process_job(self, cr, job, cron_cr):
483
153
        """ Run a given job taking care of the repetition.
153
        """ Run a given job taking care of the repetition.
484
154
154
486
155
        :param job_cr: cursor to use to execute the job, safe to commit/rollback
155
        :param cr: cursor to use to execute the job, safe to commit/rollback
487
156
        :param job: job to be run (as a dictionary).
156
        :param job: job to be run (as a dictionary).
488
157
        :param cron_cr: cursor holding lock on the cron job row, to use to update the next exec date,
157
        :param cron_cr: cursor holding lock on the cron job row, to use to update the next exec date,
489
158
            must not be committed/rolled back!
158
            must not be committed/rolled back!
490
@@ -167,7 +167,7 @@
491
167
                if numbercall > 0:
167
                if numbercall > 0:
492
168
                    numbercall -= 1
168
                    numbercall -= 1
493
169
                if not ok or job['doall']:
169
                if not ok or job['doall']:
495
170
                    self._callback(job_cr, job['user_id'], job['model'], job['function'], job['args'], job['id'])
170
                    self._callback(cr, job['user_id'], job['model'], job['function'], job['args'], job['id'])
496
171
                if numbercall:
171
                if numbercall:
497
172
                    nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
172
                    nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
498
173
                ok = True
173
                ok = True
499
@@ -176,9 +176,10 @@
500
176
                addsql = ', active=False'
176
                addsql = ', active=False'
501
177
            cron_cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
177
            cron_cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
502
178
                       (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
178
                       (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
503
179
            self.invalidate_cache(['nextcall', 'numbercall', 'active'], [job['id']])
504
179
180
505
180
        finally:
181
        finally:
507
181
            job_cr.commit()
182
            cr.commit()
508
182
            cron_cr.commit()
183
            cron_cr.commit()
509
183
184
510
184
    @classmethod
185
    @classmethod
511
185
186
512
=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
513
--- openerp/addons/base/ir/ir_mail_server.py	2013-11-23 11:30:53 +0000
514
+++ openerp/addons/base/ir/ir_mail_server.py	2014-01-22 16:19:54 +0000
515
@@ -461,21 +461,18 @@
516
461
                mdir.add(message.as_string(True))
461
                mdir.add(message.as_string(True))
517
462
                return message_id
462
                return message_id
518
463
463
519
464
            smtp = None
520
464
            try:
465
            try:
521
465
                smtp = self.connect(smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption or False, smtp_debug)
466
                smtp = self.connect(smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption or False, smtp_debug)
522
466
                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
467
                smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
523
467
            finally:
468
            finally:
526
468
                try:
469
                if smtp is not None:
525
469
                    # Close Connection of SMTP Server
527
470
                    smtp.quit()
470
                    smtp.quit()
528
471
                except Exception:
529
472
                    # ignored, just a consequence of the previous exception
530
473
                    pass
531
474
        except Exception, e:
471
        except Exception, e:
532
475
            msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % (tools.ustr(smtp_server),
472
            msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % (tools.ustr(smtp_server),
533
476
                                                                             e.__class__.__name__,
473
                                                                             e.__class__.__name__,
534
477
                                                                             tools.ustr(e))
474
                                                                             tools.ustr(e))
536
478
            _logger.exception(msg)
475
            _logger.error(msg)
537
479
            raise MailDeliveryException(_("Mail Delivery Failed"), msg)
476
            raise MailDeliveryException(_("Mail Delivery Failed"), msg)
538
480
        return message_id
477
        return message_id
539
481
478
540
482
479
541
=== modified file 'openerp/addons/base/ir/ir_model.py'
542
--- openerp/addons/base/ir/ir_model.py	2013-11-27 11:07:57 +0000
543
+++ openerp/addons/base/ir/ir_model.py	2014-01-22 16:19:54 +0000
544
@@ -28,12 +28,12 @@
545
28
import openerp.modules.registry
28
import openerp.modules.registry
546
29
from openerp import SUPERUSER_ID
29
from openerp import SUPERUSER_ID
547
30
from openerp import tools
30
from openerp import tools
550
31
from openerp.osv import fields,osv
31
from openerp.osv import fields, osv
551
32
from openerp.osv.orm import Model
32
from openerp.osv.orm import BaseModel, Model, except_orm
552
33
from openerp.osv.scope import proxy as scope
553
34
from openerp.tools import config
554
33
from openerp.tools.safe_eval import safe_eval as eval
35
from openerp.tools.safe_eval import safe_eval as eval
555
34
from openerp.tools import config
556
35
from openerp.tools.translate import _
36
from openerp.tools.translate import _
557
36
from openerp.osv.orm import except_orm, browse_record
558
37
37
559
38
_logger = logging.getLogger(__name__)
38
_logger = logging.getLogger(__name__)
560
39
39
561
@@ -133,15 +133,10 @@
562
133
        ('obj_name_uniq', 'unique (model)', 'Each model must be unique!'),
133
        ('obj_name_uniq', 'unique (model)', 'Each model must be unique!'),
563
134
    ]
134
    ]
564
135
135
574
136
    # overridden to allow searching both on model name (model field)
136
    def _search_display_name(self, operator, value):
575
137
    # and model description (name field)
137
        # overridden to allow searching both on model name (model field) and
576
138
    def _name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None):
138
        # model description (name field)
577
139
        if args is None:
139
        return ['|', ('model', operator, value), ('name', operator, value)]
569
140
            args = []
570
141
        domain = args + ['|', ('model', operator, name), ('name', operator, name)]
571
142
        return self.name_get(cr, name_get_uid or uid,
572
143
                             super(ir_model, self).search(cr, uid, domain, limit=limit, context=context),
573
144
                             context=context)
578
145
140
579
146
    def _drop_table(self, cr, uid, ids, context=None):
141
    def _drop_table(self, cr, uid, ids, context=None):
580
147
        for model in self.browse(cr, uid, ids, context):
142
        for model in self.browse(cr, uid, ids, context):
581
@@ -207,7 +202,8 @@
582
207
            _custom = True
202
            _custom = True
583
208
        x_custom_model._name = model
203
        x_custom_model._name = model
584
209
        x_custom_model._module = False
204
        x_custom_model._module = False
586
210
        a = x_custom_model.create_instance(self.pool, cr)
205
        with scope(cr, SUPERUSER_ID, None):
587
206
            a = x_custom_model._build_model(self.pool, cr)
588
211
        if not a._columns:
207
        if not a._columns:
589
212
            x_name = 'id'
208
            x_name = 'id'
590
213
        elif 'x_name' in a._columns.keys():
209
        elif 'x_name' in a._columns.keys():
591
@@ -625,8 +621,8 @@
592
625
        """ Check if a specific group has the access mode to the specified model"""
621
        """ Check if a specific group has the access mode to the specified model"""
593
626
        assert mode in ['read','write','create','unlink'], 'Invalid access mode'
622
        assert mode in ['read','write','create','unlink'], 'Invalid access mode'
594
627
623
597
628
        if isinstance(model, browse_record):
624
        if isinstance(model, BaseModel):
598
629
            assert model._table_name == 'ir.model', 'Invalid model object'
625
            assert model._name == 'ir.model', 'Invalid model object'
599
630
            model_name = model.name
626
            model_name = model.name
600
631
        else:
627
        else:
601
632
            model_name = model
628
            model_name = model
602
@@ -684,8 +680,8 @@
603
684
680
604
685
        assert mode in ['read','write','create','unlink'], 'Invalid access mode'
681
        assert mode in ['read','write','create','unlink'], 'Invalid access mode'
605
686
682
608
687
        if isinstance(model, browse_record):
683
        if isinstance(model, BaseModel):
609
688
            assert model._table_name == 'ir.model', 'Invalid model object'
684
            assert model._name == 'ir.model', 'Invalid model object'
610
689
            model_name = model.model
685
            model_name = model.model
611
690
        else:
686
        else:
612
691
            model_name = model
687
            model_name = model
613
@@ -753,6 +749,7 @@
614
753
            pass
749
            pass
615
754
750
616
755
    def call_cache_clearing_methods(self, cr):
751
    def call_cache_clearing_methods(self, cr):
617
752
        scope.invalidate_all()
618
756
        self.check.clear_cache(self)    # clear the cache of check function
753
        self.check.clear_cache(self)    # clear the cache of check function
619
757
        for model, method in self.__cache_clearing_methods:
754
        for model, method in self.__cache_clearing_methods:
620
758
            if model in self.pool:
755
            if model in self.pool:
621
@@ -761,19 +758,19 @@
622
761
    #
758
    #
623
762
    # Check rights on actions
759
    # Check rights on actions
624
763
    #
760
    #
638
764
    def write(self, cr, uid, *args, **argv):
761
    def write(self, cr, uid, ids, values, context=None):
639
765
        self.call_cache_clearing_methods(cr)
762
        self.call_cache_clearing_methods(cr)
640
766
        res = super(ir_model_access, self).write(cr, uid, *args, **argv)
763
        res = super(ir_model_access, self).write(cr, uid, ids, values, context=context)
641
767
        return res
764
        return res
642
768
765
643
769
    def create(self, cr, uid, *args, **argv):
766
    def create(self, cr, uid, values, context=None):
644
770
        self.call_cache_clearing_methods(cr)
767
        self.call_cache_clearing_methods(cr)
645
771
        res = super(ir_model_access, self).create(cr, uid, *args, **argv)
768
        res = super(ir_model_access, self).create(cr, uid, values, context=context)
646
772
        return res
769
        return res
647
773
770
648
774
    def unlink(self, cr, uid, *args, **argv):
771
    def unlink(self, cr, uid, ids, context=None):
649
775
        self.call_cache_clearing_methods(cr)
772
        self.call_cache_clearing_methods(cr)
650
776
        res = super(ir_model_access, self).unlink(cr, uid, *args, **argv)
773
        res = super(ir_model_access, self).unlink(cr, uid, ids, context=context)
651
777
        return res
774
        return res
652
778
775
653
779
class ir_model_data(osv.osv):
776
class ir_model_data(osv.osv):
654
@@ -829,8 +826,8 @@
655
829
        'date_init': fields.datetime('Init Date')
826
        'date_init': fields.datetime('Init Date')
656
830
    }
827
    }
657
831
    _defaults = {
828
    _defaults = {
660
832
        'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
829
        'date_init': fields.datetime.now,
661
833
        'date_update': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
830
        'date_update': fields.datetime.now,
662
834
        'noupdate': False,
831
        'noupdate': False,
663
835
        'module': ''
832
        'module': ''
664
836
    }
833
    }
665
@@ -840,12 +837,11 @@
666
840
837
667
841
    def __init__(self, pool, cr):
838
    def __init__(self, pool, cr):
668
842
        osv.osv.__init__(self, pool, cr)
839
        osv.osv.__init__(self, pool, cr)
669
843
        self.doinit = True
670
844
        # also stored in pool to avoid being discarded along with this osv instance
840
        # also stored in pool to avoid being discarded along with this osv instance
671
845
        if getattr(pool, 'model_data_reference_ids', None) is None:
841
        if getattr(pool, 'model_data_reference_ids', None) is None:
672
846
            self.pool.model_data_reference_ids = {}
842
            self.pool.model_data_reference_ids = {}
675
847
843
        # put loads on the class, in order to share it among all instances
676
848
        self.loads = self.pool.model_data_reference_ids
844
        type(self).loads = self.pool.model_data_reference_ids
677
849
845
678
850
    def _auto_init(self, cr, context=None):
846
    def _auto_init(self, cr, context=None):
679
851
        super(ir_model_data, self)._auto_init(cr, context)
847
        super(ir_model_data, self)._auto_init(cr, context)
680
@@ -867,7 +863,7 @@
681
867
        """Returns (model, res_id) corresponding to a given module and xml_id (cached) or raise ValueError if not found"""
863
        """Returns (model, res_id) corresponding to a given module and xml_id (cached) or raise ValueError if not found"""
682
868
        data_id = self._get_id(cr, uid, module, xml_id)
864
        data_id = self._get_id(cr, uid, module, xml_id)
683
869
        #assuming data_id is not False, as it was checked upstream
865
        #assuming data_id is not False, as it was checked upstream
685
870
        res = self.read(cr, uid, data_id, ['model', 'res_id'])
866
        res = self.read(cr, uid, [data_id], ['model', 'res_id'])[0]
686
871
        if not res['res_id']:
867
        if not res['res_id']:
687
872
            raise ValueError('No such external ID currently defined in the system: %s.%s' % (module, xml_id))
868
            raise ValueError('No such external ID currently defined in the system: %s.%s' % (module, xml_id))
688
873
        return res['model'], res['res_id']
869
        return res['model'], res['res_id']
689
@@ -925,8 +921,6 @@
690
925
        if xml_id and ('.' in xml_id):
921
        if xml_id and ('.' in xml_id):
691
926
            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % xml_id
922
            assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % xml_id
692
927
            module, xml_id = xml_id.split('.')
923
            module, xml_id = xml_id.split('.')
693
928
        if (not xml_id) and (not self.doinit):
694
929
            return False
695
930
        action_id = False
924
        action_id = False
696
931
        if xml_id:
925
        if xml_id:
697
932
            cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model
926
            cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model
698
@@ -996,8 +990,8 @@
699
996
        if xml_id and res_id:
990
        if xml_id and res_id:
700
997
            self.loads[(module, xml_id)] = (model, res_id)
991
            self.loads[(module, xml_id)] = (model, res_id)
701
998
            for table, inherit_field in model_obj._inherits.iteritems():
992
            for table, inherit_field in model_obj._inherits.iteritems():
704
999
                inherit_id = model_obj.read(cr, uid, res_id,
993
                inherit_id = model_obj.read(cr, uid, [res_id],
705
1000
                        [inherit_field])[inherit_field]
994
                        [inherit_field])[0][inherit_field]
706
1001
                self.loads[(module, xml_id + '_' + table.replace('.', '_'))] = (table, inherit_id)
995
                self.loads[(module, xml_id + '_' + table.replace('.', '_'))] = (table, inherit_id)
707
1002
        return res_id
996
        return res_id
708
1003
997
709
@@ -1020,11 +1014,12 @@
710
1020
1014
711
1021
        cr.execute('select * from ir_values where model=%s and key=%s and name=%s'+where,(model, key, name))
1015
        cr.execute('select * from ir_values where model=%s and key=%s and name=%s'+where,(model, key, name))
712
1022
        res = cr.fetchone()
1016
        res = cr.fetchone()
713
1017
        ir_values_obj = openerp.registry(cr.dbname)['ir.values']
714
1023
        if not res:
1018
        if not res:
715
1024
            ir_values_obj = openerp.registry(cr.dbname)['ir.values']
716
1025
            ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
1019
            ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
717
1026
        elif xml_id:
1020
        elif xml_id:
718
1027
            cr.execute('UPDATE ir_values set value=%s WHERE model=%s and key=%s and name=%s'+where,(value, model, key, name))
1021
            cr.execute('UPDATE ir_values set value=%s WHERE model=%s and key=%s and name=%s'+where,(value, model, key, name))
719
1022
            ir_values_obj.invalidate_cache(['value'])
720
1028
        return True
1023
        return True
721
1029
1024
722
1030
    def _module_data_uninstall(self, cr, uid, modules_to_remove, context=None):
1025
    def _module_data_uninstall(self, cr, uid, modules_to_remove, context=None):
723
@@ -1066,6 +1061,7 @@
724
1066
                cr.execute('select res_type,res_id from wkf_instance where id IN (select inst_id from wkf_workitem where act_id=%s)', (res_id,))
1061
                cr.execute('select res_type,res_id from wkf_instance where id IN (select inst_id from wkf_workitem where act_id=%s)', (res_id,))
725
1067
                wkf_todo.extend(cr.fetchall())
1062
                wkf_todo.extend(cr.fetchall())
726
1068
                cr.execute("update wkf_transition set condition='True', group_id=NULL, signal=NULL,act_to=act_from,act_from=%s where act_to=%s", (res_id,res_id))
1063
                cr.execute("update wkf_transition set condition='True', group_id=NULL, signal=NULL,act_to=act_from,act_from=%s where act_to=%s", (res_id,res_id))
727
1064
                self.pool.get('workflow.transition').invalidate_cache()
728
1069
1065
729
1070
        for model,res_id in wkf_todo:
1066
        for model,res_id in wkf_todo:
730
1071
            try:
1067
            try:
731
1072
1068
732
=== modified file 'openerp/addons/base/ir/ir_rule.py'
733
--- openerp/addons/base/ir/ir_rule.py	2013-03-29 14:07:23 +0000
734
+++ openerp/addons/base/ir/ir_rule.py	2014-01-22 16:19:54 +0000
735
@@ -78,7 +78,7 @@
736
78
        'global': fields.function(_get_value, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
78
        'global': fields.function(_get_value, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
737
79
        'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
79
        'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
738
80
        'domain_force': fields.text('Domain'),
80
        'domain_force': fields.text('Domain'),
740
81
        'domain': fields.function(_domain_force_get, string='Domain', type='text'),
81
        'domain': fields.function(_domain_force_get, string='Domain', type='binary'),
741
82
        'perm_read': fields.boolean('Apply for Read'),
82
        'perm_read': fields.boolean('Apply for Read'),
742
83
        'perm_write': fields.boolean('Apply for Write'),
83
        'perm_write': fields.boolean('Apply for Write'),
743
84
        'perm_create': fields.boolean('Apply for Create'),
84
        'perm_create': fields.boolean('Apply for Create'),
744
@@ -127,7 +127,7 @@
745
127
            group_domains = {}                  # map: group -> list of domains
127
            group_domains = {}                  # map: group -> list of domains
746
128
            for rule in self.browse(cr, SUPERUSER_ID, rule_ids):
128
            for rule in self.browse(cr, SUPERUSER_ID, rule_ids):
747
129
                # read 'domain' as UID to have the correct eval context for the rule.
129
                # read 'domain' as UID to have the correct eval context for the rule.
749
130
                rule_domain = self.read(cr, uid, rule.id, ['domain'])['domain']
130
                rule_domain = self.read(cr, uid, [rule.id], ['domain'])[0]['domain']
750
131
                dom = expression.normalize_domain(rule_domain)
131
                dom = expression.normalize_domain(rule_domain)
751
132
                for group in rule.groups:
132
                for group in rule.groups:
752
133
                    if group in user.groups_id:
133
                    if group in user.groups_id:
753
134
134
754
=== modified file 'openerp/addons/base/ir/ir_sequence.py'
755
--- openerp/addons/base/ir/ir_sequence.py	2013-08-23 09:56:35 +0000
756
+++ openerp/addons/base/ir/ir_sequence.py	2014-01-22 16:19:54 +0000
757
@@ -234,15 +234,15 @@
758
234
            'sec': time.strftime('%S', t),
234
            'sec': time.strftime('%S', t),
759
235
        }
235
        }
760
236
236
763
237
    def _next(self, cr, uid, seq_ids, context=None):
237
    def _next(self, cr, uid, ids, context=None):
764
238
        if not seq_ids:
238
        if not ids:
765
239
            return False
239
            return False
766
240
        if context is None:
240
        if context is None:
767
241
            context = {}
241
            context = {}
768
242
        force_company = context.get('force_company')
242
        force_company = context.get('force_company')
769
243
        if not force_company:
243
        if not force_company:
770
244
            force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
244
            force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
772
245
        sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
245
        sequences = self.read(cr, uid, ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
773
246
        preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
246
        preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
774
247
        seq = preferred_sequences[0] if preferred_sequences else sequences[0]
247
        seq = preferred_sequences[0] if preferred_sequences else sequences[0]
775
248
        if seq['implementation'] == 'standard':
248
        if seq['implementation'] == 'standard':
776
@@ -251,6 +251,7 @@
777
251
        else:
251
        else:
778
252
            cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
252
            cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
779
253
            cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
253
            cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
780
254
            self.invalidate_cache(['number_next'], [seq['id']])
781
254
        d = self._interpolation_dict()
255
        d = self._interpolation_dict()
782
255
        try:
256
        try:
783
256
            interpolated_prefix = self._interpolate(seq['prefix'], d)
257
            interpolated_prefix = self._interpolate(seq['prefix'], d)
784
257
258
785
=== modified file 'openerp/addons/base/ir/ir_translation.py'
786
--- openerp/addons/base/ir/ir_translation.py	2014-01-15 20:53:57 +0000
787
+++ openerp/addons/base/ir/ir_translation.py	2014-01-22 16:19:54 +0000
788
@@ -168,11 +168,11 @@
789
168
            else:
168
            else:
790
169
                model_name, field = record.name.split(',')
169
                model_name, field = record.name.split(',')
791
170
                model = self.pool.get(model_name)
170
                model = self.pool.get(model_name)
793
171
                if model and model.exists(cr, uid, record.res_id, context=context):
171
                if model is not None:
794
172
                    # Pass context without lang, need to read real stored field, not translation
172
                    # Pass context without lang, need to read real stored field, not translation
795
173
                    context_no_lang = dict(context, lang=None)
173
                    context_no_lang = dict(context, lang=None)
798
174
                    result = model.read(cr, uid, record.res_id, [field], context=context_no_lang)
174
                    result = model.read(cr, uid, [record.res_id], [field], context=context_no_lang)
799
175
                    res[record.id] = result[field] if result else False
175
                    res[record.id] = result[0][field] if result else False
800
176
        return res
176
        return res
801
177
177
802
178
    def _set_src(self, cr, uid, id, name, value, args, context=None):
178
    def _set_src(self, cr, uid, id, name, value, args, context=None):
803
179
179
804
=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
805
--- openerp/addons/base/ir/ir_ui_menu.py	2013-10-06 13:24:24 +0000
806
+++ openerp/addons/base/ir/ir_ui_menu.py	2014-01-22 16:19:54 +0000
807
@@ -36,46 +36,48 @@
808
36
    _name = 'ir.ui.menu'
36
    _name = 'ir.ui.menu'
809
37
37
810
38
    def __init__(self, *args, **kwargs):
38
    def __init__(self, *args, **kwargs):
813
39
        self.cache_lock = threading.RLock()
39
        cls = type(self)
814
40
        self._cache = {}
40
        cls._menu_cache_lock = threading.RLock()
815
41
        cls._menu_cache = {}
816
41
        super(ir_ui_menu, self).__init__(*args, **kwargs)
42
        super(ir_ui_menu, self).__init__(*args, **kwargs)
817
42
        self.pool.get('ir.model.access').register_cache_clearing_method(self._name, 'clear_cache')
43
        self.pool.get('ir.model.access').register_cache_clearing_method(self._name, 'clear_cache')
818
43
44
819
44
    def clear_cache(self):
45
    def clear_cache(self):
821
45
        with self.cache_lock:
46
        with self._menu_cache_lock:
822
46
            # radical but this doesn't frequently happen
47
            # radical but this doesn't frequently happen
824
47
            if self._cache:
48
            if self._menu_cache:
825
48
                # Normally this is done by openerp.tools.ormcache
49
                # Normally this is done by openerp.tools.ormcache
826
49
                # but since we do not use it, set it by ourself.
50
                # but since we do not use it, set it by ourself.
827
50
                self.pool._any_cache_cleared = True
51
                self.pool._any_cache_cleared = True
829
51
            self._cache = {}
52
            self._menu_cache.clear()
830
52
53
831
53
    def _filter_visible_menus(self, cr, uid, ids, context=None):
54
    def _filter_visible_menus(self, cr, uid, ids, context=None):
832
54
        """Filters the give menu ids to only keep the menu items that should be
55
        """Filters the give menu ids to only keep the menu items that should be
833
55
           visible in the menu hierarchy of the current user.
56
           visible in the menu hierarchy of the current user.
834
56
           Uses a cache for speeding up the computation.
57
           Uses a cache for speeding up the computation.
835
57
        """
58
        """
837
58
        with self.cache_lock:
59
        with self._menu_cache_lock:
838
59
            modelaccess = self.pool.get('ir.model.access')
60
            modelaccess = self.pool.get('ir.model.access')
840
60
            user_groups = set(self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['groups_id'])['groups_id'])
61
            user = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid)
841
62
            user_groups = set(user.groups_id.unbrowse())
842
61
            result = []
63
            result = []
843
62
            for menu in self.browse(cr, uid, ids, context=context):
64
            for menu in self.browse(cr, uid, ids, context=context):
844
63
                # this key works because user access rights are all based on user's groups (cfr ir_model_access.check)
65
                # this key works because user access rights are all based on user's groups (cfr ir_model_access.check)
845
64
                key = (cr.dbname, menu.id, tuple(user_groups))
66
                key = (cr.dbname, menu.id, tuple(user_groups))
848
65
                if key in self._cache:
67
                if key in self._menu_cache:
849
66
                    if self._cache[key]:
68
                    if self._menu_cache[key]:
850
67
                        result.append(menu.id)
69
                        result.append(menu.id)
851
68
                    #elif not menu.groups_id and not menu.action:
70
                    #elif not menu.groups_id and not menu.action:
852
69
                    #    result.append(menu.id)
71
                    #    result.append(menu.id)
853
70
                    continue
72
                    continue
854
71
73
856
72
                self._cache[key] = False
74
                self._menu_cache[key] = False
857
73
                if menu.groups_id:
75
                if menu.groups_id:
858
74
                    restrict_to_groups = [g.id for g in menu.groups_id]
76
                    restrict_to_groups = [g.id for g in menu.groups_id]
859
75
                    if not user_groups.intersection(restrict_to_groups):
77
                    if not user_groups.intersection(restrict_to_groups):
860
76
                        continue
78
                        continue
861
77
                    #result.append(menu.id)
79
                    #result.append(menu.id)
863
78
                    #self._cache[key] = True
80
                    #self._menu_cache[key] = True
864
79
                    #continue
81
                    #continue
865
80
82
866
81
                if menu.action:
83
                if menu.action:
867
@@ -99,7 +101,7 @@
868
99
                        continue
101
                        continue
869
100
102
870
101
                result.append(menu.id)
103
                result.append(menu.id)
872
102
                self._cache[key] = True
104
                self._menu_cache[key] = True
873
103
            return result
105
            return result
874
104
106
875
105
    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
107
    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
876
@@ -153,13 +155,13 @@
877
153
            parent_path = ''
155
            parent_path = ''
878
154
        return parent_path + elmt.name
156
        return parent_path + elmt.name
879
155
157
881
156
    def create(self, *args, **kwargs):
158
    def create(self, cr, uid, values, context=None):
882
157
        self.clear_cache()
159
        self.clear_cache()
884
158
        return super(ir_ui_menu, self).create(*args, **kwargs)
160
        return super(ir_ui_menu, self).create(cr, uid, values, context=context)
885
159
161
887
160
    def write(self, *args, **kwargs):
162
    def write(self, cr, uid, ids, values, context=None):
888
161
        self.clear_cache()
163
        self.clear_cache()
890
162
        return super(ir_ui_menu, self).write(*args, **kwargs)
164
        return super(ir_ui_menu, self).write(cr, uid, ids, values, context=context)
891
163
165
892
164
    def unlink(self, cr, uid, ids, context=None):
166
    def unlink(self, cr, uid, ids, context=None):
893
165
        # Detach children and promote them to top-level, because it would be unwise to
167
        # Detach children and promote them to top-level, because it would be unwise to
894
166
168
895
=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
896
--- openerp/addons/base/ir/ir_ui_view.py	2013-10-06 13:24:24 +0000
897
+++ openerp/addons/base/ir/ir_ui_view.py	2014-01-22 16:19:54 +0000
898
@@ -60,11 +60,8 @@
899
60
                result[record.id] = etree.fromstring(record.arch.encode('utf8')).tag
60
                result[record.id] = etree.fromstring(record.arch.encode('utf8')).tag
900
61
        return result
61
        return result
901
62
62
907
63
    _columns = {
63
    def _valid_view_types(self, cr, uid, context=None):
908
64
        'name': fields.char('View Name', required=True),
64
        return [
904
65
        'model': fields.char('Object', size=64, required=True, select=True),
905
66
        'priority': fields.integer('Sequence', required=True),
906
67
        'type': fields.function(_type_field, type='selection', selection=[
909
68
            ('tree','Tree'),
65
            ('tree','Tree'),
910
69
            ('form','Form'),
66
            ('form','Form'),
911
70
            ('mdx','mdx'),
67
            ('mdx','mdx'),
912
@@ -73,7 +70,16 @@
913
73
            ('diagram','Diagram'),
70
            ('diagram','Diagram'),
914
74
            ('gantt', 'Gantt'),
71
            ('gantt', 'Gantt'),
915
75
            ('kanban', 'Kanban'),
72
            ('kanban', 'Kanban'),
917
76
            ('search','Search')], string='View Type', required=True, select=True, store=True),
73
            ('search', 'Search'),
918
74
        ]
919
75
920
76
    _columns = {
921
77
        'name': fields.char('View Name', required=True),
922
78
        'model': fields.char('Object', size=64, required=True, select=True),
923
79
        'priority': fields.integer('Sequence', required=True),
924
80
        'type': fields.function(_type_field, type='selection',
925
81
            selection=lambda self, *args, **kwargs: self._valid_view_types(*args, **kwargs),
926
82
            string='View Type', required=True, select=True, store=True),
927
77
        'arch': fields.text('View Architecture', required=True),
83
        'arch': fields.text('View Architecture', required=True),
928
78
        'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
84
        'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
929
79
        'field_parent': fields.char('Child Field',size=64),
85
        'field_parent': fields.char('Child Field',size=64),
930
@@ -119,7 +125,7 @@
931
119
        """Verify that the given view's hierarchy is valid for rendering, along with all the changes applied by
125
        """Verify that the given view's hierarchy is valid for rendering, along with all the changes applied by
932
120
           its inherited views, by rendering it using ``fields_view_get()``.
126
           its inherited views, by rendering it using ``fields_view_get()``.
933
121
           
127
           
935
122
           @param browse_record view: view to validate
128
           @param Record view: view to validate
936
123
           @return: the rendered definition (arch) of the view, always utf-8 bytestring (legacy convention)
129
           @return: the rendered definition (arch) of the view, always utf-8 bytestring (legacy convention)
937
124
               if no error occurred, else False.  
130
               if no error occurred, else False.  
938
125
        """
131
        """
939
@@ -252,7 +258,7 @@
940
252
                                    _Destination_Field=node_key
258
                                    _Destination_Field=node_key
941
253
                                    flag = True
259
                                    flag = True
942
254
260
944
255
        datas = _Model_Obj.read(cr, uid, id, [],context)
261
        datas = _Model_Obj.read(cr, uid, [id], context=context)[0]
945
256
        for a in _Node_Obj.read(cr,uid,datas[_Node_Field],[]):
262
        for a in _Node_Obj.read(cr,uid,datas[_Node_Field],[]):
946
257
            if a[_Source_Field] or a[_Destination_Field]:
263
            if a[_Source_Field] or a[_Destination_Field]:
947
258
                nodes_name.append((a['id'],a['name']))
264
                nodes_name.append((a['id'],a['name']))
948
259
265
949
=== modified file 'openerp/addons/base/ir/ir_values.py'
950
--- openerp/addons/base/ir/ir_values.py	2013-06-13 17:39:00 +0000
951
+++ openerp/addons/base/ir/ir_values.py	2014-01-22 16:19:54 +0000
952
@@ -20,6 +20,7 @@
953
20
##############################################################################
20
##############################################################################
954
21
import pickle
21
import pickle
955
22
22
956
23
from openerp import tools
957
23
from openerp.osv import osv, fields
24
from openerp.osv import osv, fields
958
24
from openerp.osv.orm import except_orm
25
from openerp.osv.orm import except_orm
959
25
26
960
@@ -188,6 +189,21 @@
961
188
        if not cr.fetchone():
189
        if not cr.fetchone():
962
189
            cr.execute('CREATE INDEX ir_values_key_model_key2_res_id_user_id_idx ON ir_values (key, model, key2, res_id, user_id)')
190
            cr.execute('CREATE INDEX ir_values_key_model_key2_res_id_user_id_idx ON ir_values (key, model, key2, res_id, user_id)')
963
190
191
964
192
    def create(self, cr, uid, vals, context=None):
965
193
        res = super(ir_values, self).create(cr, uid, vals, context=context)
966
194
        self.get_defaults_dict.clear_cache(self)
967
195
        return res
968
196
969
197
    def write(self, cr, uid, ids, vals, context=None):
970
198
        res = super(ir_values, self).write(cr, uid, ids, vals, context=context)
971
199
        self.get_defaults_dict.clear_cache(self)
972
200
        return res
973
201
974
202
    def unlink(self, cr, uid, ids, context=None):
975
203
        res = super(ir_values, self).unlink(cr, uid, ids, context=context)
976
204
        self.get_defaults_dict.clear_cache(self)
977
205
        return res
978
206
979
191
    def set_default(self, cr, uid, model, field_name, value, for_all_users=True, company_id=False, condition=False):
207
    def set_default(self, cr, uid, model, field_name, value, for_all_users=True, company_id=False, condition=False):
980
192
        """Defines a default value for the given model and field_name. Any previous
208
        """Defines a default value for the given model and field_name. Any previous
981
193
           default for the same scope (model, field_name, value, for_all_users, company_id, condition)
209
           default for the same scope (model, field_name, value, for_all_users, company_id, condition)
982
@@ -319,6 +335,15 @@
983
319
                (row['id'], row['name'], pickle.loads(row['value'].encode('utf-8'))))
335
                (row['id'], row['name'], pickle.loads(row['value'].encode('utf-8'))))
984
320
        return defaults.values()
336
        return defaults.values()
985
321
337
986
338
    # use ormcache: this is called a lot by BaseModel.add_default_value()!
987
339
    @tools.ormcache(skiparg=2)
988
340
    def get_defaults_dict(self, cr, uid, model, condition=False):
989
341
        """ Returns a dictionary mapping field names with their corresponding
990
342
            default value. This method simply improves the returned value of
991
343
            :meth:`~.get_defaults`.
992
344
        """
993
345
        return dict((f, v) for i, f, v in self.get_defaults(cr, uid, model, condition))
994
346
995
322
    def set_action(self, cr, uid, name, action_slot, model, action, res_id=False):
347
    def set_action(self, cr, uid, name, action_slot, model, action, res_id=False):
996
323
        """Binds an the given action to the given model's action slot - for later
348
        """Binds an the given action to the given model's action slot - for later
997
324
           retrieval via :meth:`~.get_actions`. Any existing binding of the same action
349
           retrieval via :meth:`~.get_actions`. Any existing binding of the same action
998
@@ -401,7 +426,7 @@
999
401
                    if field not in EXCLUDED_FIELDS]
426
                    if field not in EXCLUDED_FIELDS]
1000
402
            # FIXME: needs cleanup
427
            # FIXME: needs cleanup
1001
403
            try:
428
            try:
1003
404
                action_def = self.pool[action_model].read(cr, uid, int(id), fields, context)
429
                action_def = self.pool[action_model].read(cr, uid, [int(id)], fields, context)[0]
1004
405
                if action_def:
430
                if action_def:
1005
406
                    if action_model in ('ir.actions.report.xml','ir.actions.act_window',
431
                    if action_model in ('ir.actions.report.xml','ir.actions.act_window',
1006
407
                                        'ir.actions.wizard'):
432
                                        'ir.actions.wizard'):
1007
408
433
1008
=== modified file 'openerp/addons/base/module/module.py'
1009
--- openerp/addons/base/module/module.py	2014-01-15 20:53:57 +0000
1010
+++ openerp/addons/base/module/module.py	2014-01-22 16:19:54 +0000
1011
@@ -45,7 +45,7 @@
1012
45
from openerp.modules.db import create_categories
45
from openerp.modules.db import create_categories
1013
46
from openerp.tools.parse_version import parse_version
46
from openerp.tools.parse_version import parse_version
1014
47
from openerp.tools.translate import _
47
from openerp.tools.translate import _
1016
48
from openerp.osv import fields, osv, orm
48
from openerp.osv import osv, orm, fields, fields2, api
1017
49
49
1018
50
_logger = logging.getLogger(__name__)
50
_logger = logging.getLogger(__name__)
1019
51
51
1020
@@ -362,34 +362,41 @@
1021
362
                msg = _('Unable to process module "%s" because an external dependency is not met: %s')
362
                msg = _('Unable to process module "%s" because an external dependency is not met: %s')
1022
363
            raise orm.except_orm(_('Error'), msg % (module_name, e.args[0]))
363
            raise orm.except_orm(_('Error'), msg % (module_name, e.args[0]))
1023
364
364
1025
365
    def state_update(self, cr, uid, ids, newstate, states_to_update, context=None, level=100):
365
    @api.multi
1026
366
    def state_update(self, newstate, states_to_update, level=100):
1027
366
        if level < 1:
367
        if level < 1:
1028
367
            raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
368
            raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
1029
369
1030
370
        # whether some modules are installed with demo data
1031
368
        demo = False
371
        demo = False
1034
369
        for module in self.browse(cr, uid, ids, context=context):
372
1035
370
            mdemo = False
373
        for module in self:
1036
374
            # determine dependency modules to update/others
1037
375
            update_mods, ready_mods = self.browse(), self.browse()
1038
371
            for dep in module.dependencies_id:
376
            for dep in module.dependencies_id:
1039
372
                if dep.state == 'unknown':
377
                if dep.state == 'unknown':
1040
373
                    raise orm.except_orm(_('Error'), _("You try to install module '%s' that depends on module '%s'.\nBut the latter module is not available in your system.") % (module.name, dep.name,))
378
                    raise orm.except_orm(_('Error'), _("You try to install module '%s' that depends on module '%s'.\nBut the latter module is not available in your system.") % (module.name, dep.name,))
1044
374
                ids2 = self.search(cr, uid, [('name', '=', dep.name)])
379
                if dep.depend_id.state == newstate:
1045
375
                if dep.state != newstate:
380
                    ready_mods += dep.depend_id
1043
376
                    mdemo = self.state_update(cr, uid, ids2, newstate, states_to_update, context, level - 1) or mdemo
1046
377
                else:
381
                else:
1050
378
                    od = self.browse(cr, uid, ids2)[0]
382
                    update_mods += dep.depend_id
1051
379
                    mdemo = od.demo or mdemo
383
1052
380
384
            # update dependency modules that require it, and determine demo for module
1053
385
            update_demo = update_mods.state_update(newstate, states_to_update, level=level-1)
1054
386
            module_demo = module.demo or update_demo or any(mod.demo for mod in ready_mods)
1055
387
            demo = demo or module_demo
1056
388
1057
389
            # check dependencies and update module itself
1058
381
            self.check_external_dependencies(module.name, newstate)
390
            self.check_external_dependencies(module.name, newstate)
1059
382
            if not module.dependencies_id:
1060
383
                mdemo = module.demo
1061
384
            if module.state in states_to_update:
391
            if module.state in states_to_update:
1064
385
                self.write(cr, uid, [module.id], {'state': newstate, 'demo': mdemo})
392
                module.write({'state': newstate, 'demo': module_demo})
1065
386
            demo = demo or mdemo
393
1066
387
        return demo
394
        return demo
1067
388
395
1068
389
    def button_install(self, cr, uid, ids, context=None):
396
    def button_install(self, cr, uid, ids, context=None):
1069
390
397
1070
391
        # Mark the given modules to be installed.
398
        # Mark the given modules to be installed.
1072
392
        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
399
        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context=context)
1073
393
400
1074
394
        # Mark (recursively) the newly satisfied modules to also be installed
401
        # Mark (recursively) the newly satisfied modules to also be installed
1075
395
402
1076
@@ -515,7 +522,7 @@
1077
515
522
1078
516
    def button_upgrade(self, cr, uid, ids, context=None):
523
    def button_upgrade(self, cr, uid, ids, context=None):
1079
517
        depobj = self.pool.get('ir.module.module.dependency')
524
        depobj = self.pool.get('ir.module.module.dependency')
1081
518
        todo = self.browse(cr, uid, ids, context=context)
525
        todo = list(self.browse(cr, uid, ids, context=context))
1082
519
        self.update_list(cr, uid)
526
        self.update_list(cr, uid)
1083
520
527
1084
521
        i = 0
528
        i = 0
1085
@@ -646,6 +653,7 @@
1086
646
            terp = self.get_module_info(mod.name)
653
            terp = self.get_module_info(mod.name)
1087
647
            self.write(cr, uid, mod.id, self.get_values_from_terp(terp))
654
            self.write(cr, uid, mod.id, self.get_values_from_terp(terp))
1088
648
            cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s', (mod.id,))
655
            cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s', (mod.id,))
1089
656
            self.invalidate_cache(['dependencies_id'], [mod.id])
1090
649
            self._update_dependencies(cr, uid, mod, terp.get('depends', []))
657
            self._update_dependencies(cr, uid, mod, terp.get('depends', []))
1091
650
            self._update_category(cr, uid, mod, terp.get('category', 'Uncategorized'))
658
            self._update_category(cr, uid, mod, terp.get('category', 'Uncategorized'))
1092
651
            # Import module
659
            # Import module
1093
@@ -738,6 +746,7 @@
1094
738
            cr.execute('INSERT INTO ir_module_module_dependency (module_id, name) values (%s, %s)', (mod_browse.id, dep))
746
            cr.execute('INSERT INTO ir_module_module_dependency (module_id, name) values (%s, %s)', (mod_browse.id, dep))
1095
739
        for dep in (existing - needed):
747
        for dep in (existing - needed):
1096
740
            cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s and name = %s', (mod_browse.id, dep))
748
            cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s and name = %s', (mod_browse.id, dep))
1097
749
        self.invalidate_cache(['dependencies_id'], [mod_browse.id])
1098
741
750
1099
742
    def _update_category(self, cr, uid, mod_browse, category='Uncategorized'):
751
    def _update_category(self, cr, uid, mod_browse, category='Uncategorized'):
1100
743
        current_category = mod_browse.category_id
752
        current_category = mod_browse.category_id
1101
@@ -766,37 +775,49 @@
1102
766
            if not mod.description:
775
            if not mod.description:
1103
767
                _logger.warning('module %s: description is empty !', mod.name)
776
                _logger.warning('module %s: description is empty !', mod.name)
1104
768
777
1106
769
class module_dependency(osv.osv):
778
1107
779
DEP_STATES = [
1108
780
    ('uninstallable', 'Uninstallable'),
1109
781
    ('uninstalled', 'Not Installed'),
1110
782
    ('installed', 'Installed'),
1111
783
    ('to upgrade', 'To be upgraded'),
1112
784
    ('to remove', 'To be removed'),
1113
785
    ('to install', 'To be installed'),
1114
786
    ('unknown', 'Unknown'),
1115
787
]
1116
788
1117
789
class module_dependency(osv.Model):
1118
770
    _name = "ir.module.module.dependency"
790
    _name = "ir.module.module.dependency"
1119
771
    _description = "Module dependency"
791
    _description = "Module dependency"
1120
772
792
1149
773
    def _state(self, cr, uid, ids, name, args, context=None):
793
    # the dependency name
1150
774
        result = {}
794
    name = fields2.Char(size=128)
1151
775
        mod_obj = self.pool.get('ir.module.module')
795
1152
776
        for md in self.browse(cr, uid, ids):
796
    # the module that depends on it
1153
777
            ids = mod_obj.search(cr, uid, [('name', '=', md.name)])
797
    module_id = fields2.Many2one('ir.module.module', 'Module', ondelete='cascade')
1154
778
            if ids:
798
1155
779
                result[md.id] = mod_obj.read(cr, uid, [ids[0]], ['state'])[0]['state']
799
    # the module corresponding to the dependency, and its status
1156
780
            else:
800
    depend_id = fields2.Many2one('ir.module.module', 'Dependency',
1157
781
                result[md.id] = 'unknown'
801
        compute='_compute_depend', readonly=True, store=False)
1158
782
        return result
802
    state = fields2.Selection(DEP_STATES, string='Status',
1159
783
803
        compute='_compute_state', readonly=True, store=False)
1160
784
    _columns = {
804
1161
785
        # The dependency name
805
    @api.multi
1162
786
        'name': fields.char('Name', size=128, select=True),
806
    @api.depends('name')
1163
787
807
    def _compute_depend(self):
1164
788
        # The module that depends on it
808
        # retrieve all modules corresponding to the dependency names
1165
789
        'module_id': fields.many2one('ir.module.module', 'Module', select=True, ondelete='cascade'),
809
        names = list(set(dep.name for dep in self))
1166
790
810
        mods = self.pool['ir.module.module'].search([('name', 'in', names)])
1167
791
        'state': fields.function(_state, type='selection', selection=[
811
1168
792
            ('uninstallable', 'Uninstallable'),
812
        # index modules by name, and assign dependencies
1169
793
            ('uninstalled', 'Not Installed'),
813
        name_mod = dict((mod.name, mod) for mod in mods)
1170
794
            ('installed', 'Installed'),
814
        for dep in self:
1171
795
            ('to upgrade', 'To be upgraded'),
815
            dep.depend_id = name_mod.get(dep.name)
1172
796
            ('to remove', 'To be removed'),
816
1173
797
            ('to install', 'To be installed'),
817
    @api.one
1174
798
            ('unknown', 'Unknown'),
818
    @api.depends('depend_id.state')
1175
799
        ], string='Status', readonly=True, select=True),
819
    def _compute_state(self):
1176
800
    }
820
        self.state = self.depend_id.state or 'unknown'
1177
821
1178
801
822
1179
802
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
823
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1180
803
824
1181
=== modified file 'openerp/addons/base/res/ir_property.py'
1182
--- openerp/addons/base/res/ir_property.py	2013-06-24 08:57:31 +0000
1183
+++ openerp/addons/base/res/ir_property.py	2014-01-22 16:19:54 +0000
1184
@@ -21,8 +21,7 @@
1185
21
21
1186
22
import time
22
import time
1187
23
23
1190
24
from openerp.osv import osv, fields
24
from openerp.osv import osv, orm, fields
1189
25
from openerp.osv.orm import browse_record, browse_null
1191
26
from openerp.tools.misc import attrgetter
25
from openerp.tools.misc import attrgetter
1192
27
26
1193
28
# -------------------------------------------------------------------------
27
# -------------------------------------------------------------------------
1194
@@ -97,7 +96,7 @@
1195
97
            raise osv.except_osv('Error', 'Invalid type')
96
            raise osv.except_osv('Error', 'Invalid type')
1196
98
97
1197
99
        if field == 'value_reference':
98
        if field == 'value_reference':
1199
100
            if isinstance(value, browse_record):
99
            if isinstance(value, orm.BaseModel):
1200
101
                value = '%s,%d' % (value._name, value.id)
100
                value = '%s,%d' % (value._name, value.id)
1201
102
            elif isinstance(value, (int, long)):
101
            elif isinstance(value, (int, long)):
1202
103
                field_id = values.get('fields_id')
102
                field_id = values.get('fields_id')
1203
@@ -132,7 +131,7 @@
1204
132
            return record.value_binary
131
            return record.value_binary
1205
133
        elif record.type == 'many2one':
132
        elif record.type == 'many2one':
1206
134
            if not record.value_reference:
133
            if not record.value_reference:
1208
135
                return browse_null()
134
                return False
1209
136
            model, resource_id = record.value_reference.split(',')
135
            model, resource_id = record.value_reference.split(',')
1210
137
            return self.pool.get(model).browse(cr, uid, int(resource_id), context=context)
136
            return self.pool.get(model).browse(cr, uid, int(resource_id), context=context)
1211
138
        elif record.type == 'datetime':
137
        elif record.type == 'datetime':
1212
139
138
1213
=== modified file 'openerp/addons/base/res/res_company.py'
1214
--- openerp/addons/base/res/res_company.py	2013-12-09 15:14:54 +0000
1215
+++ openerp/addons/base/res/res_company.py	2014-01-22 16:19:54 +0000
1216
@@ -84,7 +84,7 @@
1217
84
            if company.partner_id:
84
            if company.partner_id:
1218
85
                address_data = part_obj.address_get(cr, openerp.SUPERUSER_ID, [company.partner_id.id], adr_pref=['default'])
85
                address_data = part_obj.address_get(cr, openerp.SUPERUSER_ID, [company.partner_id.id], adr_pref=['default'])
1219
86
                if address_data['default']:
86
                if address_data['default']:
1221
87
                    address = part_obj.read(cr, openerp.SUPERUSER_ID, address_data['default'], field_names, context=context)
87
                    address = part_obj.read(cr, openerp.SUPERUSER_ID, [address_data['default']], field_names, context=context)[0]
1222
88
                    for field in field_names:
88
                    for field in field_names:
1223
89
                        result[company.id][field] = address[field] or False
89
                        result[company.id][field] = address[field] or False
1224
90
        return result
90
        return result
1225
@@ -175,6 +175,7 @@
1226
175
            res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names))
175
            res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names))
1227
176
176
1228
177
        return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
177
        return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
1229
178
1230
178
    def onchange_state(self, cr, uid, ids, state_id, context=None):
179
    def onchange_state(self, cr, uid, ids, state_id, context=None):
1231
179
        if state_id:
180
        if state_id:
1232
180
            return {'value':{'country_id': self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id }}
181
            return {'value':{'country_id': self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id }}
1233
181
182
1234
=== modified file 'openerp/addons/base/res/res_config.py'
1235
--- openerp/addons/base/res/res_config.py	2013-12-02 11:00:30 +0000
1236
+++ openerp/addons/base/res/res_config.py	2014-01-22 16:19:54 +0000
1237
@@ -293,10 +293,10 @@
1238
293
    def _already_installed(self, cr, uid, context=None):
293
    def _already_installed(self, cr, uid, context=None):
1239
294
        """ For each module (boolean fields in a res.config.installer),
294
        """ For each module (boolean fields in a res.config.installer),
1240
295
        check if it's already installed (either 'to install', 'to upgrade'
295
        check if it's already installed (either 'to install', 'to upgrade'
1242
296
        or 'installed') and if it is return the module's browse_record
296
        or 'installed') and if it is return the module's record
1243
297
297
1244
298
        :returns: a list of all installed modules in this installer
298
        :returns: a list of all installed modules in this installer
1246
299
        :rtype: [browse_record]
299
        :rtype: recordset (collection of Record)
1247
300
        """
300
        """
1248
301
        modules = self.pool['ir.module.module']
301
        modules = self.pool['ir.module.module']
1249
302
302
1250
303
303
1251
=== modified file 'openerp/addons/base/res/res_currency.py'
1252
--- openerp/addons/base/res/res_currency.py	2013-11-04 13:46:18 +0000
1253
+++ openerp/addons/base/res/res_currency.py	2014-01-22 16:19:54 +0000
1254
@@ -22,6 +22,7 @@
1255
22
import re
22
import re
1256
23
import time
23
import time
1257
24
24
1258
25
from openerp import api, fields as fields2
1259
25
from openerp import tools
26
from openerp import tools
1260
26
from openerp.osv import fields, osv
27
from openerp.osv import fields, osv
1261
27
from openerp.tools import float_round, float_is_zero, float_compare
28
from openerp.tools import float_round, float_is_zero, float_compare
1262
@@ -77,7 +78,6 @@
1263
77
        'rounding': fields.float('Rounding Factor', digits=(12,6)),
78
        'rounding': fields.float('Rounding Factor', digits=(12,6)),
1264
78
        'active': fields.boolean('Active'),
79
        'active': fields.boolean('Active'),
1265
79
        'company_id':fields.many2one('res.company', 'Company'),
80
        'company_id':fields.many2one('res.company', 'Company'),
1266
80
        'date': fields.date('Date'),
1267
81
        'base': fields.boolean('Base'),
81
        'base': fields.boolean('Base'),
1268
82
        'position': fields.selection([('after','After Amount'),('before','Before Amount')], 'Symbol Position', help="Determines where the currency symbol should be placed after or before the amount.")
82
        'position': fields.selection([('after','After Amount'),('before','Before Amount')], 'Symbol Position', help="Determines where the currency symbol should be placed after or before the amount.")
1269
83
    }
83
    }
1270
@@ -109,19 +109,12 @@
1271
109
                          ON res_currency
109
                          ON res_currency
1272
110
                          (name, (COALESCE(company_id,-1)))""")
110
                          (name, (COALESCE(company_id,-1)))""")
1273
111
111
1287
112
    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
112
    date = fields2.Date(compute='compute_date', store=True)
1288
113
        res = super(res_currency, self).read(cr, user, ids, fields, context, load)
113
1289
114
        currency_rate_obj = self.pool.get('res.currency.rate')
114
    @api.one
1290
115
        values = res
115
    @api.depends('rate_ids.name')
1291
116
        if not isinstance(values, list):
116
    def compute_date(self):
1292
117
            values = [values]
117
        self.date = self.rate_ids.name
1280
118
        for r in values:
1281
119
            if r.__contains__('rate_ids'):
1282
120
                rates=r['rate_ids']
1283
121
                if rates:
1284
122
                    currency_date = currency_rate_obj.read(cr, user, rates[0], ['name'])['name']
1285
123
                    r['date'] = currency_date
1286
124
        return res
1293
125
118
1294
126
    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
119
    def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
1295
127
        if not args:
120
        if not args:
1296
@@ -147,7 +140,7 @@
1297
147
        """Return ``amount`` rounded  according to ``currency``'s
140
        """Return ``amount`` rounded  according to ``currency``'s
1298
148
           rounding rules.
141
           rounding rules.
1299
149
142
1301
150
           :param browse_record currency: currency for which we are rounding
143
           :param Record currency: currency for which we are rounding
1302
151
           :param float amount: the amount to round
144
           :param float amount: the amount to round
1303
152
           :return: rounded float
145
           :return: rounded float
1304
153
        """
146
        """
1305
@@ -165,7 +158,7 @@
1306
165
           they respectively round to 0.01 and 0.0, even though
158
           they respectively round to 0.01 and 0.0, even though
1307
166
           0.006-0.002 = 0.004 which would be considered zero at 2 digits precision.
159
           0.006-0.002 = 0.004 which would be considered zero at 2 digits precision.
1308
167
160
1310
168
           :param browse_record currency: currency for which we are rounding
161
           :param Record currency: currency for which we are rounding
1311
169
           :param float amount1: first amount to compare
162
           :param float amount1: first amount to compare
1312
170
           :param float amount2: second amount to compare
163
           :param float amount2: second amount to compare
1313
171
           :return: (resp.) -1, 0 or 1, if ``amount1`` is (resp.) lower than,
164
           :return: (resp.) -1, 0 or 1, if ``amount1`` is (resp.) lower than,
1314
@@ -183,7 +176,7 @@
1315
183
           computing the difference, while the latter will round before, giving
176
           computing the difference, while the latter will round before, giving
1316
184
           different results for e.g. 0.006 and 0.002 at 2 digits precision.
177
           different results for e.g. 0.006 and 0.002 at 2 digits precision.
1317
185
178
1319
186
           :param browse_record currency: currency for which we are rounding
179
           :param Record currency: currency for which we are rounding
1320
187
           :param float amount: amount to compare with currency's zero
180
           :param float amount: amount to compare with currency's zero
1321
188
        """
181
        """
1322
189
        return float_is_zero(amount, precision_rounding=currency.rounding)
182
        return float_is_zero(amount, precision_rounding=currency.rounding)
1323
@@ -255,7 +248,7 @@
1324
255
        'currency_rate_type_id': fields.many2one('res.currency.rate.type', 'Currency Rate Type', help="Allow you to define your own currency rate types, like 'Average' or 'Year to Date'. Leave empty if you simply want to use the normal 'spot' rate type"),
248
        'currency_rate_type_id': fields.many2one('res.currency.rate.type', 'Currency Rate Type', help="Allow you to define your own currency rate types, like 'Average' or 'Year to Date'. Leave empty if you simply want to use the normal 'spot' rate type"),
1325
256
    }
249
    }
1326
257
    _defaults = {
250
    _defaults = {
1328
258
        'name': lambda *a: time.strftime('%Y-%m-%d'),
251
        'name': lambda *a: time.strftime('%Y-%m-%d 00:00:00'),
1329
259
    }
252
    }
1330
260
    _order = "name desc"
253
    _order = "name desc"
1331
261
254
1332
262
255
1333
=== modified file 'openerp/addons/base/res/res_partner.py'
1334
--- openerp/addons/base/res/res_partner.py	2013-09-10 12:12:30 +0000
1335
+++ openerp/addons/base/res/res_partner.py	2014-01-22 16:19:54 +0000
1336
@@ -29,41 +29,44 @@
1337
29
from openerp import SUPERUSER_ID
29
from openerp import SUPERUSER_ID
1338
30
from openerp import tools
30
from openerp import tools
1339
31
from openerp.osv import osv, fields
31
from openerp.osv import osv, fields
1340
32
from openerp.osv.scope import proxy as scope
1341
33
from openerp.osv.api import model, multi, one, returns
1342
32
from openerp.tools.translate import _
34
from openerp.tools.translate import _
1343
33
from openerp.tools.yaml_import import is_comment
35
from openerp.tools.yaml_import import is_comment
1344
34
36
1345
37
ADDRESS_FORMAT_LAYOUTS = {
1346
38
    '%(city)s %(state_code)s\n%(zip)s': """
1347
39
        <div class="address_format">
1348
40
            <field name="city" placeholder="City" style="width: 50%%"/>
1349
41
            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 47%%" options='{"no_open": true}'/>
1350
42
            <br/>
1351
43
            <field name="zip" placeholder="ZIP"/>
1352
44
        </div>
1353
45
    """,
1354
46
    '%(zip)s %(city)s': """
1355
47
        <div class="address_format">
1356
48
            <field name="zip" placeholder="ZIP" style="width: 40%%"/>
1357
49
            <field name="city" placeholder="City" style="width: 57%%"/>
1358
50
            <br/>
1359
51
            <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
1360
52
        </div>
1361
53
    """,
1362
54
    '%(city)s\n%(state_name)s\n%(zip)s': """
1363
55
        <div class="address_format">
1364
56
            <field name="city" placeholder="City"/>
1365
57
            <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
1366
58
            <field name="zip" placeholder="ZIP"/>
1367
59
        </div>
1368
60
    """
1369
61
}
1370
62
1371
63
1372
35
class format_address(object):
64
class format_address(object):
1404
36
    def fields_view_get_address(self, cr, uid, arch, context={}):
65
    @model
1405
37
        user_obj = self.pool['res.users']
66
    def fields_view_get_address(self, arch):
1406
38
        fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
67
        fmt = scope.user.company_id.country_id.address_format or ''
1407
39
        fmt = fmt and fmt.address_format
68
        for k, v in ADDRESS_FORMAT_LAYOUTS.items():
1408
40
        layouts = {
69
            if k in fmt:
1378
41
            '%(city)s %(state_code)s\n%(zip)s': """
1379
42
                <div class="address_format">
1380
43
                    <field name="city" placeholder="City" style="width: 50%%"/>
1381
44
                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 47%%" options='{"no_open": true}'/>
1382
45
                    <br/>
1383
46
                    <field name="zip" placeholder="ZIP"/>
1384
47
                </div>
1385
48
            """,
1386
49
            '%(zip)s %(city)s': """
1387
50
                <div class="address_format">
1388
51
                    <field name="zip" placeholder="ZIP" style="width: 40%%"/>
1389
52
                    <field name="city" placeholder="City" style="width: 57%%"/>
1390
53
                    <br/>
1391
54
                    <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
1392
55
                </div>
1393
56
            """,
1394
57
            '%(city)s\n%(state_name)s\n%(zip)s': """
1395
58
                <div class="address_format">
1396
59
                    <field name="city" placeholder="City"/>
1397
60
                    <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
1398
61
                    <field name="zip" placeholder="ZIP"/>
1399
62
                </div>
1400
63
            """
1401
64
        }
1402
65
        for k,v in layouts.items():
1403
66
            if fmt and (k in fmt):
1409
67
                doc = etree.fromstring(arch)
70
                doc = etree.fromstring(arch)
1410
68
                for node in doc.xpath("//div[@class='address_format']"):
71
                for node in doc.xpath("//div[@class='address_format']"):
1411
69
                    tree = etree.fromstring(v)
72
                    tree = etree.fromstring(v)
1412
@@ -73,53 +76,53 @@
1413
73
        return arch
76
        return arch
1414
74
77
1415
75
78
1417
76
def _tz_get(self,cr,uid, context=None):
79
@model
1418
80
def _tz_get(self):
1419
77
    # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
81
    # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
1420
78
    return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
82
    return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
1421
79
83
1423
80
class res_partner_category(osv.osv):
84
1424
85
class res_partner_category(osv.Model):
1425
81
86
1426
82
    def name_get(self, cr, uid, ids, context=None):
87
    def name_get(self, cr, uid, ids, context=None):
1429
83
        """Return the categories' display name, including their direct
88
        """ Return the categories' display name, including their direct
1430
84
           parent by default.
89
            parent by default.
1431
85
90
1437
86
        :param dict context: the ``partner_category_display`` key can be
91
            If ``context['partner_category_display']`` is ``'short'``, the short
1438
87
                             used to select the short version of the
92
            version of the category name (without the direct parent) is used.
1439
88
                             category name (without the direct parent),
93
            The default is the long version.
1440
89
                             when set to ``'short'``. The default is
94
        """
1441
90
                             the long version."""
95
        if not isinstance(ids, list):
1442
96
            ids = [ids]
1443
91
        if context is None:
97
        if context is None:
1444
92
            context = {}
98
            context = {}
1445
99
1446
93
        if context.get('partner_category_display') == 'short':
100
        if context.get('partner_category_display') == 'short':
1447
94
            return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
101
            return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
1451
95
        if isinstance(ids, (int, long)):
102
1449
96
            ids = [ids]
1450
97
        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
1452
98
        res = []
103
        res = []
1458
99
        for record in reads:
104
        for category in self.browse(cr, uid, ids, context=context):
1459
100
            name = record['name']
105
            names = []
1460
101
            if record['parent_id']:
106
            current = category
1461
102
                name = record['parent_id'][1] + ' / ' + name
107
            while current:
1462
103
            res.append((record['id'], name))
108
                names.append(current.name)
1463
109
                current = current.parent_id
1464
110
            res.append((category.id, ' / '.join(reversed(names))))
1465
104
        return res
111
        return res
1466
105
112
1472
106
    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
113
    @model
1473
107
        if not args:
114
    def name_search(self, name, args=None, operator='ilike', limit=100):
1474
108
            args = []
115
        args = args or []
1470
109
        if not context:
1471
110
            context = {}
1475
111
        if name:
116
        if name:
1476
112
            # Be sure name_search is symetric to name_get
117
            # Be sure name_search is symetric to name_get
1477
113
            name = name.split(' / ')[-1]
118
            name = name.split(' / ')[-1]
1487
114
            ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
119
            args = [('name', operator, name)] + args
1488
115
        else:
120
        categories = self.search(args, limit=limit)
1489
116
            ids = self.search(cr, uid, args, limit=limit, context=context)
121
        return categories.name_get()
1490
117
        return self.name_get(cr, uid, ids, context)
122
1491
118
123
    @multi
1492
119
124
    def _name_get_fnc(self, field_name, arg):
1493
120
    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
125
        return dict(self.name_get())
1485
121
        res = self.name_get(cr, uid, ids, context=context)
1486
122
        return dict(res)
1494
123
126
1495
124
    _description = 'Partner Tags'
127
    _description = 'Partner Tags'
1496
125
    _name = 'res.partner.category'
128
    _name = 'res.partner.category'
1497
@@ -143,6 +146,7 @@
1498
143
    _parent_order = 'name'
146
    _parent_order = 'name'
1499
144
    _order = 'parent_left'
147
    _order = 'parent_left'
1500
145
148
1501
149
1502
146
class res_partner_title(osv.osv):
150
class res_partner_title(osv.osv):
1503
147
    _name = 'res.partner.title'
151
    _name = 'res.partner.title'
1504
148
    _order = 'name'
152
    _order = 'name'
1505
@@ -155,16 +159,17 @@
1506
155
        'domain': 'contact',
159
        'domain': 'contact',
1507
156
    }
160
    }
1508
157
161
1514
158
def _lang_get(self, cr, uid, context=None):
162
1515
159
    lang_pool = self.pool['res.lang']
163
@model
1516
160
    ids = lang_pool.search(cr, uid, [], context=context)
164
def _lang_get(self):
1517
161
    res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
165
    languages = scope['res.lang'].search([])
1518
162
    return [(r['code'], r['name']) for r in res]
166
    return [(language.code, language.name) for language in languages]
1519
163
167
1520
164
# fields copy if 'use_parent_address' is checked
168
# fields copy if 'use_parent_address' is checked
1521
165
ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
169
ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
1522
166
170
1524
167
class res_partner(osv.osv, format_address):
171
1525
172
class res_partner(osv.Model, format_address):
1526
168
    _description = 'Partner'
173
    _description = 'Partner'
1527
169
    _name = "res.partner"
174
    _name = "res.partner"
1528
170
175
1529
@@ -174,26 +179,23 @@
1530
174
            res[partner.id] = self._display_address(cr, uid, partner, context=context)
179
            res[partner.id] = self._display_address(cr, uid, partner, context=context)
1531
175
        return res
180
        return res
1532
176
181
1553
177
    def _get_image(self, cr, uid, ids, name, args, context=None):
182
    @multi
1554
178
        result = dict.fromkeys(ids, False)
183
    def _get_tz_offset(self, name, args):
1555
179
        for obj in self.browse(cr, uid, ids, context=context):
184
        return dict(
1556
180
            result[obj.id] = tools.image_get_resized_images(obj.image)
185
            (p.id, datetime.datetime.now(pytz.timezone(p.tz or 'GMT')).strftime('%z'))
1557
181
        return result
186
            for p in self)
1558
182
187
1559
183
    def _get_tz_offset(self, cr, uid, ids, name, args, context=None):
188
    @multi
1560
184
        result = dict.fromkeys(ids, False)
189
    def _get_image(self, name, args):
1561
185
        for obj in self.browse(cr, uid, ids, context=context):
190
        return dict((p.id, tools.image_get_resized_images(p.image)) for p in self)
1562
186
            result[obj.id] = datetime.datetime.now(pytz.timezone(obj.tz or 'GMT')).strftime('%z')
191
1563
187
        return result
192
    @one
1564
188
193
    def _set_image(self, name, value, args):
1565
189
    def _set_image(self, cr, uid, id, name, value, args, context=None):
194
        return self.write({'image': tools.image_resize_image_big(value)})
1566
190
        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
195
1567
191
196
    @multi
1568
192
    def _has_image(self, cr, uid, ids, name, args, context=None):
197
    def _has_image(self, name, args):
1569
193
        result = {}
198
        return dict((p.id, bool(p.image)) for p in self)
1550
194
        for obj in self.browse(cr, uid, ids, context=context):
1551
195
            result[obj.id] = obj.image != False
1552
196
        return result
1570
197
199
1571
198
    def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
200
    def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
1572
199
        """ Returns the partner that is considered the commercial
201
        """ Returns the partner that is considered the commercial
1573
@@ -302,16 +304,15 @@
1574
302
        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity', store=_commercial_partner_store_triggers)
304
        'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity', store=_commercial_partner_store_triggers)
1575
303
    }
305
    }
1576
304
306
1583
305
    def _default_category(self, cr, uid, context=None):
307
    @model
1584
306
        if context is None:
308
    def _default_category(self):
1585
307
            context = {}
309
        category_id = scope.context.get('category_id', False)
1586
308
        if context.get('category_id'):
310
        return [category_id] if category_id else False
1581
309
            return [context['category_id']]
1582
310
        return False
1587
311
311
1591
312
    def _get_default_image(self, cr, uid, is_company, context=None, colorize=False):
312
    @model
1592
313
        img_path = openerp.modules.get_module_resource('base', 'static/src/img',
313
    def _get_default_image(self, is_company, colorize=False):
1593
314
                                                       ('company_image.png' if is_company else 'avatar.png'))
314
        img_path = openerp.modules.get_module_resource(
1594
315
            'base', 'static/src/img', 'company_image.png' if is_company else 'avatar.png')
1595
315
        with open(img_path, 'rb') as f:
316
        with open(img_path, 'rb') as f:
1596
316
            image = f.read()
317
            image = f.read()
1597
317
318
1598
@@ -329,13 +330,17 @@
1599
329
            res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
330
            res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
1600
330
        return res
331
        return res
1601
331
332
1602
333
    @model
1603
334
    def _default_company(self):
1604
335
        return scope['res.company']._company_default_get('res.partner')
1605
336
1606
332
    _defaults = {
337
    _defaults = {
1607
333
        'active': True,
338
        'active': True,
1610
334
        'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
339
        'lang': model(lambda self: scope.lang),
1611
335
        'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
340
        'tz': model(lambda self: scope.context.get('tz', False)),
1612
336
        'customer': True,
341
        'customer': True,
1613
337
        'category_id': _default_category,
342
        'category_id': _default_category,
1615
338
        'company_id': lambda self, cr, uid, ctx: self.pool['res.company']._company_default_get(cr, uid, 'res.partner', context=ctx),
343
        'company_id': _default_company,
1616
339
        'color': 0,
344
        'color': 0,
1617
340
        'is_company': False,
345
        'is_company': False,
1618
341
        'type': 'contact', # type 'default' is wildcard and thus inappropriate
346
        'type': 'contact', # type 'default' is wildcard and thus inappropriate
1619
@@ -347,14 +352,13 @@
1620
347
        (osv.osv._check_recursion, 'You cannot create recursive Partner hierarchies.', ['parent_id']),
352
        (osv.osv._check_recursion, 'You cannot create recursive Partner hierarchies.', ['parent_id']),
1621
348
    ]
353
    ]
1622
349
354
1629
350
    def copy(self, cr, uid, id, default=None, context=None):
355
    @one
1630
351
        if default is None:
356
    def copy(self, default=None):
1631
352
            default = {}
357
        default = dict(default or {}, name=_('%s (copy)') % self.name)
1632
353
        name = self.read(cr, uid, [id], ['name'], context)[0]['name']
358
        return super(res_partner, self).copy(default)
1627
354
        default.update({'name': _('%s (copy)') % name})
1628
355
        return super(res_partner, self).copy(cr, uid, id, default, context)
1633
356
359
1635
357
    def onchange_type(self, cr, uid, ids, is_company, context=None):
360
    @multi
1636
361
    def onchange_type(self, is_company):
1637
358
        value = {}
362
        value = {}
1638
359
        value['title'] = False
363
        value['title'] = False
1639
360
        if is_company:
364
        if is_company:
1640
@@ -384,10 +388,11 @@
1641
384
            result['value'] = {'use_parent_address': False}
388
            result['value'] = {'use_parent_address': False}
1642
385
        return result
389
        return result
1643
386
390
1645
387
    def onchange_state(self, cr, uid, ids, state_id, context=None):
391
    @multi
1646
392
    def onchange_state(self, state_id):
1647
388
        if state_id:
393
        if state_id:
1650
389
            country_id = self.pool['res.country.state'].browse(cr, uid, state_id, context).country_id.id
394
            state = scope['res.country.state'].browse(state_id)
1651
390
            return {'value':{'country_id':country_id}}
395
            return {'value': {'country_id': state.country_id.id}}
1652
391
        return {}
396
        return {}
1653
392
397
1654
393
    def _check_ean_key(self, cr, uid, ids, context=None):
398
    def _check_ean_key(self, cr, uid, ids, context=None):
1655
@@ -505,30 +510,32 @@
1656
505
            if not parent.is_company:
510
            if not parent.is_company:
1657
506
                parent.write({'is_company': True})
511
                parent.write({'is_company': True})
1658
507
512
1666
508
    def write(self, cr, uid, ids, vals, context=None):
513
    @multi
1667
509
        if isinstance(ids, (int, long)):
514
    def write(self, vals):
1668
510
            ids = [ids]
515
        # res.partner must only allow to set the company_id of a partner if it
1669
511
        #res.partner must only allow to set the company_id of a partner if it
516
        # is the same as the company of all users that inherit from this partner
1670
512
        #is the same as the company of all users that inherit from this partner
517
        # (this is to allow the code from res_users to write to the partner!) or
1671
513
        #(this is to allow the code from res_users to write to the partner!) or
518
        # if setting the company_id to False (this is compatible with any user
1672
514
        #if setting the company_id to False (this is compatible with any user company)
519
        # company)
1673
515
        if vals.get('company_id'):
520
        if vals.get('company_id'):
1675
516
            for partner in self.browse(cr, uid, ids, context=context):
521
            company = self.pool['res.company'].browse(vals['company_id'])
1676
522
            for partner in self:
1677
517
                if partner.user_ids:
523
                if partner.user_ids:
1680
518
                    user_companies = set([user.company_id.id for user in partner.user_ids])
524
                    companies = set(user.company_id for user in partner.user_ids)
1681
519
                    if len(user_companies) > 1 or vals['company_id'] not in user_companies:
525
                    if len(companies) > 1 or company not in companies:
1682
520
                        raise osv.except_osv(_("Warning"),_("You can not change the company as the partner/user has multiple user linked with different companies."))
526
                        raise osv.except_osv(_("Warning"),_("You can not change the company as the partner/user has multiple user linked with different companies."))
1686
521
        result = super(res_partner,self).write(cr, uid, ids, vals, context=context)
527
1687
522
        for partner in self.browse(cr, uid, ids, context=context):
528
        result = super(res_partner, self).write(vals)
1688
523
            self._fields_sync(cr, uid, partner, vals, context)
529
        for partner in self:
1689
530
            self._fields_sync(partner, vals)
1690
524
        return result
531
        return result
1691
525
532
1698
526
    def create(self, cr, uid, vals, context=None):
533
    @model
1699
527
        new_id = super(res_partner, self).create(cr, uid, vals, context=context)
534
    def create(self, vals):
1700
528
        partner = self.browse(cr, uid, new_id, context=context)
535
        partner = super(res_partner, self).create(vals)
1701
529
        self._fields_sync(cr, uid, partner, vals, context)
536
        self._fields_sync(partner, vals)
1702
530
        self._handle_first_contact_creation(cr, uid, partner, context)
537
        self._handle_first_contact_creation(partner)
1703
531
        return new_id
538
        return partner
1704
532
539
1705
533
    def open_commercial_entity(self, cr, uid, ids, context=None):
540
    def open_commercial_entity(self, cr, uid, ids, context=None):
1706
534
        """ Utility method used to add an "Open Company" button in partner views """
541
        """ Utility method used to add an "Open Company" button in partner views """
1707
@@ -712,14 +719,11 @@
1708
712
            return False
719
            return False
1709
713
        return _('Partners: ')+self.pool['res.partner.category'].browse(cr, uid, context['category_id'], context).name
720
        return _('Partners: ')+self.pool['res.partner.category'].browse(cr, uid, context['category_id'], context).name
1710
714
721
1719
715
    def main_partner(self, cr, uid):
722
    @model
1720
716
        ''' Return the id of the main partner
723
    @returns('self')
1721
717
        '''
724
    def main_partner(self):
1722
718
        model_data = self.pool['ir.model.data']
725
        ''' Return the main partner '''
1723
719
        return model_data.browse(cr, uid,
726
        return scope.ref('base.main_partner')
1716
720
                            model_data.search(cr, uid, [('module','=','base'),
1717
721
                                                ('name','=','main_partner')])[0],
1718
722
                ).res_id
1724
723
727
1725
724
    def _display_address(self, cr, uid, address, without_company=False, context=None):
728
    def _display_address(self, cr, uid, address, without_company=False, context=None):
1726
725
729
1727
@@ -735,14 +739,14 @@
1728
735
739
1729
736
        # get the information that will be injected into the display format
740
        # get the information that will be injected into the display format
1730
737
        # get the address format
741
        # get the address format
1732
738
        address_format = address.country_id and address.country_id.address_format or \
742
        address_format = address.country_id.address_format or \
1733
739
              "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s"
743
              "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s"
1734
740
        args = {
744
        args = {
1740
741
            'state_code': address.state_id and address.state_id.code or '',
745
            'state_code': address.state_id.code or '',
1741
742
            'state_name': address.state_id and address.state_id.name or '',
746
            'state_name': address.state_id.name or '',
1742
743
            'country_code': address.country_id and address.country_id.code or '',
747
            'country_code': address.country_id.code or '',
1743
744
            'country_name': address.country_id and address.country_id.name or '',
748
            'country_name': address.country_id.name or '',
1744
745
            'company_name': address.parent_id and address.parent_id.name or '',
749
            'company_name': address.parent_id.name or '',
1745
746
        }
750
        }
1746
747
        for field in self._address_fields(cr, uid, context=context):
751
        for field in self._address_fields(cr, uid, context=context):
1747
748
            args[field] = getattr(address, field) or ''
752
            args[field] = getattr(address, field) or ''
1748
749
753
1749
=== modified file 'openerp/addons/base/res/res_users.py'
1750
--- openerp/addons/base/res/res_users.py	2014-01-15 20:53:57 +0000
1751
+++ openerp/addons/base/res/res_users.py	2014-01-22 16:19:54 +0000
1752
@@ -25,11 +25,10 @@
1753
25
from lxml.builder import E
25
from lxml.builder import E
1754
26
26
1755
27
import openerp
27
import openerp
1757
28
from openerp import SUPERUSER_ID
28
from openerp import SUPERUSER_ID, BaseModel
1758
29
from openerp import tools
29
from openerp import tools
1759
30
import openerp.exceptions
30
import openerp.exceptions
1762
31
from openerp.osv import fields,osv
31
from openerp.osv import fields, osv, api
1761
32
from openerp.osv.orm import browse_record
1763
33
from openerp.tools.translate import _
32
from openerp.tools.translate import _
1764
34
33
1765
35
_logger = logging.getLogger(__name__)
34
_logger = logging.getLogger(__name__)
1766
@@ -206,9 +205,8 @@
1767
206
    def _get_company(self,cr, uid, context=None, uid2=False):
205
    def _get_company(self,cr, uid, context=None, uid2=False):
1768
207
        if not uid2:
206
        if not uid2:
1769
208
            uid2 = uid
207
            uid2 = uid
1773
209
        user = self.pool['res.users'].read(cr, uid, uid2, ['company_id'], context)
208
        user = self.pool['res.users'].browse(cr, uid, uid2, context)
1774
210
        company_id = user.get('company_id', False)
209
        return user.company_id.id
1772
211
        return company_id and company_id[0] or False
1775
212
210
1776
213
    def _get_companies(self, cr, uid, context=None):
211
    def _get_companies(self, cr, uid, context=None):
1777
214
        c = self._get_company(cr, uid, context)
212
        c = self._get_company(cr, uid, context)
1778
@@ -247,7 +245,7 @@
1779
247
        'company_id': _get_company,
245
        'company_id': _get_company,
1780
248
        'company_ids': _get_companies,
246
        'company_ids': _get_companies,
1781
249
        'groups_id': _get_group,
247
        'groups_id': _get_group,
1783
250
        'image': lambda self, cr, uid, ctx={}: self.pool['res.partner']._get_default_image(cr, uid, False, ctx, colorize=True),
248
        'image': api.model(lambda self: self.pool['res.partner']._get_default_image(False, colorize=True)),
1784
251
    }
249
    }
1785
252
250
1786
253
    # User can write on a few of his own fields (but not his groups for example)
251
    # User can write on a few of his own fields (but not his groups for example)
1787
@@ -295,7 +293,8 @@
1788
295
                    break
293
                    break
1789
296
            else:
294
            else:
1790
297
                if 'company_id' in values:
295
                if 'company_id' in values:
1792
298
                    if not (values['company_id'] in self.read(cr, SUPERUSER_ID, uid, ['company_ids'], context=context)['company_ids']):
296
                    user = self.browse(cr, SUPERUSER_ID, uid, context=context)
1793
297
                    if not (values['company_id'] in user.company_ids.unbrowse()):
1794
299
                        del values['company_id']
298
                        del values['company_id']
1795
300
                uid = 1 # safe fields only, so we write as super-user to bypass access rights
299
                uid = 1 # safe fields only, so we write as super-user to bypass access rights
1796
301
300
1797
@@ -360,8 +359,8 @@
1798
360
            else:
359
            else:
1799
361
                context_key = False
360
                context_key = False
1800
362
            if context_key:
361
            if context_key:
1803
363
                res = getattr(user,k) or False
362
                res = getattr(user, k) or False
1804
364
                if isinstance(res, browse_record):
363
                if isinstance(res, BaseModel):
1805
365
                    res = res.id
364
                    res = res.id
1806
366
                result[context_key] = res or False
365
                result[context_key] = res or False
1807
367
        return result
366
        return result
1808
@@ -383,7 +382,7 @@
1809
383
        if not res:
382
        if not res:
1810
384
            raise openerp.exceptions.AccessDenied()
383
            raise openerp.exceptions.AccessDenied()
1811
385
384
1813
386
    def login(self, db, login, password):
385
    def _login(self, db, login, password):
1814
387
        if not password:
386
        if not password:
1815
388
            return False
387
            return False
1816
389
        user_id = False
388
        user_id = False
1817
@@ -412,6 +411,7 @@
1818
412
                try:
411
                try:
1819
413
                    cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exceptions=False)
412
                    cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exceptions=False)
1820
414
                    cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,))
413
                    cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,))
1821
414
                    self.invalidate_cache(['login_date'], [user_id])
1822
415
                except Exception:
415
                except Exception:
1823
416
                    _logger.debug("Failed to update last_login for db:%s login:%s", db, login, exc_info=True)
416
                    _logger.debug("Failed to update last_login for db:%s login:%s", db, login, exc_info=True)
1824
417
        except openerp.exceptions.AccessDenied:
417
        except openerp.exceptions.AccessDenied:
1825
@@ -433,7 +433,7 @@
1826
433
           :param dict user_agent_env: environment dictionary describing any
433
           :param dict user_agent_env: environment dictionary describing any
1827
434
               relevant environment attributes
434
               relevant environment attributes
1828
435
        """
435
        """
1830
436
        uid = self.login(db, login, password)
436
        uid = self._login(db, login, password)
1831
437
        if uid == openerp.SUPERUSER_ID:
437
        if uid == openerp.SUPERUSER_ID:
1832
438
            # Successfully logged in as admin!
438
            # Successfully logged in as admin!
1833
439
            # Attempt to guess the web base url...
439
            # Attempt to guess the web base url...
1834
@@ -710,7 +710,7 @@
1835
710
    def get_user_groups_view(self, cr, uid, context=None):
710
    def get_user_groups_view(self, cr, uid, context=None):
1836
711
        try:
711
        try:
1837
712
            view = self.pool['ir.model.data'].get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
712
            view = self.pool['ir.model.data'].get_object(cr, SUPERUSER_ID, 'base', 'user_groups_view', context)
1839
713
            assert view and view._table_name == 'ir.ui.view'
713
            assert view and view._name == 'ir.ui.view'
1840
714
        except Exception:
714
        except Exception:
1841
715
            view = False
715
            view = False
1842
716
        return view
716
        return view
1843
717
717
1844
=== modified file 'openerp/addons/base/security/base_security.xml'
1845
--- openerp/addons/base/security/base_security.xml	2013-06-10 15:41:39 +0000
1846
+++ openerp/addons/base/security/base_security.xml	2014-01-22 16:19:54 +0000
1847
@@ -41,11 +41,6 @@
1848
41
            <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
41
            <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
1849
42
        </record>
42
        </record>
1850
43
43
1851
44
        <!-- Set accesses to menu -->
1852
45
        <record model="ir.ui.menu" id="base.menu_administration">
1853
46
            <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
1854
47
        </record>
1855
48
1856
49
        <record model="ir.rule" id="res_partner_rule">
44
        <record model="ir.rule" id="res_partner_rule">
1857
50
            <field name="name">res.partner company</field>
45
            <field name="name">res.partner company</field>
1858
51
            <field name="model_id" ref="model_res_partner"/>
46
            <field name="model_id" ref="model_res_partner"/>
1859
52
47
1860
=== modified file 'openerp/addons/base/test/base_test.yml'
1861
--- openerp/addons/base/test/base_test.yml	2013-03-20 13:22:38 +0000
1862
+++ openerp/addons/base/test/base_test.yml	2014-01-22 16:19:54 +0000
1863
@@ -277,7 +277,7 @@
1864
277
            rate_id = res_currency_rate.create(cr, 1, {'name':'2000-01-01',
277
            rate_id = res_currency_rate.create(cr, 1, {'name':'2000-01-01',
1865
278
                                                       'rate': value,
278
                                                       'rate': value,
1866
279
                                                       'currency_id': currency.id})
279
                                                       'currency_id': currency.id})
1868
280
            rate = res_currency_rate.read(cr, 1, rate_id, ['rate'])['rate']
280
            rate = res_currency_rate.read(cr, 1, [rate_id], ['rate'])[0]['rate']
1869
281
            assert rate == expected, 'Roundtrip error: got %s back from db, expected %s' % (rate, expected)
281
            assert rate == expected, 'Roundtrip error: got %s back from db, expected %s' % (rate, expected)
1870
282
        # res.currency.rate uses 6 digits of precision by default
282
        # res.currency.rate uses 6 digits of precision by default
1871
283
        try_roundtrip(2.6748955, 2.674896)
283
        try_roundtrip(2.6748955, 2.674896)
1872
284
284
1873
=== modified file 'openerp/addons/base/test/test_ir_rule.yml'
1874
--- openerp/addons/base/test/test_ir_rule.yml	2011-06-01 14:39:21 +0000
1875
+++ openerp/addons/base/test/test_ir_rule.yml	2014-01-22 16:19:54 +0000
1876
@@ -124,7 +124,7 @@
1877
124
    Modify the global rule on res_company which triggers a recursive check
124
    Modify the global rule on res_company which triggers a recursive check
1878
125
    of the rules on company.
125
    of the rules on company.
1879
126
-
126
-
1881
127
    !record {model: ir.rule, id: base.res_company_rule}:
127
    !record {model: ir.rule, id: res_company_rule}:
1882
128
        domain_force: "[('id','child_of',[user.company_id.id])]"
128
        domain_force: "[('id','child_of',[user.company_id.id])]"
1883
129
-
129
-
1884
130
    Read as demo user the partners (exercising the global company rule).
130
    Read as demo user the partners (exercising the global company rule).
1885
131
131
1886
=== modified file 'openerp/addons/base/test/test_osv_expression.yml'
1887
--- openerp/addons/base/test/test_osv_expression.yml	2014-01-08 15:27:22 +0000
1888
+++ openerp/addons/base/test/test_osv_expression.yml	2014-01-22 16:19:54 +0000
1889
@@ -83,7 +83,7 @@
1890
83
    Test one2many operator with False
83
    Test one2many operator with False
1891
84
-
84
-
1892
85
    !assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
85
    !assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
1894
86
        - child_ids in (False, None, [])
86
        - list(child_ids) == []
1895
87
-
87
-
1896
88
    Test many2many operator with empty search list
88
    Test many2many operator with empty search list
1897
89
-
89
-
1898
@@ -92,7 +92,7 @@
1899
92
    Test many2many operator with False
92
    Test many2many operator with False
1900
93
-
93
-
1901
94
    !assert {model: res.partner, search: "[('category_id', '=', False)]"}:
94
    !assert {model: res.partner, search: "[('category_id', '=', False)]"}:
1903
95
        - category_id in (False, None, [])
95
        - list(category_id) == []
1904
96
-
96
-
1905
97
    Filtering on invalid value across x2many relationship should return an empty set
97
    Filtering on invalid value across x2many relationship should return an empty set
1906
98
-
98
-
1907
99
99
1908
=== modified file 'openerp/cli/server.py'
1909
--- openerp/cli/server.py	2014-01-09 09:32:58 +0000
1910
+++ openerp/cli/server.py	2014-01-22 16:19:54 +0000
1911
@@ -96,6 +96,7 @@
1912
96
        registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
96
        registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
1913
97
    except Exception:
97
    except Exception:
1914
98
        _logger.exception('Failed to initialize database `%s`.', dbname)
98
        _logger.exception('Failed to initialize database `%s`.', dbname)
1915
99
        openerp.tools.post_mortem()
1916
99
        return False
100
        return False
1917
100
    return registry._assertion_report.failures == 0
101
    return registry._assertion_report.failures == 0
1918
101
102
1919
102
103
1920
=== modified file 'openerp/exceptions.py'
1921
--- openerp/exceptions.py	2013-02-15 14:35:03 +0000
1922
+++ openerp/exceptions.py	2014-01-22 16:19:54 +0000
1923
@@ -28,6 +28,13 @@
1924
28
If you consider introducing new exceptions, check out the test_exceptions addon.
28
If you consider introducing new exceptions, check out the test_exceptions addon.
1925
29
"""
29
"""
1926
30
30
1927
31
# kept for backward compatibility
1928
32
class except_orm(Exception):
1929
33
    def __init__(self, name, value):
1930
34
        self.name = name
1931
35
        self.value = value
1932
36
        self.args = (name, value)
1933
37
1934
31
class Warning(Exception):
38
class Warning(Exception):
1935
32
    pass
39
    pass
1936
33
40
1937
@@ -47,8 +54,15 @@
1938
47
        super(AccessDenied, self).__init__('Access denied.')
54
        super(AccessDenied, self).__init__('Access denied.')
1939
48
        self.traceback = ('', '', '')
55
        self.traceback = ('', '', '')
1940
49
56
1942
50
class AccessError(Exception):
57
class AccessError(except_orm):
1943
51
    """ Access rights error. """
58
    """ Access rights error. """
1944
59
    def __init__(self, msg):
1945
60
        super(AccessError, self).__init__('AccessError', msg)
1946
61
1947
62
class MissingError(except_orm):
1948
63
    """ Missing record(s). """
1949
64
    def __init__(self, msg):
1950
65
        super(MissingError, self).__init__('MissingError', msg)
1951
52
66
1952
53
class DeferredException(Exception):
67
class DeferredException(Exception):
1953
54
    """ Exception object holding a traceback for asynchronous reporting.
68
    """ Exception object holding a traceback for asynchronous reporting.
1954
55
69
1955
=== modified file 'openerp/modules/loading.py'
1956
--- openerp/modules/loading.py	2013-12-18 12:38:58 +0000
1957
+++ openerp/modules/loading.py	2014-01-22 16:19:54 +0000
1958
@@ -175,6 +175,7 @@
1959
175
                status['progress'] = (index + 0.75) / len(graph)
175
                status['progress'] = (index + 0.75) / len(graph)
1960
176
                _load_data(cr, module_name, idref, mode, kind='demo')
176
                _load_data(cr, module_name, idref, mode, kind='demo')
1961
177
                cr.execute('update ir_module_module set demo=%s where id=%s', (True, module_id))
177
                cr.execute('update ir_module_module set demo=%s where id=%s', (True, module_id))
1962
178
                modobj.invalidate_cache(['demo'], [module_id])
1963
178
179
1964
179
            migrations.migrate_module(package, 'post')
180
            migrations.migrate_module(package, 'post')
1965
180
181
1966
@@ -310,6 +311,7 @@
1967
310
                    modobj.button_upgrade(cr, SUPERUSER_ID, ids)
311
                    modobj.button_upgrade(cr, SUPERUSER_ID, ids)
1968
311
312
1969
312
            cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
313
            cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
1970
314
            modobj.invalidate_cache(['state'])
1971
313
315
1972
314
316
1973
315
        # STEP 3: Load marked modules (skipping base which was done in STEP 1)
317
        # STEP 3: Load marked modules (skipping base which was done in STEP 1)
1974
316
318
1975
=== modified file 'openerp/modules/module.py'
1976
--- openerp/modules/module.py	2013-06-28 15:07:55 +0000
1977
+++ openerp/modules/module.py	2014-01-22 16:19:54 +0000
1978
@@ -28,6 +28,7 @@
1979
28
import types
28
import types
1980
29
import zipimport
29
import zipimport
1981
30
30
1982
31
import openerp
1983
31
import openerp.tools as tools
32
import openerp.tools as tools
1984
32
import openerp.tools.osutil as osutil
33
import openerp.tools.osutil as osutil
1985
33
from openerp.tools.safe_eval import safe_eval as eval
34
from openerp.tools.safe_eval import safe_eval as eval
1986
@@ -310,22 +311,23 @@
1987
310
    TODO better explanation of _auto_init and init.
311
    TODO better explanation of _auto_init and init.
1988
311
312
1989
312
    """
313
    """
2006
313
    _logger.info('module %s: creating or updating database tables', module_name)
314
    with openerp.osv.scope.Scope(cr, openerp.SUPERUSER_ID, None):
2007
314
    todo = []
315
        _logger.info('module %s: creating or updating database tables', module_name)
2008
315
    for obj in obj_list:
316
        todo = []
2009
316
        result = obj._auto_init(cr, {'module': module_name})
317
        for obj in obj_list:
2010
317
        if result:
318
            result = obj._auto_init(cr, {'module': module_name})
2011
318
            todo += result
319
            if result:
2012
319
        if hasattr(obj, 'init'):
320
                todo += result
2013
320
            obj.init(cr)
321
            if hasattr(obj, 'init'):
2014
321
        cr.commit()
322
                obj.init(cr)
2015
322
    for obj in obj_list:
323
            cr.commit()
2016
323
        obj._auto_end(cr, {'module': module_name})
324
        for obj in obj_list:
2017
324
        cr.commit()
325
            obj._auto_end(cr, {'module': module_name})
2018
325
    todo.sort()
326
            cr.commit()
2019
326
    for t in todo:
327
        todo.sort(key=lambda x: x[0])
2020
327
        t[1](cr, *t[2])
328
        for t in todo:
2021
328
    cr.commit()
329
            t[1](cr, *t[2])
2022
330
        cr.commit()
2023
329
331
2024
330
def load_openerp_module(module_name):
332
def load_openerp_module(module_name):
2025
331
    """ Load an OpenERP module, if not already loaded.
333
    """ Load an OpenERP module, if not already loaded.
2026
332
334
2027
=== modified file 'openerp/modules/registry.py'
2028
--- openerp/modules/registry.py	2013-11-20 10:25:45 +0000
2029
+++ openerp/modules/registry.py	2014-01-22 16:19:54 +0000
2030
@@ -27,12 +27,13 @@
2031
27
import logging
27
import logging
2032
28
import threading
28
import threading
2033
29
29
2034
30
from openerp import SUPERUSER_ID
2035
30
import openerp.sql_db
31
import openerp.sql_db
2036
31
import openerp.osv.orm
32
import openerp.osv.orm
2037
32
import openerp.tools
33
import openerp.tools
2038
33
import openerp.modules.db
34
import openerp.modules.db
2039
34
import openerp.tools.config
35
import openerp.tools.config
2041
35
from openerp.tools import assertion_report
36
from openerp.tools import assertion_report, lazy_property
2042
36
37
2043
37
_logger = logging.getLogger(__name__)
38
_logger = logging.getLogger(__name__)
2044
38
39
2045
@@ -49,6 +50,7 @@
2046
49
        self.models = {}    # model name/model instance mapping
50
        self.models = {}    # model name/model instance mapping
2047
50
        self._sql_error = {}
51
        self._sql_error = {}
2048
51
        self._store_function = {}
52
        self._store_function = {}
2049
53
        self._pure_function_fields = {}         # {model: [field, ...], ...}
2050
52
        self._init = True
54
        self._init = True
2051
53
        self._init_parent = {}
55
        self._init_parent = {}
2052
54
        self._assertion_report = assertion_report.assertion_report()
56
        self._assertion_report = assertion_report.assertion_report()
2053
@@ -94,14 +96,20 @@
2054
94
        """ Return an iterator over all model names. """
96
        """ Return an iterator over all model names. """
2055
95
        return iter(self.models)
97
        return iter(self.models)
2056
96
98
2057
97
    def __contains__(self, model_name):
2058
98
        """ Test whether the model with the given name exists. """
2059
99
        return model_name in self.models
2060
100
2061
101
    def __getitem__(self, model_name):
99
    def __getitem__(self, model_name):
2062
102
        """ Return the model with the given name or raise KeyError if it doesn't exist."""
100
        """ Return the model with the given name or raise KeyError if it doesn't exist."""
2063
103
        return self.models[model_name]
101
        return self.models[model_name]
2064
104
102
2065
103
    @lazy_property
2066
104
    def pure_function_fields(self):
2067
105
        """ Return the list of pure function fields (field objects) """
2068
106
        fields = []
2069
107
        for mname, fnames in self._pure_function_fields.iteritems():
2070
108
            model_fields = self[mname]._fields
2071
109
            for fname in fnames:
2072
110
                fields.append(model_fields[fname])
2073
111
        return fields
2074
112
2075
105
    def do_parent_store(self, cr):
113
    def do_parent_store(self, cr):
2076
106
        for o in self._init_parent:
114
        for o in self._init_parent:
2077
107
            self.get(o)._parent_store_compute(cr)
115
            self.get(o)._parent_store_compute(cr)
2078
@@ -125,14 +133,26 @@
2079
125
133
2080
126
        """
134
        """
2081
127
        models_to_load = [] # need to preserve loading order
135
        models_to_load = [] # need to preserve loading order
2090
128
        # Instantiate registered classes (via the MetaModel automatic discovery
136
        lazy_property.reset_all(self)
2091
129
        # or via explicit constructor call), and add them to the pool.
137
2092
130
        for cls in openerp.osv.orm.MetaModel.module_to_models.get(module.name, []):
138
        with openerp.osv.scope.Scope(cr, SUPERUSER_ID, None):
2093
131
            # models register themselves in self.models
139
            # call hook before adding stuff in the registry
2094
132
            model = cls.create_instance(self, cr)
140
            for model in self.models.itervalues():
2095
133
            if model._name not in models_to_load:
141
                model._before_registry_update()
2096
134
                # avoid double-loading models whose declaration is split
142
2097
135
                models_to_load.append(model._name)
143
            # Instantiate registered classes (via the MetaModel automatic discovery
2098
144
            # or via explicit constructor call), and add them to the pool.
2099
145
            for cls in openerp.osv.orm.MetaModel.module_to_models.get(module.name, []):
2100
146
                # models register themselves in self.models
2101
147
                model = cls._build_model(self, cr)
2102
148
                if model._name not in models_to_load:
2103
149
                    # avoid double-loading models whose declaration is split
2104
150
                    models_to_load.append(model._name)
2105
151
2106
152
            # call hook after models have been instantiated
2107
153
            for model in self.models.itervalues():
2108
154
                model._after_registry_update()
2109
155
2110
136
        return [self.models[m] for m in models_to_load]
156
        return [self.models[m] for m in models_to_load]
2111
137
157
2112
138
    def clear_caches(self):
158
    def clear_caches(self):
2113
@@ -144,7 +164,7 @@
2114
144
            model.clear_caches()
164
            model.clear_caches()
2115
145
        # Special case for ir_ui_menu which does not use openerp.tools.ormcache.
165
        # Special case for ir_ui_menu which does not use openerp.tools.ormcache.
2116
146
        ir_ui_menu = self.models.get('ir.ui.menu')
166
        ir_ui_menu = self.models.get('ir.ui.menu')
2118
147
        if ir_ui_menu:
167
        if ir_ui_menu is not None:
2119
148
            ir_ui_menu.clear_cache()
168
            ir_ui_menu.clear_cache()
2120
149
169
2121
150
170
2122
151
171
2123
=== modified file 'openerp/netsvc.py'
2124
--- openerp/netsvc.py	2013-05-28 10:27:33 +0000
2125
+++ openerp/netsvc.py	2014-01-22 16:19:54 +0000
2126
@@ -258,16 +258,12 @@
2127
258
        raise
258
        raise
2128
259
    except openerp.exceptions.DeferredException, e:
259
    except openerp.exceptions.DeferredException, e:
2129
260
        _logger.exception(tools.exception_to_unicode(e))
260
        _logger.exception(tools.exception_to_unicode(e))
2131
261
        post_mortem(e.traceback)
261
        tools.post_mortem(e.traceback)
2132
262
        raise
262
        raise
2133
263
    except Exception, e:
263
    except Exception, e:
2134
264
        _logger.exception(tools.exception_to_unicode(e))
264
        _logger.exception(tools.exception_to_unicode(e))
2136
265
        post_mortem(sys.exc_info())
265
        tools.post_mortem()
2137
266
        raise
266
        raise
2138
267
267
2139
268
def post_mortem(info):
2140
269
    if tools.config['debug_mode'] and isinstance(info[2], types.TracebackType):
2141
270
        import pdb
2142
271
        pdb.post_mortem(info[2])
2143
272
268
2144
273
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
269
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2145
274
270
2146
=== modified file 'openerp/osv/__init__.py'
2147
--- openerp/osv/__init__.py	2013-02-12 14:24:10 +0000
2148
+++ openerp/osv/__init__.py	2014-01-22 16:19:54 +0000
2149
@@ -19,9 +19,10 @@
2150
19
#
19
#
2151
20
##############################################################################
20
##############################################################################
2152
21
21
2153
22
import api
2154
22
import osv
23
import osv
2155
24
import scope
2156
23
import fields
25
import fields
2158
24
26
import fields2
2159
25
27
2160
26
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
28
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
2161
27
2162
28
29
2163
=== added file 'openerp/osv/api.py'
2164
--- openerp/osv/api.py	1970-01-01 00:00:00 +0000
2165
+++ openerp/osv/api.py	2014-01-22 16:19:54 +0000
2166
@@ -0,0 +1,760 @@
2167
1
# -*- coding: utf-8 -*-
2168
2
##############################################################################
2169
3
#
2170
4
#    OpenERP, Open Source Management Solution
2171
5
#    Copyright (C) 2013 OpenERP (<http://www.openerp.com>).
2172
6
#
2173
7
#    This program is free software: you can redistribute it and/or modify
2174
8
#    it under the terms of the GNU Affero General Public License as
2175
9
#    published by the Free Software Foundation, either version 3 of the
2176
10
#    License, or (at your option) any later version.
2177
11
#
2178
12
#    This program is distributed in the hope that it will be useful,
2179
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
2180
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2181
15
#    GNU Affero General Public License for more details.
2182
16
#
2183
17
#    You should have received a copy of the GNU Affero General Public License
2184
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
2185
19
#
2186
20
##############################################################################
2187
21
2188
22
""" This module provides the elements for managing two different API styles,
2189
23
    namely the "traditional" and "record" styles.
2190
24
2191
25
    In the "traditional" style, parameters like the database cursor, user id,
2192
26
    context dictionary and record ids (usually denoted as ``cr``, ``uid``,
2193
27
    ``context``, ``ids``) are passed explicitly to all methods. In the "record"
2194
28
    style, those parameters are hidden in an execution environment (a "scope")
2195
29
    and the methods only refer to model instances, which gives it a more object-
2196
30
    oriented feel.
2197
31
2198
32
    For instance, the statements::
2199
33
2200
34
        model = self.pool.get(MODEL)
2201
35
        ids = model.search(cr, uid, DOMAIN, context=context)
2202
36
        for rec in model.browse(cr, uid, ids, context=context):
2203
37
            print rec.name
2204
38
        model.write(cr, uid, ids, VALUES, context=context)
2205
39
2206
40
    may also be written as::
2207
41
2208
42
        with scope(cr, uid, context):       # cr, uid, context introduced once
2209
43
            model = scope[MODEL]            # scope proxies the current scope
2210
44
            recs = model.search(DOMAIN)     # search returns a recordset
2211
45
            for rec in recs:                # iterate over the records
2212
46
                print rec.name
2213
47
            recs.write(VALUES)              # update all records in recs
2214
48
2215
49
    Methods written in the "traditional" style are automatically decorated,
2216
50
    following some heuristics based on parameter names.
2217
51
"""
2218
52
2219
53
__all__ = [
2220
54
    'Meta', 'guess', 'noguess',
2221
55
    'model', 'multi', 'one',
2222
56
    'cr', 'cr_context', 'cr_uid', 'cr_uid_context',
2223
57
    'cr_uid_id', 'cr_uid_id_context', 'cr_uid_ids', 'cr_uid_ids_context',
2224
58
    'constrains', 'depends', 'returns',
2225
59
]
2226
60
2227
61
from functools import update_wrapper
2228
62
from inspect import getargspec
2229
63
import logging
2230
64
2231
65
_logger = logging.getLogger(__name__)
2232
66
2233
67
2234
68
#
2235
69
# The following attributes are used, and reflected on wrapping methods:
2236
70
#  - method._api: decorator function, used for re-applying decorator
2237
71
#  - method._constrains: set by @constrains, specifies constraint dependencies
2238
72
#  - method._depends: set by @depends, specifies compute dependencies
2239
73
#  - method._returns: set by @returns, specifies return model
2240
74
#  - method.clear_cache: set by @ormcache, used to clear the cache
2241
75
#
2242
76
# On wrapping method only:
2243
77
#  - method._orig: original method
2244
78
#
2245
79
2246
80
_WRAPPED_ATTRS = ('_api', '_constrains', '_depends', '_returns', 'clear_cache')
2247
81
2248
82
2249
83
class Meta(type):
2250
84
    """ Metaclass that automatically decorates traditional-style methods by
2251
85
        guessing their API. It also implements the inheritance of the
2252
86
        :func:`returns` decorators.
2253
87
    """
2254
88
2255
89
    def __new__(meta, name, bases, attrs):
2256
90
        # dummy parent class to catch overridden methods decorated with 'returns'
2257
91
        parent = type.__new__(meta, name, bases, {})
2258
92
2259
93
        for key, value in attrs.items():
2260
94
            if not key.startswith('__') and callable(value):
2261
95
                # make the method inherit from @returns decorators
2262
96
                if not _returns(value) and _returns(getattr(parent, key, None)):
2263
97
                    value = returns(getattr(parent, key))(value)
2264
98
                    _logger.debug("Method %s.%s inherited @returns%r",
2265
99
                                  name, value.__name__, _returns(value))
2266
100
2267
101
                # guess calling convention if none is given
2268
102
                if not hasattr(value, '_api'):
2269
103
                    value = guess(value)
2270
104
2271
105
                attrs[key] = value
2272
106
2273
107
        return type.__new__(meta, name, bases, attrs)
2274
108
2275
109
2276
110
def constrains(*args):
2277
111
    """ Return a decorator that specifies the field dependencies of a method
2278
112
        implementing a constraint checker. Each argument must be a field name.
2279
113
    """
2280
114
    def decorate(method):
2281
115
        method._constrains = args
2282
116
        return method
2283
117
2284
118
    return decorate
2285
119
2286
120
2287
121
def depends(*args):
2288
122
    """ Return a decorator that specifies the field dependencies of a "compute"
2289
123
        method (for new-style function fields). Each argument must be a string
2290
124
        that consists in a dot-separated sequence of field names.
2291
125
2292
126
        One may also pass a single function as argument. In that case, the
2293
127
        dependencies are given by calling the function with the field's model.
2294
128
    """
2295
129
    if args and callable(args[0]):
2296
130
        args = args[0]
2297
131
2298
132
    def decorate(method):
2299
133
        method._depends = args
2300
134
        return method
2301
135
2302
136
    return decorate
2303
137
2304
138
2305
139
def returns(model, traditional=None):
2306
140
    """ Return a decorator for methods that return instances of `model`.
2307
141
2308
142
        :param model: a model name, ``'self'`` for the current model, or a method
2309
143
            (in which case the model is taken from that method's decorator)
2310
144
2311
145
        :param traditional: a function `convert(self, value)` to convert the
2312
146
            record-style value to the traditional-style output
2313
147
2314
148
        The decorator adapts the method output to the api style: `id`, `ids` or
2315
149
        ``False`` for the traditional style, and record, recordset or null for
2316
150
        the record style::
2317
151
2318
152
            @model
2319
153
            @returns('res.partner')
2320
154
            def find_partner(self, arg):
2321
155
                ...     # return some record
2322
156
2323
157
            # output depends on call style: traditional vs record style
2324
158
            partner_id = model.find_partner(cr, uid, arg, context=context)
2325
159
            partner_record = model.find_partner(arg)
2326
160
2327
161
        Note that the decorated method must satisfy that convention.
2328
162
2329
163
        Those decorators are automatically *inherited*: a method that overrides
2330
164
        a decorated existing method will be decorated with the same
2331
165
        ``@returns(model)``.
2332
166
    """
2333
167
    if callable(model):
2334
168
        # model is a method, check its own @returns decoration
2335
169
        spec = _returns(model)
2336
170
        if not spec:
2337
171
            return lambda method: method
2338
172
    else:
2339
173
        spec = model, traditional
2340
174
2341
175
    def decorate(method):
2342
176
        if hasattr(method, '_orig'):
2343
177
            # decorate the original method, and re-apply the api decorator
2344
178
            origin = method._orig
2345
179
            origin._returns = spec
2346
180
            return origin._api(origin)
2347
181
        else:
2348
182
            method._returns = spec
2349
183
            return method
2350
184
2351
185
    return decorate
2352
186
2353
187
2354
188
def _returns(method):
2355
189
    return getattr(method, '_returns', None)
2356
190
2357
191
2358
192
# constant converters
2359
193
_CONVERT_PASS = lambda self, value: value
2360
194
_CONVERT_BROWSE = lambda self, value: self.browse(value)
2361
195
_CONVERT_UNBROWSE = lambda self, value: value.unbrowse()
2362
196
2363
197
2364
198
def _converter_to_old(method):
2365
199
    """ Return a function `convert(self, value)` that adapts `value` from
2366
200
        record-style to traditional-style returning convention of `method`.
2367
201
    """
2368
202
    spec = _returns(method)
2369
203
    if spec:
2370
204
        model, traditional = spec
2371
205
        return traditional or _CONVERT_UNBROWSE
2372
206
    else:
2373
207
        return _CONVERT_PASS
2374
208
2375
209
2376
210
def _converter_to_new(method):
2377
211
    """ Return a function `convert(self, value)` that adapts `value` from
2378
212
        traditional-style to record-style returning convention of `method`.
2379
213
    """
2380
214
    spec = _returns(method)
2381
215
    if spec:
2382
216
        model, traditional = spec
2383
217
        if model == 'self':
2384
218
            return _CONVERT_BROWSE
2385
219
        else:
2386
220
            return lambda self, value: self.pool[model].browse(value)
2387
221
    else:
2388
222
        return _CONVERT_PASS
2389
223
2390
224
2391
225
def _aggregator_one(method):
2392
226
    """ Return a function `convert(self, value)` that aggregates record-style
2393
227
        `value` for a method decorated with ``@one``.
2394
228
    """
2395
229
    spec = _returns(method)
2396
230
    if spec:
2397
231
        # value is a list of instances, concatenate them
2398
232
        model, traditional = spec
2399
233
        if model == 'self':
2400
234
            return lambda self, value: sum(value, self.browse())
2401
235
        else:
2402
236
            return lambda self, value: sum(value, self.pool[model].browse())
2403
237
    else:
2404
238
        return _CONVERT_PASS
2405
239
2406
240
2407
241
def wraps(method):
2408
242
    """ Return a decorator for an api wrapper of `method`. """
2409
243
    def decorate(wrapper):
2410
244
        # propagate '__module__', '__name__', '__doc__' to wrapper
2411
245
        update_wrapper(wrapper, method)
2412
246
        # propagate specific openerp attributes to wrapper
2413
247
        for attr in _WRAPPED_ATTRS:
2414
248
            if hasattr(method, attr):
2415
249
                setattr(wrapper, attr, getattr(method, attr))
2416
250
        wrapper._orig = method
2417
251
        return wrapper
2418
252
2419
253
    return decorate
2420
254
2421
255
2422
256
def _has_cursor(args, kwargs):
2423
257
    """ test whether `args` or `kwargs` contain a cursor argument """
2424
258
    cr = args[0] if args else kwargs.get('cr')
2425
259
    return isinstance(cr, Cursor)
2426
260
2427
261
2428
262
def _cr_uid_context_splitter(method):
2429
263
    """ return a function that splits scope parameters from the other arguments """
2430
264
    names = getargspec(method).args[1:]
2431
265
    ctx_pos = len(names) + 2
2432
266
2433
267
    def split(args, kwargs):
2434
268
        cr, uid = args[:2]
2435
269
        if ctx_pos < len(args):
2436
270
            return cr, uid, args[ctx_pos], args[2:ctx_pos], kwargs
2437
271
        else:
2438
272
            return cr, uid, kwargs.pop('context', None), args[2:], kwargs
2439
273
2440
274
    return split
2441
275
2442
276
2443
277
def _cr_uid_ids_context_splitter(method):
2444
278
    """ return a function that splits scope parameters from the other arguments """
2445
279
    names = getargspec(method).args[1:]
2446
280
    ctx_pos = len(names) + 3
2447
281
2448
282
    def split(args, kwargs):
2449
283
        cr, uid, ids = args[:3]
2450
284
        if ctx_pos < len(args):
2451
285
            return cr, uid, ids, args[ctx_pos], args[3:ctx_pos], kwargs
2452
286
        else:
2453
287
            return cr, uid, ids, kwargs.pop('context', None), args[3:], kwargs
2454
288
2455
289
    return split
2456
290
2457
291
2458
292
def _scope_cr_getter(method):
2459
293
    """ return a function that makes the scope corresponding to parameters """
2460
294
    names = getargspec(method).args
2461
295
    cr_name = len(names) > 1 and names[1]
2462
296
2463
297
    def get(args, kwargs):
2464
298
        cr = args[0] if args else kwargs[cr_name]
2465
299
        return Scope(cr, SUPERUSER_ID, None)
2466
300
2467
301
    return get
2468
302
2469
303
2470
304
def _scope_cr_uid_getter(method):
2471
305
    """ return a function that makes the scope corresponding to parameters """
2472
306
    names = getargspec(method).args
2473
307
    cr_name = len(names) > 1 and names[1]
2474
308
    uid_name = len(names) > 2 and names[2]
2475
309
2476
310
    def get(args, kwargs):
2477
311
        nargs = len(args)
2478
312
        cr = args[0] if nargs > 0 else kwargs[cr_name]
2479
313
        uid = args[1] if nargs > 1 else kwargs[uid_name]
2480
314
        return Scope(cr, uid, None)
2481
315
2482
316
    return get
2483
317
2484
318
2485
319
def _scope_cr_context_getter(method):
2486
320
    """ return a function that makes the scope corresponding to parameters """
2487
321
    names = getargspec(method).args
2488
322
    cr_name = len(names) > 1 and names[1]
2489
323
    ctx_pos = names.index('context') - 1 if 'context' in names else 1024
2490
324
2491
325
    def get(args, kwargs):
2492
326
        nargs = len(args)
2493
327
        cr = args[0] if nargs > 0 else kwargs[cr_name]
2494
328
        context = args[ctx_pos] if nargs > ctx_pos else kwargs.get('context')
2495
329
        return Scope(cr, SUPERUSER_ID, context)
2496
330
2497
331
    return get
2498
332
2499
333
2500
334
def _scope_cr_uid_context_getter(method):
2501
335
    """ return a function that makes the scope corresponding to parameters """
2502
336
    names = getargspec(method).args
2503
337
    cr_name = len(names) > 1 and names[1]
2504
338
    uid_name = len(names) > 2 and names[2]
2505
339
    ctx_pos = names.index('context') - 1 if 'context' in names else 1024
2506
340
2507
341
    def get(args, kwargs):
2508
342
        nargs = len(args)
2509
343
        cr = args[0] if nargs > 0 else kwargs[cr_name]
2510
344
        uid = args[1] if nargs > 1 else kwargs[uid_name]
2511
345
        context = args[ctx_pos] if nargs > ctx_pos else kwargs.get('context')
2512
346
        return Scope(cr, uid, context)
2513
347
2514
348
    return get
2515
349
2516
350
2517
351
def model(method):
2518
352
    """ Decorate a record-style method where `self` is any instance with scope
2519
353
        (model, record or recordset). Such a method::
2520
354
2521
355
            @api.model
2522
356
            def method(self, args):
2523
357
                ...
2524
358
2525
359
        may be called in both record and traditional styles, like::
2526
360
2527
361
            model.method(args)
2528
362
            model.method(cr, uid, args, context=context)
2529
363
    """
2530
364
    method._api = model
2531
365
    split_args = _cr_uid_context_splitter(method)
2532
366
    new_to_old = _converter_to_old(method)
2533
367
2534
368
    @wraps(method)
2535
369
    def model_wrapper(self, *args, **kwargs):
2536
370
        if _has_cursor(args, kwargs):
2537
371
            cr, uid, context, args, kwargs = split_args(args, kwargs)
2538
372
            with Scope(cr, uid, context):
2539
373
                value = method(self, *args, **kwargs)
2540
374
                return new_to_old(self, value)
2541
375
        else:
2542
376
            return method(self, *args, **kwargs)
2543
377
2544
378
    return model_wrapper
2545
379
2546
380
2547
381
def multi(method):
2548
382
    """ Decorate a record-style method where `self` is a recordset. Such a
2549
383
        method::
2550
384
2551
385
            @api.multi
2552
386
            def method(self, args):
2553
387
                ...
2554
388
2555
389
        may be called in both record and traditional styles, like::
2556
390
2557
391
            recs = model.browse(ids)
2558
392
2559
393
            # the following calls are equivalent
2560
394
            recs.method(args)
2561
395
            model.method(cr, uid, ids, args, context=context)
2562
396
    """
2563
397
    method._api = multi
2564
398
    split_args = _cr_uid_ids_context_splitter(method)
2565
399
    new_to_old = _converter_to_old(method)
2566
400
2567
401
    @wraps(method)
2568
402
    def multi_wrapper(self, *args, **kwargs):
2569
403
        if _has_cursor(args, kwargs):
2570
404
            cr, uid, ids, context, args, kwargs = split_args(args, kwargs)
2571
405
            with Scope(cr, uid, context):
2572
406
                value = method(self.browse(ids), *args, **kwargs)
2573
407
                return new_to_old(self, value)
2574
408
        else:
2575
409
            return method(self, *args, **kwargs)
2576
410
2577
411
    return multi_wrapper
2578
412
2579
413
2580
414
def one(method):
2581
415
    """ Decorate a record-style method where `self` is expected to be a
2582
416
        singleton instance. The decorated method automatically loops on records,
2583
417
        and makes a list with the results. In case the method is decorated with
2584
418
        @returns, it concatenates the resulting instances. Such a method::
2585
419
2586
420
            @api.one
2587
421
            def method(self, args):
2588
422
                return self.name
2589
423
2590
424
        may be called in both record and traditional styles, like::
2591
425
2592
426
            recs = model.browse(ids)
2593
427
2594
428
            # the following calls are equivalent and return a list of names
2595
429
            recs.method(args)
2596
430
            model.method(cr, uid, recs.unbrowse(), args, context=context)
2597
431
    """
2598
432
    method._api = one
2599
433
    split_args = _cr_uid_ids_context_splitter(method)
2600
434
    new_to_old = _converter_to_old(method)
2601
435
    aggregate = _aggregator_one(method)
2602
436
2603
437
    @wraps(method)
2604
438
    def one_wrapper(self, *args, **kwargs):
2605
439
        if _has_cursor(args, kwargs):
2606
440
            cr, uid, ids, context, args, kwargs = split_args(args, kwargs)
2607
441
            with Scope(cr, uid, context):
2608
442
                value = [method(rec, *args, **kwargs) for rec in self.browse(ids)]
2609
443
                return new_to_old(self, aggregate(self, value))
2610
444
        else:
2611
445
            value = [method(rec, *args, **kwargs) for rec in self]
2612
446
            return aggregate(self, value)
2613
447
2614
448
    return one_wrapper
2615
449
2616
450
2617
451
def cr(method):
2618
452
    """ Decorate a traditional-style method that takes `cr` as a parameter.
2619
453
        Such a method may be called in both record and traditional styles, like::
2620
454
2621
455
            obj.method(args)            # record style
2622
456
            obj.method(cr, args)        # traditional style
2623
457
    """
2624
458
    method._api = cr
2625
459
    get_scope = _scope_cr_getter(method)
2626
460
    old_to_new = _converter_to_new(method)
2627
461
2628
462
    @wraps(method)
2629
463
    def cr_wrapper(self, *args, **kwargs):
2630
464
        if _has_cursor(args, kwargs):
2631
465
            with get_scope(args, kwargs):
2632
466
                return method(self, *args, **kwargs)
2633
467
        else:
2634
468
            value = method(self, scope.cr, *args, **kwargs)
2635
469
            return old_to_new(self, value)
2636
470
2637
471
    return cr_wrapper
2638
472
2639
473
2640
474
def cr_context(method):
2641
475
    """ Decorate a traditional-style method that takes `cr`, `context` as parameters. """
2642
476
    method._api = cr_context
2643
477
    get_scope = _scope_cr_context_getter(method)
2644
478
    old_to_new = _converter_to_new(method)
2645
479
2646
480
    @wraps(method)
2647
481
    def cr_context_wrapper(self, *args, **kwargs):
2648
482
        if _has_cursor(args, kwargs):
2649
483
            with get_scope(args, kwargs):
2650
484
                return method(self, *args, **kwargs)
2651
485
        else:
2652
486
            cr, _, context = scope.args
2653
487
            kwargs['context'] = context
2654
488
            value = method(self, cr, *args, **kwargs)
2655
489
            return old_to_new(self, value)
2656
490
2657
491
    return cr_context_wrapper
2658
492
2659
493
2660
494
def cr_uid(method):
2661
495
    """ Decorate a traditional-style method that takes `cr`, `uid` as parameters. """
2662
496
    method._api = cr_uid
2663
497
    get_scope = _scope_cr_uid_getter(method)
2664
498
    old_to_new = _converter_to_new(method)
2665
499
2666
500
    @wraps(method)
2667
501
    def cr_uid_wrapper(self, *args, **kwargs):
2668
502
        if _has_cursor(args, kwargs):
2669
503
            with get_scope(args, kwargs):
2670
504
                return method(self, *args, **kwargs)
2671
505
        else:
2672
506
            cr, uid, _ = scope.args
2673
507
            value = method(self, cr, uid, *args, **kwargs)
2674
508
            return old_to_new(self, value)
2675
509
2676
510
    return cr_uid_wrapper
2677
511
2678
512
2679
513
def cr_uid_context(method):
2680
514
    """ Decorate a traditional-style method that takes `cr`, `uid`, `context` as
2681
515
        parameters. Such a method may be called in both record and traditional
2682
516
        styles, like::
2683
517
2684
518
            obj.method(args)
2685
519
            obj.method(cr, uid, args, context=context)
2686
520
    """
2687
521
    method._api = cr_uid_context
2688
522
    get_scope = _scope_cr_uid_context_getter(method)
2689
523
    old_to_new = _converter_to_new(method)
2690
524
2691
525
    @wraps(method)
2692
526
    def cr_uid_context_wrapper(self, *args, **kwargs):
2693
527
        if _has_cursor(args, kwargs):
2694
528
            with get_scope(args, kwargs):
2695
529
                return method(self, *args, **kwargs)
2696
530
        else:
2697
531
            cr, uid, context = scope.args
2698
532
            kwargs['context'] = context
2699
533
            value = method(self, cr, uid, *args, **kwargs)
2700
534
            return old_to_new(self, value)
2701
535
2702
536
    return cr_uid_context_wrapper
2703
537
2704
538
2705
539
def cr_uid_id(method):
2706
540
    """ Decorate a traditional-style method that takes `cr`, `uid`, `id` as
2707
541
        parameters. Such a method may be called in both record and traditional
2708
542
        styles. In the record style, the method automatically loops on records.
2709
543
    """
2710
544
    method._api = cr_uid_id
2711
545
    get_scope = _scope_cr_uid_getter(method)
2712
546
    old_to_new = _converter_to_new(method)
2713
547
2714
548
    @wraps(method)
2715
549
    def cr_uid_id_wrapper(self, *args, **kwargs):
2716
550
        if _has_cursor(args, kwargs):
2717
551
            with get_scope(args, kwargs):
2718
552
                return method(self, *args, **kwargs)
2719
553
        else:
2720
554
            cr, uid, _ = scope.args
2721
555
            value = [method(self, cr, uid, id, *args, **kwargs) for id in self.unbrowse()]
2722
556
            return old_to_new(self, value)
2723
557
2724
558
    return cr_uid_id_wrapper
2725
559
2726
560
2727
561
def cr_uid_id_context(method):
2728
562
    """ Decorate a traditional-style method that takes `cr`, `uid`, `id`,
2729
563
        `context` as parameters. Such a method::
2730
564
2731
565
            @api.cr_uid_id
2732
566
            def method(self, cr, uid, id, args, context=None):
2733
567
                ...
2734
568
2735
569
        may be called in both record and traditional styles, like::
2736
570
2737
571
            rec = model.browse(id)
2738
572
2739
573
            # the following calls are equivalent
2740
574
            rec.method(args)
2741
575
            model.method(cr, uid, id, args, context=context)
2742
576
    """
2743
577
    method._api = cr_uid_id_context
2744
578
    get_scope = _scope_cr_uid_context_getter(method)
2745
579
    old_to_new = _converter_to_new(method)
2746
580
2747
581
    @wraps(method)
2748
582
    def cr_uid_id_context_wrapper(self, *args, **kwargs):
2749
583
        if _has_cursor(args, kwargs):
2750
584
            with get_scope(args, kwargs):
2751
585
                return method(self, *args, **kwargs)
2752
586
        else:
2753
587
            cr, uid, context = scope.args
2754
588
            kwargs['context'] = context
2755
589
            value = [method(self, cr, uid, id, *args, **kwargs) for id in self.unbrowse()]
2756
590
            return old_to_new(self, value)
2757
591
2758
592
    return cr_uid_id_context_wrapper
2759
593
2760
594
2761
595
def cr_uid_ids(method):
2762
596
    """ Decorate a traditional-style method that takes `cr`, `uid`, `ids` as
2763
597
        parameters. Such a method may be called in both record and traditional
2764
598
        styles.
2765
599
    """
2766
600
    method._api = cr_uid_ids
2767
601
    get_scope = _scope_cr_uid_getter(method)
2768
602
    old_to_new = _converter_to_new(method)
2769
603
2770
604
    @wraps(method)
2771
605
    def cr_uid_ids_wrapper(self, *args, **kwargs):
2772
606
        if _has_cursor(args, kwargs):
2773
607
            with get_scope(args, kwargs):
2774
608
                return method(self, *args, **kwargs)
2775
609
        else:
2776
610
            cr, uid, _ = scope.args
2777
611
            value = method(self, cr, uid, self.unbrowse(), *args, **kwargs)
2778
612
            return old_to_new(self, value)
2779
613
2780
614
    return cr_uid_ids_wrapper
2781
615
2782
616
2783
617
def cr_uid_ids_context(method):
2784
618
    """ Decorate a traditional-style method that takes `cr`, `uid`, `ids`,
2785
619
        `context` as parameters. Such a method::
2786
620
2787
621
            @api.cr_uid_ids_context
2788
622
            def method(self, cr, uid, ids, args, context=None):
2789
623
                ...
2790
624
2791
625
        may be called in both record and traditional styles, like::
2792
626
2793
627
            recs = model.browse(ids)
2794
628
2795
629
            # the following calls are equivalent
2796
630
            recs.method(args)
2797
631
            model.method(cr, uid, ids, args, context=context)
2798
632
2799
633
        It is generally not necessary, see :func:`guess`.
2800
634
    """
2801
635
    method._api = cr_uid_ids_context
2802
636
    get_scope = _scope_cr_uid_context_getter(method)
2803
637
    old_to_new = _converter_to_new(method)
2804
638
2805
639
    @wraps(method)
2806
640
    def cr_uid_ids_context_wrapper(self, *args, **kwargs):
2807
641
        if _has_cursor(args, kwargs):
2808
642
            with get_scope(args, kwargs):
2809
643
                return method(self, *args, **kwargs)
2810
644
        else:
2811
645
            cr, uid, context = scope.args
2812
646
            kwargs['context'] = context
2813
647
            value = method(self, cr, uid, self.unbrowse(), *args, **kwargs)
2814
648
            return old_to_new(self, value)
2815
649
2816
650
    return cr_uid_ids_context_wrapper
2817
651
2818
652
2819
653
def _make_wrapper(method, old_api, new_api):
2820
654
    @wraps(method)
2821
655
    def wrapper(self, *args, **kwargs):
2822
656
        if _has_cursor(args, kwargs):
2823
657
            return old_api(self, *args, **kwargs)
2824
658
        else:
2825
659
            return new_api(self, *args, **kwargs)
2826
660
    return wrapper
2827
661
2828
662
2829
663
def old(method):
2830
664
    """ Decorate `method` so that it accepts the old-style api only. The
2831
665
        returned wrapper provides a decorator `new` for the corresponding
2832
666
        new-style api implementation; the result combines both implementations.
2833
667
        This is useful to provide explicitly both implementations of a method.::
2834
668
2835
669
            @old
2836
670
            def stuff(self, cr, uid, context=None):
2837
671
                ...
2838
672
2839
673
            @stuff.new
2840
674
            def stuff(self):
2841
675
                ...
2842
676
    """
2843
677
    wrapper = _make_wrapper(method, method, None)
2844
678
    wrapper.new = lambda new_api: _make_wrapper(method, method, new_api)
2845
679
    return wrapper
2846
680
2847
681
2848
682
def new(method):
2849
683
    """ Decorate `method` so that it accepts the new-style api only. The
2850
684
        returned wrapper provides a decorator `old` for the corresponding
2851
685
        old-style api implementation; the result combines both implementations.
2852
686
        This is useful to provide explicitly both implementations of a method.::
2853
687
2854
688
            @new
2855
689
            def stuff(self):
2856
690
                ...
2857
691
2858
692
            @stuff.old
2859
693
            def stuff(self, cr, uid, context=None):
2860
694
                ...
2861
695
    """
2862
696
    wrapper = _make_wrapper(method, None, method)
2863
697
    wrapper.old = lambda old_api: _make_wrapper(method, old_api, method)
2864
698
    return wrapper
2865
699
2866
700
2867
701
def noguess(method):
2868
702
    """ Decorate a method to prevent any effect from :func:`guess`. """
2869
703
    method._api = False
2870
704
    return method
2871
705
2872
706
2873
707
def guess(method):
2874
708
    """ Decorate `method` to make it callable in both traditional and record
2875
709
        styles. This decorator is applied automatically by the model's
2876
710
        metaclass, and has no effect on already-decorated methods.
2877
711
2878
712
        The API style is determined by heuristics on the parameter names: ``cr``
2879
713
        or ``cursor`` for the cursor, ``uid`` or ``user`` for the user id,
2880
714
        ``id`` or ``ids`` for a list of record ids, and ``context`` for the
2881
715
        context dictionary. If a traditional API is recognized, one of the
2882
716
        decorators :func:`cr`, :func:`cr_context`, :func:`cr_uid`,
2883
717
        :func:`cr_uid_context`, :func:`cr_uid_id`, :func:`cr_uid_id_context`,
2884
718
        :func:`cr_uid_ids`, :func:`cr_uid_ids_context` is applied on the method.
2885
719
2886
720
        Method calls are considered traditional style when their first parameter
2887
721
        is a database cursor.
2888
722
    """
2889
723
    # introspection on argument names to determine api style
2890
724
    names = tuple(getargspec(method).args) + (None,) * 4
2891
725
2892
726
    if names[0] == 'self':
2893
727
        if names[1] in ('cr', 'cursor'):
2894
728
            if names[2] in ('uid', 'user'):
2895
729
                if names[3] == 'ids':
2896
730
                    if 'context' in names:
2897
731
                        return cr_uid_ids_context(method)
2898
732
                    else:
2899
733
                        return cr_uid_ids(method)
2900
734
                elif names[3] == 'id':
2901
735
                    if 'context' in names:
2902
736
                        return cr_uid_id_context(method)
2903
737
                    else:
2904
738
                        return cr_uid_id(method)
2905
739
                elif 'context' in names:
2906
740
                    return cr_uid_context(method)
2907
741
                else:
2908
742
                    return cr_uid(method)
2909
743
            elif 'context' in names:
2910
744
                return cr_context(method)
2911
745
            else:
2912
746
                return cr(method)
2913
747
2914
748
    # no wrapping by default
2915
749
    return noguess(method)
2916
750
2917
751
2918
752
def expected(decorator, func):
2919
753
    """ Decorate `func` with `decorator` if `func` is not wrapped yet. """
2920
754
    return decorator(func) if not hasattr(func, '_orig') else func
2921
755
2922
756
2923
757
# keep those imports here in order to handle cyclic dependencies correctly
2924
758
from openerp import SUPERUSER_ID
2925
759
from openerp.osv.scope import Scope, proxy as scope
2926
760
from openerp.sql_db import Cursor
2927
0
761
2928
=== modified file 'openerp/osv/expression.py'
2929
--- openerp/osv/expression.py	2014-01-15 20:53:57 +0000
2930
+++ openerp/osv/expression.py	2014-01-22 16:19:54 +0000
2931
@@ -137,7 +137,7 @@
2932
137
137
2933
138
import openerp.modules
138
import openerp.modules
2934
139
from openerp.osv import fields
139
from openerp.osv import fields
2936
140
from openerp.osv.orm import MAGIC_COLUMNS
140
from openerp.osv.orm import MAGIC_COLUMNS, BaseModel
2937
141
import openerp.tools as tools
141
import openerp.tools as tools
2938
142
142
2939
143
143
2940
@@ -512,7 +512,7 @@
2941
512
                    in the condition (i.e. in many2one); this link is used to
512
                    in the condition (i.e. in many2one); this link is used to
2942
513
                    compute aliases
513
                    compute aliases
2943
514
        """
514
        """
2945
515
        assert model, 'Invalid leaf creation without table'
515
        assert isinstance(model, BaseModel), 'Invalid leaf creation without table'
2946
516
        self.join_context = join_context or []
516
        self.join_context = join_context or []
2947
517
        self.leaf = leaf
517
        self.leaf = leaf
2948
518
        # normalize the leaf's operator
518
        # normalize the leaf's operator
2949
@@ -673,20 +673,23 @@
2950
673
            - the leaf is added to the result
673
            - the leaf is added to the result
2951
674
674
2952
675
            Some internal var explanation:
675
            Some internal var explanation:
2954
676
                :var obj working_model: model object, model containing the field
676
                :var list path: left operand seen as a sequence of field names
2955
677
                    ("foo.bar" -> ["foo", "bar"])
2956
678
                :var obj model: model object, model containing the field
2957
677
                    (the name provided in the left operand)
679
                    (the name provided in the left operand)
2961
678
                :var list field_path: left operand seen as a path (foo.bar -> [foo, bar])
680
                :var obj field: the field corresponding to `path[0]`
2962
679
                :var obj relational_model: relational model of a field (field._obj)
681
                :var obj column: the column corresponding to `path[0]`
2963
680
                    ex: res_partner.bank_ids -> res.partner.bank
682
                :var obj comodel: relational model of field (field.comodel)
2964
683
                    (res_partner.bank_ids -> res.partner.bank)
2965
681
        """
684
        """
2966
682
685
2968
683
        def to_ids(value, relational_model, context=None, limit=None):
686
        def to_ids(value, comodel, context=None, limit=None):
2969
684
            """ Normalize a single id or name, or a list of those, into a list of ids
687
            """ Normalize a single id or name, or a list of those, into a list of ids
2970
685
                :param {int,long,basestring,list,tuple} value:
688
                :param {int,long,basestring,list,tuple} value:
2971
686
                    if int, long -> return [value]
689
                    if int, long -> return [value]
2972
687
                    if basestring, convert it into a list of basestrings, then
690
                    if basestring, convert it into a list of basestrings, then
2973
688
                    if list of basestring ->
691
                    if list of basestring ->
2975
689
                        perform a name_search on relational_model for each name
692
                        perform a name_search on comodel for each name
2976
690
                        return the list of related ids
693
                        return the list of related ids
2977
691
            """
694
            """
2978
692
            names = []
695
            names = []
2979
@@ -697,7 +700,7 @@
2980
697
            elif isinstance(value, (int, long)):
700
            elif isinstance(value, (int, long)):
2981
698
                return [value]
701
                return [value]
2982
699
            if names:
702
            if names:
2984
700
                name_get_list = [name_get[0] for name in names for name_get in relational_model.name_search(cr, uid, name, [], 'ilike', context=context, limit=limit)]
703
                name_get_list = [name_get[0] for name in names for name_get in comodel.name_search(cr, uid, name, [], 'ilike', context=context, limit=limit)]
2985
701
                return list(set(name_get_list))
704
                return list(set(name_get_list))
2986
702
            return list(value)
705
            return list(value)
2987
703
706
2988
@@ -747,7 +750,6 @@
2989
747
            leaf = pop()
750
            leaf = pop()
2990
748
751
2991
749
            # Get working variables
752
            # Get working variables
2992
750
            working_model = leaf.model
2993
751
            if leaf.is_operator():
753
            if leaf.is_operator():
2994
752
                left, operator, right = leaf.leaf, None, None
754
                left, operator, right = leaf.leaf, None, None
2995
753
            elif leaf.is_true_leaf() or leaf.is_false_leaf():
755
            elif leaf.is_true_leaf() or leaf.is_false_leaf():
2996
@@ -755,12 +757,12 @@
2997
755
                left, operator, right = ('%s' % leaf.leaf[0], leaf.leaf[1], leaf.leaf[2])
757
                left, operator, right = ('%s' % leaf.leaf[0], leaf.leaf[1], leaf.leaf[2])
2998
756
            else:
758
            else:
2999
757
                left, operator, right = leaf.leaf
759
                left, operator, right = leaf.leaf
3006
758
            field_path = left.split('.', 1)
760
            path = left.split('.', 1)
3007
759
            field = working_model._columns.get(field_path[0])
761
3008
760
            if field and field._obj:
762
            model = leaf.model
3009
761
                relational_model = working_model.pool[field._obj]
763
            field = model._fields.get(path[0])
3010
762
            else:
764
            column = model._columns.get(path[0])
3011
763
                relational_model = None
765
            comodel = getattr(field, 'comodel', None)
3012
764
766
3013
765
            # ----------------------------------------
767
            # ----------------------------------------
3014
766
            # SIMPLE CASE
768
            # SIMPLE CASE
3015
@@ -783,22 +785,22 @@
3016
783
            # -> else: crash
785
            # -> else: crash
3017
784
            # ----------------------------------------
786
            # ----------------------------------------
3018
785
787
3020
786
            elif not field and field_path[0] in working_model._inherit_fields:
788
            elif not column and path[0] in model._inherit_fields:
3021
787
                # comments about inherits'd fields
789
                # comments about inherits'd fields
3022
788
                #  { 'field_name': ('parent_model', 'm2o_field_to_reach_parent',
790
                #  { 'field_name': ('parent_model', 'm2o_field_to_reach_parent',
3023
789
                #                    field_column_obj, origina_parent_model), ... }
791
                #                    field_column_obj, origina_parent_model), ... }
3026
790
                next_model = working_model.pool[working_model._inherit_fields[field_path[0]][0]]
792
                next_model = model.pool[model._inherit_fields[path[0]][0]]
3027
791
                leaf.add_join_context(next_model, working_model._inherits[next_model._name], 'id', working_model._inherits[next_model._name])
793
                leaf.add_join_context(next_model, model._inherits[next_model._name], 'id', model._inherits[next_model._name])
3028
792
                push(leaf)
794
                push(leaf)
3029
793
795
3030
794
            elif left == 'id' and operator == 'child_of':
796
            elif left == 'id' and operator == 'child_of':
3033
795
                ids2 = to_ids(right, working_model, context)
797
                ids2 = to_ids(right, model, context)
3034
796
                dom = child_of_domain(left, ids2, working_model)
798
                dom = child_of_domain(left, ids2, model)
3035
797
                for dom_leaf in reversed(dom):
799
                for dom_leaf in reversed(dom):
3037
798
                    new_leaf = create_substitution_leaf(leaf, dom_leaf, working_model)
800
                    new_leaf = create_substitution_leaf(leaf, dom_leaf, model)
3038
799
                    push(new_leaf)
801
                    push(new_leaf)
3039
800
802
3041
801
            elif not field and field_path[0] in MAGIC_COLUMNS:
803
            elif not column and path[0] in MAGIC_COLUMNS:
3042
802
                push_result(leaf)
804
                push_result(leaf)
3043
803
805
3044
804
            elif not field:
806
            elif not field:
3045
@@ -807,70 +809,88 @@
3046
807
            # ----------------------------------------
809
            # ----------------------------------------
3047
808
            # PATH SPOTTED
810
            # PATH SPOTTED
3048
809
            # -> many2one or one2many with _auto_join:
811
            # -> many2one or one2many with _auto_join:
3050
810
            #    - add a join, then jump into linked field: field.remaining on
812
            #    - add a join, then jump into linked column: column.remaining on
3051
811
            #      src_table is replaced by remaining on dst_table, and set for re-evaluation
813
            #      src_table is replaced by remaining on dst_table, and set for re-evaluation
3053
812
            #    - if a domain is defined on the field, add it into evaluation
814
            #    - if a domain is defined on the column, add it into evaluation
3054
813
            #      on the relational table
815
            #      on the relational table
3055
814
            # -> many2one, many2many, one2many: replace by an equivalent computed
816
            # -> many2one, many2many, one2many: replace by an equivalent computed
3056
815
            #    domain, given by recursively searching on the remaining of the path
817
            #    domain, given by recursively searching on the remaining of the path
3059
816
            # -> note: hack about fields.property should not be necessary anymore
818
            # -> note: hack about columns.property should not be necessary anymore
3060
817
            #    as after transforming the field, it will go through this loop once again
819
            #    as after transforming the column, it will go through this loop once again
3061
818
            # ----------------------------------------
820
            # ----------------------------------------
3062
819
821
3064
820
            elif len(field_path) > 1 and field._type == 'many2one' and field._auto_join:
822
            elif len(path) > 1 and column._type == 'many2one' and column._auto_join:
3065
821
                # res_partner.state_id = res_partner__state_id.id
823
                # res_partner.state_id = res_partner__state_id.id
3068
822
                leaf.add_join_context(relational_model, field_path[0], 'id', field_path[0])
824
                leaf.add_join_context(comodel, path[0], 'id', path[0])
3069
823
                push(create_substitution_leaf(leaf, (field_path[1], operator, right), relational_model))
825
                push(create_substitution_leaf(leaf, (path[1], operator, right), comodel))
3070
824
826
3072
825
            elif len(field_path) > 1 and field._type == 'one2many' and field._auto_join:
827
            elif len(path) > 1 and column._type == 'one2many' and column._auto_join:
3073
826
                # res_partner.id = res_partner__bank_ids.partner_id
828
                # res_partner.id = res_partner__bank_ids.partner_id
3077
827
                leaf.add_join_context(relational_model, 'id', field._fields_id, field_path[0])
829
                leaf.add_join_context(comodel, 'id', column._fields_id, path[0])
3078
828
                domain = field._domain(working_model) if callable(field._domain) else field._domain
830
                domain = column._domain(model) if callable(column._domain) else column._domain
3079
829
                push(create_substitution_leaf(leaf, (field_path[1], operator, right), relational_model))
831
                push(create_substitution_leaf(leaf, (path[1], operator, right), comodel))
3080
830
                if domain:
832
                if domain:
3081
831
                    domain = normalize_domain(domain)
833
                    domain = normalize_domain(domain)
3082
832
                    for elem in reversed(domain):
834
                    for elem in reversed(domain):
3092
833
                        push(create_substitution_leaf(leaf, elem, relational_model))
835
                        push(create_substitution_leaf(leaf, elem, comodel))
3093
834
                    push(create_substitution_leaf(leaf, AND_OPERATOR, relational_model))
836
                    push(create_substitution_leaf(leaf, AND_OPERATOR, comodel))
3094
835
837
3095
836
            elif len(field_path) > 1 and field._auto_join:
838
            elif len(path) > 1 and column._auto_join:
3096
837
                raise NotImplementedError('_auto_join attribute not supported on many2many field %s' % left)
839
                raise NotImplementedError('_auto_join attribute not supported on many2many column %s' % left)
3097
838
840
3098
839
            elif len(field_path) > 1 and field._type == 'many2one':
841
            elif len(path) > 1 and column._type == 'many2one':
3099
840
                right_ids = relational_model.search(cr, uid, [(field_path[1], operator, right)], context=context)
842
                right_ids = comodel.search(cr, uid, [(path[1], operator, right)], context=context)
3100
841
                leaf.leaf = (field_path[0], 'in', right_ids)
843
                leaf.leaf = (path[0], 'in', right_ids)
3101
842
                push(leaf)
844
                push(leaf)
3102
843
845
3107
844
            # Making search easier when there is a left operand as field.o2m or field.m2m
846
            # Making search easier when there is a left operand as column.o2m or column.m2m
3108
845
            elif len(field_path) > 1 and field._type in ['many2many', 'one2many']:
847
            elif len(path) > 1 and column._type in ['many2many', 'one2many']:
3109
846
                right_ids = relational_model.search(cr, uid, [(field_path[1], operator, right)], context=context)
848
                right_ids = comodel.search(cr, uid, [(path[1], operator, right)], context=context)
3110
847
                table_ids = working_model.search(cr, uid, [(field_path[0], 'in', right_ids)], context=dict(context, active_test=False))
849
                table_ids = model.search(cr, uid, [(path[0], 'in', right_ids)], context=dict(context, active_test=False))
3111
848
                leaf.leaf = ('id', 'in', table_ids)
850
                leaf.leaf = ('id', 'in', table_ids)
3112
849
                push(leaf)
851
                push(leaf)
3113
850
852
3114
853
            elif not field.store:
3115
854
                # Non-stored field should provide an implementation of search.
3116
855
                if not field.search:
3117
856
                    # field does not support search!
3118
857
                    _logger.error("Non-stored field %s cannot be searched.", field)
3119
858
                    if _logger.isEnabledFor(logging.DEBUG):
3120
859
                        _logger.debug(''.join(traceback.format_stack()))
3121
860
                    # Ignore it: generate a dummy leaf.
3122
861
                    domain = []
3123
862
                else:
3124
863
                    # Let the field generate a domain.
3125
864
                    domain = field.determine_domain(operator, right)
3126
865
3127
866
                if not domain:
3128
867
                    leaf.leaf = TRUE_LEAF
3129
868
                    push(leaf)
3130
869
                else:
3131
870
                    for elem in reversed(domain):
3132
871
                        push(create_substitution_leaf(leaf, elem, model))
3133
872
3134
851
            # -------------------------------------------------
873
            # -------------------------------------------------
3135
852
            # FUNCTION FIELD
874
            # FUNCTION FIELD
3136
853
            # -> not stored: error if no _fnct_search, otherwise handle the result domain
875
            # -> not stored: error if no _fnct_search, otherwise handle the result domain
3137
854
            # -> stored: management done in the remaining of parsing
876
            # -> stored: management done in the remaining of parsing
3138
855
            # -------------------------------------------------
877
            # -------------------------------------------------
3139
856
878
3141
857
            elif isinstance(field, fields.function) and not field.store and not field._fnct_search:
879
            elif isinstance(column, fields.function) and not column.store:
3142
858
                # this is a function field that is not stored
880
                # this is a function field that is not stored
3154
859
                # the function field doesn't provide a search function and doesn't store
881
                if not column._fnct_search:
3155
860
                # values in the database, so we must ignore it : we generate a dummy leaf
882
                    _logger.error(
3156
861
                leaf.leaf = TRUE_LEAF
883
                        "Field '%s' (%s) can not be searched: "
3157
862
                _logger.error(
884
                        "non-stored function field without fnct_search",
3158
863
                    "The field '%s' (%s) can not be searched: non-stored "
885
                        column.string, left)
3159
864
                    "function field without fnct_search",
886
                    # avoid compiling stack trace if not needed
3160
865
                    field.string, left)
887
                    if _logger.isEnabledFor(logging.DEBUG):
3161
866
                # avoid compiling stack trace if not needed
888
                        _logger.debug(''.join(traceback.format_stack()))
3162
867
                if _logger.isEnabledFor(logging.DEBUG):
889
                    # ignore it: generate a dummy leaf
3163
868
                    _logger.debug(''.join(traceback.format_stack()))
890
                    fct_domain = []
3164
869
                push(leaf)
891
                else:
3165
892
                    fct_domain = column.search(cr, uid, model, left, [leaf.leaf], context=context)
3166
870
893
3167
871
            elif isinstance(field, fields.function) and not field.store:
3168
872
                # this is a function field that is not stored
3169
873
                fct_domain = field.search(cr, uid, working_model, left, [leaf.leaf], context=context)
3170
874
                if not fct_domain:
894
                if not fct_domain:
3171
875
                    leaf.leaf = TRUE_LEAF
895
                    leaf.leaf = TRUE_LEAF
3172
876
                    push(leaf)
896
                    push(leaf)
3173
@@ -878,30 +898,30 @@
3174
878
                    # we assume that the expression is valid
898
                    # we assume that the expression is valid
3175
879
                    # we create a dummy leaf for forcing the parsing of the resulting expression
899
                    # we create a dummy leaf for forcing the parsing of the resulting expression
3176
880
                    for domain_element in reversed(fct_domain):
900
                    for domain_element in reversed(fct_domain):
3180
881
                        push(create_substitution_leaf(leaf, domain_element, working_model))
901
                        push(create_substitution_leaf(leaf, domain_element, model))
3181
882
                    # self.push(create_substitution_leaf(leaf, TRUE_LEAF, working_model))
902
                    # self.push(create_substitution_leaf(leaf, TRUE_LEAF, model))
3182
883
                    # self.push(create_substitution_leaf(leaf, AND_OPERATOR, working_model))
903
                    # self.push(create_substitution_leaf(leaf, AND_OPERATOR, model))
3183
884
904
3184
885
            # -------------------------------------------------
905
            # -------------------------------------------------
3185
886
            # RELATIONAL FIELDS
906
            # RELATIONAL FIELDS
3186
887
            # -------------------------------------------------
907
            # -------------------------------------------------
3187
888
908
3188
889
            # Applying recursivity on field(one2many)
909
            # Applying recursivity on field(one2many)
3193
890
            elif field._type == 'one2many' and operator == 'child_of':
910
            elif column._type == 'one2many' and operator == 'child_of':
3194
891
                ids2 = to_ids(right, relational_model, context)
911
                ids2 = to_ids(right, comodel, context)
3195
892
                if field._obj != working_model._name:
912
                if column._obj != model._name:
3196
893
                    dom = child_of_domain(left, ids2, relational_model, prefix=field._obj)
913
                    dom = child_of_domain(left, ids2, comodel, prefix=column._obj)
3197
894
                else:
914
                else:
3199
895
                    dom = child_of_domain('id', ids2, working_model, parent=left)
915
                    dom = child_of_domain('id', ids2, model, parent=left)
3200
896
                for dom_leaf in reversed(dom):
916
                for dom_leaf in reversed(dom):
3202
897
                    push(create_substitution_leaf(leaf, dom_leaf, working_model))
917
                    push(create_substitution_leaf(leaf, dom_leaf, model))
3203
898
918
3205
899
            elif field._type == 'one2many':
919
            elif column._type == 'one2many':
3206
900
                call_null = True
920
                call_null = True
3207
901
921
3208
902
                if right is not False:
922
                if right is not False:
3209
903
                    if isinstance(right, basestring):
923
                    if isinstance(right, basestring):
3211
904
                        ids2 = [x[0] for x in relational_model.name_search(cr, uid, right, [], operator, context=context, limit=None)]
924
                        ids2 = [x[0] for x in comodel.name_search(cr, uid, right, [], operator, context=context, limit=None)]
3212
905
                        if ids2:
925
                        if ids2:
3213
906
                            operator = 'in'
926
                            operator = 'in'
3214
907
                    else:
927
                    else:
3215
@@ -913,36 +933,36 @@
3216
913
                        if operator in ['like', 'ilike', 'in', '=']:
933
                        if operator in ['like', 'ilike', 'in', '=']:
3217
914
                            #no result found with given search criteria
934
                            #no result found with given search criteria
3218
915
                            call_null = False
935
                            call_null = False
3220
916
                            push(create_substitution_leaf(leaf, FALSE_LEAF, working_model))
936
                            push(create_substitution_leaf(leaf, FALSE_LEAF, model))
3221
917
                    else:
937
                    else:
3223
918
                        ids2 = select_from_where(cr, field._fields_id, relational_model._table, 'id', ids2, operator)
938
                        ids2 = select_from_where(cr, column._fields_id, comodel._table, 'id', ids2, operator)
3224
919
                        if ids2:
939
                        if ids2:
3225
920
                            call_null = False
940
                            call_null = False
3226
921
                            o2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
941
                            o2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
3228
922
                            push(create_substitution_leaf(leaf, ('id', o2m_op, ids2), working_model))
942
                            push(create_substitution_leaf(leaf, ('id', o2m_op, ids2), model))
3229
923
943
3230
924
                if call_null:
944
                if call_null:
3231
925
                    o2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
945
                    o2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
3233
926
                    push(create_substitution_leaf(leaf, ('id', o2m_op, select_distinct_from_where_not_null(cr, field._fields_id, relational_model._table)), working_model))
946
                    push(create_substitution_leaf(leaf, ('id', o2m_op, select_distinct_from_where_not_null(cr, column._fields_id, comodel._table)), model))
3234
927
947
3237
928
            elif field._type == 'many2many':
948
            elif column._type == 'many2many':
3238
929
                rel_table, rel_id1, rel_id2 = field._sql_names(working_model)
949
                rel_table, rel_id1, rel_id2 = column._sql_names(model)
3239
930
                #FIXME
950
                #FIXME
3240
931
                if operator == 'child_of':
951
                if operator == 'child_of':
3241
932
                    def _rec_convert(ids):
952
                    def _rec_convert(ids):
3243
933
                        if relational_model == working_model:
953
                        if comodel == model:
3244
934
                            return ids
954
                            return ids
3245
935
                        return select_from_where(cr, rel_id1, rel_table, rel_id2, ids, operator)
955
                        return select_from_where(cr, rel_id1, rel_table, rel_id2, ids, operator)
3246
936
956
3251
937
                    ids2 = to_ids(right, relational_model, context)
957
                    ids2 = to_ids(right, comodel, context)
3252
938
                    dom = child_of_domain('id', ids2, relational_model)
958
                    dom = child_of_domain('id', ids2, comodel)
3253
939
                    ids2 = relational_model.search(cr, uid, dom, context=context)
959
                    ids2 = comodel.search(cr, uid, dom, context=context)
3254
940
                    push(create_substitution_leaf(leaf, ('id', 'in', _rec_convert(ids2)), working_model))
960
                    push(create_substitution_leaf(leaf, ('id', 'in', _rec_convert(ids2)), model))
3255
941
                else:
961
                else:
3256
942
                    call_null_m2m = True
962
                    call_null_m2m = True
3257
943
                    if right is not False:
963
                    if right is not False:
3258
944
                        if isinstance(right, basestring):
964
                        if isinstance(right, basestring):
3260
945
                            res_ids = [x[0] for x in relational_model.name_search(cr, uid, right, [], operator, context=context)]
965
                            res_ids = [x[0] for x in comodel.name_search(cr, uid, right, [], operator, context=context)]
3261
946
                            if res_ids:
966
                            if res_ids:
3262
947
                                operator = 'in'
967
                                operator = 'in'
3263
948
                        else:
968
                        else:
3264
@@ -954,29 +974,29 @@
3265
954
                            if operator in ['like', 'ilike', 'in', '=']:
974
                            if operator in ['like', 'ilike', 'in', '=']:
3266
955
                                #no result found with given search criteria
975
                                #no result found with given search criteria
3267
956
                                call_null_m2m = False
976
                                call_null_m2m = False
3269
957
                                push(create_substitution_leaf(leaf, FALSE_LEAF, working_model))
977
                                push(create_substitution_leaf(leaf, FALSE_LEAF, model))
3270
958
                            else:
978
                            else:
3271
959
                                operator = 'in'  # operator changed because ids are directly related to main object
979
                                operator = 'in'  # operator changed because ids are directly related to main object
3272
960
                        else:
980
                        else:
3273
961
                            call_null_m2m = False
981
                            call_null_m2m = False
3274
962
                            m2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
982
                            m2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
3276
963
                            push(create_substitution_leaf(leaf, ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, operator) or [0]), working_model))
983
                            push(create_substitution_leaf(leaf, ('id', m2m_op, select_from_where(cr, rel_id1, rel_table, rel_id2, res_ids, operator) or [0]), model))
3277
964
984
3278
965
                    if call_null_m2m:
985
                    if call_null_m2m:
3279
966
                        m2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
986
                        m2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'
3281
967
                        push(create_substitution_leaf(leaf, ('id', m2m_op, select_distinct_from_where_not_null(cr, rel_id1, rel_table)), working_model))
987
                        push(create_substitution_leaf(leaf, ('id', m2m_op, select_distinct_from_where_not_null(cr, rel_id1, rel_table)), model))
3282
968
988
3284
969
            elif field._type == 'many2one':
989
            elif column._type == 'many2one':
3285
970
                if operator == 'child_of':
990
                if operator == 'child_of':
3289
971
                    ids2 = to_ids(right, relational_model, context)
991
                    ids2 = to_ids(right, comodel, context)
3290
972
                    if field._obj != working_model._name:
992
                    if column._obj != model._name:
3291
973
                        dom = child_of_domain(left, ids2, relational_model, prefix=field._obj)
993
                        dom = child_of_domain(left, ids2, comodel, prefix=column._obj)
3292
974
                    else:
994
                    else:
3294
975
                        dom = child_of_domain('id', ids2, working_model, parent=left)
995
                        dom = child_of_domain('id', ids2, model, parent=left)
3295
976
                    for dom_leaf in reversed(dom):
996
                    for dom_leaf in reversed(dom):
3297
977
                        push(create_substitution_leaf(leaf, dom_leaf, working_model))
997
                        push(create_substitution_leaf(leaf, dom_leaf, model))
3298
978
                else:
998
                else:
3300
979
                    def _get_expression(relational_model, cr, uid, left, right, operator, context=None):
999
                    def _get_expression(comodel, cr, uid, left, right, operator, context=None):
3301
980
                        if context is None:
1000
                        if context is None:
3302
981
                            context = {}
1001
                            context = {}
3303
982
                        c = context.copy()
1002
                        c = context.copy()
3304
@@ -991,14 +1011,14 @@
3305
991
                            operator = dict_op[operator]
1011
                            operator = dict_op[operator]
3306
992
                        elif isinstance(right, list) and operator in ['!=', '=']:  # for domain (FIELD,'=',['value1','value2'])
1012
                        elif isinstance(right, list) and operator in ['!=', '=']:  # for domain (FIELD,'=',['value1','value2'])
3307
993
                            operator = dict_op[operator]
1013
                            operator = dict_op[operator]
3309
994
                        res_ids = [x[0] for x in relational_model.name_search(cr, uid, right, [], operator, limit=None, context=c)]
1014
                        res_ids = [x[0] for x in comodel.name_search(cr, uid, right, [], operator, limit=None, context=c)]
3310
995
                        if operator in NEGATIVE_TERM_OPERATORS:
1015
                        if operator in NEGATIVE_TERM_OPERATORS:
3311
996
                            res_ids.append(False)  # TODO this should not be appended if False was in 'right'
1016
                            res_ids.append(False)  # TODO this should not be appended if False was in 'right'
3312
997
                        return left, 'in', res_ids
1017
                        return left, 'in', res_ids
3313
998
                    # resolve string-based m2o criterion into IDs
1018
                    # resolve string-based m2o criterion into IDs
3314
999
                    if isinstance(right, basestring) or \
1019
                    if isinstance(right, basestring) or \
3315
1000
                            right and isinstance(right, (tuple, list)) and all(isinstance(item, basestring) for item in right):
1020
                            right and isinstance(right, (tuple, list)) and all(isinstance(item, basestring) for item in right):
3317
1001
                        push(create_substitution_leaf(leaf, _get_expression(relational_model, cr, uid, left, right, operator, context=context), working_model))
1021
                        push(create_substitution_leaf(leaf, _get_expression(comodel, cr, uid, left, right, operator, context=context), model))
3318
1002
                    else:
1022
                    else:
3319
1003
                        # right == [] or right == False and all other cases are handled by __leaf_to_sql()
1023
                        # right == [] or right == False and all other cases are handled by __leaf_to_sql()
3320
1004
                        push_result(leaf)
1024
                        push_result(leaf)
3321
@@ -1006,19 +1026,19 @@
3322
1006
            # -------------------------------------------------
1026
            # -------------------------------------------------
3323
1007
            # OTHER FIELDS
1027
            # OTHER FIELDS
3324
1008
            # -> datetime fields: manage time part of the datetime
1028
            # -> datetime fields: manage time part of the datetime
3326
1009
            #    field when it is not there
1029
            #    column when it is not there
3327
1010
            # -> manage translatable fields
1030
            # -> manage translatable fields
3328
1011
            # -------------------------------------------------
1031
            # -------------------------------------------------
3329
1012
1032
3330
1013
            else:
1033
            else:
3332
1014
                if field._type == 'datetime' and right and len(right) == 10:
1034
                if column._type == 'datetime' and right and len(right) == 10:
3333
1015
                    if operator in ('>', '>=', '='):
1035
                    if operator in ('>', '>=', '='):
3334
1016
                        right += ' 00:00:00'
1036
                        right += ' 00:00:00'
3335
1017
                    elif operator in ('<', '<='):
1037
                    elif operator in ('<', '<='):
3336
1018
                        right += ' 23:59:59'
1038
                        right += ' 23:59:59'
3338
1019
                    push(create_substitution_leaf(leaf, (left, operator, right), working_model))
1039
                    push(create_substitution_leaf(leaf, (left, operator, right), model))
3339
1020
1040
3341
1021
                elif field.translate:
1041
                elif column.translate:
3342
1022
                    need_wildcard = operator in ('like', 'ilike', 'not like', 'not ilike')
1042
                    need_wildcard = operator in ('like', 'ilike', 'not like', 'not ilike')
3343
1023
                    sql_operator = {'=like': 'like', '=ilike': 'ilike'}.get(operator, operator)
1043
                    sql_operator = {'=like': 'like', '=ilike': 'ilike'}.get(operator, operator)
3344
1024
                    if need_wildcard:
1044
                    if need_wildcard:
3345
@@ -1042,22 +1062,22 @@
3346
1042
                        subselect += '     AND value ' + sql_operator + ' ' + " (" + instr + ")"   \
1062
                        subselect += '     AND value ' + sql_operator + ' ' + " (" + instr + ")"   \
3347
1043
                             ') UNION ('                \
1063
                             ') UNION ('                \
3348
1044
                             '  SELECT id'              \
1064
                             '  SELECT id'              \
3350
1045
                             '    FROM "' + working_model._table + '"'       \
1065
                             '    FROM "' + model._table + '"'       \
3351
1046
                             '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
1066
                             '   WHERE "' + left + '" ' + sql_operator + ' ' + " (" + instr + "))"
3352
1047
                    else:
1067
                    else:
3353
1048
                        subselect += '     AND value ' + sql_operator + instr +   \
1068
                        subselect += '     AND value ' + sql_operator + instr +   \
3354
1049
                             ') UNION ('                \
1069
                             ') UNION ('                \
3355
1050
                             '  SELECT id'              \
1070
                             '  SELECT id'              \
3357
1051
                             '    FROM "' + working_model._table + '"'       \
1071
                             '    FROM "' + model._table + '"'       \
3358
1052
                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
1072
                             '   WHERE "' + left + '" ' + sql_operator + instr + ")"
3359
1053
1073
3361
1054
                    params = [working_model._name + ',' + left,
1074
                    params = [model._name + ',' + left,
3362
1055
                              context.get('lang', False) or 'en_US',
1075
                              context.get('lang', False) or 'en_US',
3363
1056
                              'model',
1076
                              'model',
3364
1057
                              right,
1077
                              right,
3365
1058
                              right,
1078
                              right,
3366
1059
                             ]
1079
                             ]
3368
1060
                    push(create_substitution_leaf(leaf, ('id', inselect_operator, (subselect, params)), working_model))
1080
                    push(create_substitution_leaf(leaf, ('id', inselect_operator, (subselect, params)), model))
3369
1061
1081
3370
1062
                else:
1082
                else:
3371
1063
                    push_result(leaf)
1083
                    push_result(leaf)
3372
1064
1084
3373
=== modified file 'openerp/osv/fields.py'
3374
--- openerp/osv/fields.py	2014-01-15 20:53:57 +0000
3375
+++ openerp/osv/fields.py	2014-01-22 16:19:54 +0000
3376
@@ -93,6 +93,9 @@
3377
93
        """
93
        """
3378
94
        if domain is None:
94
        if domain is None:
3379
95
            domain = []
95
            domain = []
3380
96
        elif callable(domain):
3381
97
            from openerp import api
3382
98
            domain = api.expected(api.cr_uid_context, domain)
3383
96
        if context is None:
99
        if context is None:
3384
97
            context = {}
100
            context = {}
3385
98
        self.states = states or {}
101
        self.states = states or {}
3386
@@ -117,7 +120,35 @@
3387
117
        self.deprecated = False # Optional deprecation warning
120
        self.deprecated = False # Optional deprecation warning
3388
118
        for a in args:
121
        for a in args:
3389
119
            setattr(self, a, args[a])
122
            setattr(self, a, args[a])
3391
120
 
123
3392
124
        # prefetch only if self._classic_write, not self.groups, and not
3393
125
        # self.deprecated
3394
126
        if not self._classic_write or self.groups or self.deprecated:
3395
127
            self._prefetch = False
3396
128
3397
129
    def to_field(self):
3398
130
        """ convert column `self` to a new-style field """
3399
131
        from openerp.osv.fields2 import Field
3400
132
        return Field.by_type[self._type](**self.to_field_args())
3401
133
3402
134
    def to_field_args(self):
3403
135
        """ return a dictionary with all the arguments to pass to the field """
3404
136
        items = [
3405
137
            ('interface_for', self),            # field interfaces self
3406
138
            ('string', self.string),
3407
139
            ('help', self.help),
3408
140
            ('readonly', self.readonly),
3409
141
            ('required', self.required),
3410
142
            ('states', self.states),
3411
143
            ('groups', self.groups),
3412
144
            ('size', self.size),
3413
145
            ('ondelete', self.ondelete),
3414
146
            ('translate', self.translate),
3415
147
            ('domain', self._domain),
3416
148
            ('context', self._context),
3417
149
        ]
3418
150
        return dict(item for item in items if items[1])
3419
151
3420
121
    def restart(self):
152
    def restart(self):
3421
122
        pass
153
        pass
3422
123
154
3423
@@ -182,8 +213,16 @@
3424
182
    _classic_read = False # post-process to handle missing target
213
    _classic_read = False # post-process to handle missing target
3425
183
214
3426
184
    def __init__(self, string, selection, size=None, **args):
215
    def __init__(self, string, selection, size=None, **args):
3427
216
        if callable(selection):
3428
217
            from openerp import api
3429
218
            selection = api.expected(api.cr_uid_context, selection)
3430
185
        _column.__init__(self, string=string, size=size, selection=selection, **args)
219
        _column.__init__(self, string=string, size=size, selection=selection, **args)
3431
186
220
3432
221
    def to_field_args(self):
3433
222
        args = super(reference, self).to_field_args()
3434
223
        args['selection'] = self.selection
3435
224
        return args
3436
225
3437
187
    def get(self, cr, obj, ids, name, uid=None, context=None, values=None):
226
    def get(self, cr, obj, ids, name, uid=None, context=None, values=None):
3438
188
        result = {}
227
        result = {}
3439
189
        # copy initial values fetched previously.
228
        # copy initial values fetched previously.
3440
@@ -231,7 +270,6 @@
3441
231
        self._symbol_f = self._symbol_set_char = lambda x: _symbol_set_char(self, x)
270
        self._symbol_f = self._symbol_set_char = lambda x: _symbol_set_char(self, x)
3442
232
        self._symbol_set = (self._symbol_c, self._symbol_f)
271
        self._symbol_set = (self._symbol_c, self._symbol_f)
3443
233
272
3444
234
3445
235
class text(_column):
273
class text(_column):
3446
236
    _type = 'text'
274
    _type = 'text'
3447
237
275
3448
@@ -260,6 +298,11 @@
3449
260
        # synopsis: digits_compute(cr) ->  (precision, scale)
298
        # synopsis: digits_compute(cr) ->  (precision, scale)
3450
261
        self.digits_compute = digits_compute
299
        self.digits_compute = digits_compute
3451
262
300
3452
301
    def to_field_args(self):
3453
302
        args = super(float, self).to_field_args()
3454
303
        args['digits'] = self.digits_compute or self.digits
3455
304
        return args
3456
305
3457
263
    def digits_change(self, cr):
306
    def digits_change(self, cr):
3458
264
        if self.digits_compute:
307
        if self.digits_compute:
3459
265
            self.digits = self.digits_compute(cr)
308
            self.digits = self.digits_compute(cr)
3460
@@ -321,7 +364,8 @@
3461
321
        if context and context.get('tz'):
364
        if context and context.get('tz'):
3462
322
            tz_name = context['tz']  
365
            tz_name = context['tz']  
3463
323
        else:
366
        else:
3465
324
            tz_name = model.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
367
            user = model.pool['res.users'].browse(cr, SUPERUSER_ID, uid)
3466
368
            tz_name = user.tz
3467
325
        if tz_name:
369
        if tz_name:
3468
326
            try:
370
            try:
3469
327
                utc = pytz.timezone('UTC')
371
                utc = pytz.timezone('UTC')
3470
@@ -385,7 +429,8 @@
3471
385
            tz_name = context['tz']  
429
            tz_name = context['tz']  
3472
386
        else:
430
        else:
3473
387
            registry = openerp.modules.registry.RegistryManager.get(cr.dbname)
431
            registry = openerp.modules.registry.RegistryManager.get(cr.dbname)
3475
388
            tz_name = registry.get('res.users').read(cr, SUPERUSER_ID, uid, ['tz'])['tz']
432
            user = registry['res.users'].browse(cr, SUPERUSER_ID, uid)
3476
433
            tz_name = user.tz
3477
389
        if tz_name:
434
        if tz_name:
3478
390
            try:
435
            try:
3479
391
                utc = pytz.timezone('UTC')
436
                utc = pytz.timezone('UTC')
3480
@@ -448,9 +493,17 @@
3481
448
    _type = 'selection'
493
    _type = 'selection'
3482
449
494
3483
450
    def __init__(self, selection, string='unknown', **args):
495
    def __init__(self, selection, string='unknown', **args):
3484
496
        if callable(selection):
3485
497
            from openerp import api
3486
498
            selection = api.expected(api.cr_uid_context, selection)
3487
451
        _column.__init__(self, string=string, **args)
499
        _column.__init__(self, string=string, **args)
3488
452
        self.selection = selection
500
        self.selection = selection
3489
453
501
3490
502
    def to_field_args(self):
3491
503
        args = super(selection, self).to_field_args()
3492
504
        args['selection'] = self.selection
3493
505
        return args
3494
506
3495
454
# ---------------------------------------------------------
507
# ---------------------------------------------------------
3496
455
# Relationals fields
508
# Relationals fields
3497
456
# ---------------------------------------------------------
509
# ---------------------------------------------------------
3498
@@ -477,6 +530,12 @@
3499
477
        self._obj = obj
530
        self._obj = obj
3500
478
        self._auto_join = auto_join
531
        self._auto_join = auto_join
3501
479
532
3502
533
    def to_field_args(self):
3503
534
        args = super(many2one, self).to_field_args()
3504
535
        args['comodel_name'] = self._obj
3505
536
        args['auto_join'] = self._auto_join
3506
537
        return args
3507
538
3508
480
    def get(self, cr, obj, ids, name, user=None, context=None, values=None):
539
    def get(self, cr, obj, ids, name, user=None, context=None, values=None):
3509
481
        if context is None:
540
        if context is None:
3510
482
            context = {}
541
            context = {}
3511
@@ -530,7 +589,6 @@
3512
530
    def search(self, cr, obj, args, name, value, offset=0, limit=None, uid=None, context=None):
589
    def search(self, cr, obj, args, name, value, offset=0, limit=None, uid=None, context=None):
3513
531
        return obj.pool[self._obj].search(cr, uid, args+self._domain+[('name', 'like', value)], offset, limit, context=context)
590
        return obj.pool[self._obj].search(cr, uid, args+self._domain+[('name', 'like', value)], offset, limit, context=context)
3514
532
591
3515
533
    
3516
534
    @classmethod
592
    @classmethod
3517
535
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
593
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
3518
536
        return value[1] if isinstance(value, tuple) else tools.ustr(value) 
594
        return value[1] if isinstance(value, tuple) else tools.ustr(value) 
3519
@@ -551,26 +609,34 @@
3520
551
        #one2many can't be used as condition for defaults
609
        #one2many can't be used as condition for defaults
3521
552
        assert(self.change_default != True)
610
        assert(self.change_default != True)
3522
553
611
3523
612
    def to_field_args(self):
3524
613
        args = super(one2many, self).to_field_args()
3525
614
        args['comodel_name'] = self._obj
3526
615
        args['inverse_name'] = self._fields_id
3527
616
        args['auto_join'] = self._auto_join
3528
617
        args['limit'] = self._limit
3529
618
        return args
3530
619
3531
554
    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
620
    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
3532
555
        if context is None:
3533
556
            context = {}
3534
557
        if self._context:
621
        if self._context:
3551
558
            context = context.copy()
622
            context = dict(context or {})
3552
559
        context.update(self._context)
623
            context.update(self._context)
3553
560
        if values is None:
624
3554
561
            values = {}
625
        with Scope(cr, user, context):
3555
562
626
            res = dict((id, []) for id in ids)
3556
563
        res = {}
627
3557
564
        for id in ids:
628
            comodel = obj.pool[self._obj]
3558
565
            res[id] = []
629
            inverse = self._fields_id
3559
566
630
            domain = self._domain
3560
567
        domain = self._domain(obj) if callable(self._domain) else self._domain
631
            if callable(domain):
3561
568
        model = obj.pool[self._obj]
632
                domain = domain(obj)
3562
569
        ids2 = model.search(cr, user, domain + [(self._fields_id, 'in', ids)], limit=self._limit, context=context)
633
            domain = domain + [(inverse, 'in', ids)]
3563
570
        for r in model._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
634
3564
571
            if r[self._fields_id] in res:
635
            for record in comodel.search(domain, limit=self._limit):
3565
572
                res[r[self._fields_id]].append(r['id'])
636
                assert int(record[inverse]) in res
3566
573
        return res
637
                res[int(record[inverse])].append(record.id)
3567
638
3568
639
            return res
3569
574
640
3570
575
    def set(self, cr, obj, id, field, values, user=None, context=None):
641
    def set(self, cr, obj, id, field, values, user=None, context=None):
3571
576
        result = []
642
        result = []
3572
@@ -632,7 +698,6 @@
3573
632
        domain = self._domain(obj) if callable(self._domain) else self._domain
698
        domain = self._domain(obj) if callable(self._domain) else self._domain
3574
633
        return obj.pool[self._obj].name_search(cr, uid, value, domain, operator, context=context,limit=limit)
699
        return obj.pool[self._obj].name_search(cr, uid, value, domain, operator, context=context,limit=limit)
3575
634
700
3576
635
    
3577
636
    @classmethod
701
    @classmethod
3578
637
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
702
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
3579
638
        raise NotImplementedError('One2Many columns should not be used as record name (_rec_name)') 
703
        raise NotImplementedError('One2Many columns should not be used as record name (_rec_name)') 
3580
@@ -691,6 +756,15 @@
3581
691
        self._id2 = id2
756
        self._id2 = id2
3582
692
        self._limit = limit
757
        self._limit = limit
3583
693
758
3584
759
    def to_field_args(self):
3585
760
        args = super(many2many, self).to_field_args()
3586
761
        args['comodel_name'] = self._obj
3587
762
        args['relation'] = self._rel
3588
763
        args['column1'] = self._id1
3589
764
        args['column2'] = self._id2
3590
765
        args['limit'] = self._limit
3591
766
        return args
3592
767
3593
694
    def _sql_names(self, source_model):
768
    def _sql_names(self, source_model):
3594
695
        """Return the SQL names defining the structure of the m2m relationship table
769
        """Return the SQL names defining the structure of the m2m relationship table
3595
696
770
3596
@@ -1084,6 +1158,9 @@
3597
1084
1158
3598
1085
        self.digits = args.get('digits', (16,2))
1159
        self.digits = args.get('digits', (16,2))
3599
1086
        self.digits_compute = args.get('digits_compute', None)
1160
        self.digits_compute = args.get('digits_compute', None)
3600
1161
        if callable(args.get('selection')):
3601
1162
            from openerp import api
3602
1163
            self.selection = api.expected(api.cr_uid_context, args['selection'])
3603
1087
1164
3604
1088
        self._fnct_inv_arg = fnct_inv_arg
1165
        self._fnct_inv_arg = fnct_inv_arg
3605
1089
        if not fnct_inv:
1166
        if not fnct_inv:
3606
@@ -1105,25 +1182,26 @@
3607
1105
            else:
1182
            else:
3608
1106
                self._prefetch = True
1183
                self._prefetch = True
3609
1107
1184
3610
1108
        if type == 'float':
3611
1109
            self._symbol_c = float._symbol_c
3612
1110
            self._symbol_f = float._symbol_f
3613
1111
            self._symbol_set = float._symbol_set
3614
1112
3615
1113
        if type == 'boolean':
3616
1114
            self._symbol_c = boolean._symbol_c
3617
1115
            self._symbol_f = boolean._symbol_f
3618
1116
            self._symbol_set = boolean._symbol_set
3619
1117
3620
1118
        if type == 'integer':
3621
1119
            self._symbol_c = integer._symbol_c
3622
1120
            self._symbol_f = integer._symbol_f
3623
1121
            self._symbol_set = integer._symbol_set
3624
1122
3625
1123
        if type == 'char':
1185
        if type == 'char':
3626
1124
            self._symbol_c = char._symbol_c
1186
            self._symbol_c = char._symbol_c
3627
1125
            self._symbol_f = lambda x: _symbol_set_char(self, x)
1187
            self._symbol_f = lambda x: _symbol_set_char(self, x)
3628
1126
            self._symbol_set = (self._symbol_c, self._symbol_f)
1188
            self._symbol_set = (self._symbol_c, self._symbol_f)
3629
1189
        else:
3630
1190
            type_class = globals().get(type)
3631
1191
            if type_class is not None:
3632
1192
                self._symbol_c = type_class._symbol_c
3633
1193
                self._symbol_f = type_class._symbol_f
3634
1194
                self._symbol_set = type_class._symbol_set
3635
1195
3636
1196
    def to_field_args(self):
3637
1197
        args = super(function, self).to_field_args()
3638
1198
        if self._type in ('float',):
3639
1199
            args['digits'] = self.digits_compute or self.digits
3640
1200
        elif self._type in ('selection', 'reference'):
3641
1201
            args['selection'] = self.selection
3642
1202
        elif self._type in ('many2one', 'one2many', 'many2many'):
3643
1203
            args['comodel_name'] = self._obj
3644
1204
        return args
3645
1127
1205
3646
1128
    def digits_change(self, cr):
1206
    def digits_change(self, cr):
3647
1129
        if self._type == 'float':
1207
        if self._type == 'float':
3648
@@ -1139,7 +1217,8 @@
3649
1139
        if not self._fnct_search:
1217
        if not self._fnct_search:
3650
1140
            #CHECKME: should raise an exception
1218
            #CHECKME: should raise an exception
3651
1141
            return []
1219
            return []
3653
1142
        return self._fnct_search(obj, cr, uid, obj, name, args, context=context)
1220
        with Scope(cr, uid, context):
3654
1221
            return self._fnct_search(obj, cr, uid, obj, name, args, context=context)
3655
1143
1222
3656
1144
    def postprocess(self, cr, uid, obj, field, value=None, context=None):
1223
    def postprocess(self, cr, uid, obj, field, value=None, context=None):
3657
1145
        if context is None:
1224
        if context is None:
3658
@@ -1170,7 +1249,8 @@
3659
1170
        return result
1249
        return result
3660
1171
1250
3661
1172
    def get(self, cr, obj, ids, name, uid=False, context=None, values=None):
1251
    def get(self, cr, obj, ids, name, uid=False, context=None, values=None):
3663
1173
        result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
1252
        with Scope(cr, uid, context):
3664
1253
            result = self._fnct(obj, cr, uid, ids, name, self._arg, context)
3665
1174
        for id in ids:
1254
        for id in ids:
3666
1175
            if self._multi and id in result:
1255
            if self._multi and id in result:
3667
1176
                for field, value in result[id].iteritems():
1256
                for field, value in result[id].iteritems():
3668
@@ -1184,7 +1264,8 @@
3669
1184
        if not context:
1264
        if not context:
3670
1185
            context = {}
1265
            context = {}
3671
1186
        if self._fnct_inv:
1266
        if self._fnct_inv:
3673
1187
            self._fnct_inv(obj, cr, user, id, name, value, self._fnct_inv_arg, context)
1267
            with Scope(cr, user, context):
3674
1268
                self._fnct_inv(obj, cr, user, id, name, value, self._fnct_inv_arg, context)
3675
1188
1269
3676
1189
    @classmethod
1270
    @classmethod
3677
1190
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
1271
    def _as_display_name(cls, field, cr, uid, obj, value, context=None):
3678
@@ -1213,45 +1294,36 @@
3679
1213
        field = '.'.join(self._arg)
1294
        field = '.'.join(self._arg)
3680
1214
        return map(lambda x: (field, x[1], x[2]), domain)
1295
        return map(lambda x: (field, x[1], x[2]), domain)
3681
1215
1296
3683
1216
    def _fnct_write(self,obj,cr, uid, ids, field_name, values, args, context=None):
1297
    def _fnct_write(self, obj, cr, uid, ids, field_name, values, args, context=None):
3684
1217
        if isinstance(ids, (int, long)):
1298
        if isinstance(ids, (int, long)):
3685
1218
            ids = [ids]
1299
            ids = [ids]
3687
1219
        for record in obj.browse(cr, uid, ids, context=context):
1300
        for instance in obj.browse(cr, uid, ids, context=context):
3688
1220
            # traverse all fields except the last one
1301
            # traverse all fields except the last one
3689
1221
            for field in self.arg[:-1]:
1302
            for field in self.arg[:-1]:
3699
1222
                record = record[field] or False
1303
                instance = instance[field]
3700
1223
                if not record:
1304
            if instance:
3701
1224
                    break
1305
                # write on the last field of the first record
3702
1225
                elif isinstance(record, list):
1306
                instance[0].write({self.arg[-1]: values})
3694
1226
                    # record is the result of a one2many or many2many field
3695
1227
                    record = record[0]
3696
1228
            if record:
3697
1229
                # write on the last field
3698
1230
                record.write({self.arg[-1]: values})
3703
1231
1307
3704
1232
    def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
1308
    def _fnct_read(self, obj, cr, uid, ids, field_name, args, context=None):
3705
1233
        res = {}
1309
        res = {}
3706
1234
        for record in obj.browse(cr, SUPERUSER_ID, ids, context=context):
1310
        for record in obj.browse(cr, SUPERUSER_ID, ids, context=context):
3707
1235
            value = record
1311
            value = record
3708
1236
            for field in self.arg:
1312
            for field in self.arg:
3714
1237
                if isinstance(value, list):
1313
                value = value[field]
3710
1238
                    value = value[0]
3711
1239
                value = value[field] or False
3712
1240
                if not value:
3713
1241
                    break
3715
1242
            res[record.id] = value
1314
            res[record.id] = value
3716
1243
1315
3717
1244
        if self._type == 'many2one':
1316
        if self._type == 'many2one':
3719
1245
            # res[id] is a browse_record or False; convert it to (id, name) or False.
1317
            # res[id] is a recordset; convert it to (id, name) or False.
3720
1246
            # Perform name_get as root, as seeing the name of a related object depends on
1318
            # Perform name_get as root, as seeing the name of a related object depends on
3721
1247
            # access right of source document, not target, so user may not have access.
1319
            # access right of source document, not target, so user may not have access.
3722
1248
            value_ids = list(set(value.id for value in res.itervalues() if value))
1320
            value_ids = list(set(value.id for value in res.itervalues() if value))
3723
1249
            value_name = dict(obj.pool[self._obj].name_get(cr, SUPERUSER_ID, value_ids, context=context))
1321
            value_name = dict(obj.pool[self._obj].name_get(cr, SUPERUSER_ID, value_ids, context=context))
3725
1250
            res = dict((id, value and (value.id, value_name[value.id])) for id, value in res.iteritems())
1322
            res = dict((id, bool(value) and (value.id, value_name[value.id])) for id, value in res.iteritems())
3726
1251
1323
3727
1252
        elif self._type in ('one2many', 'many2many'):
1324
        elif self._type in ('one2many', 'many2many'):
3730
1253
            # res[id] is a list of browse_record or False; convert it to a list of ids
1325
            # res[id] is a recordset; convert it to a list of ids
3731
1254
            res = dict((id, value and map(int, value) or []) for id, value in res.iteritems())
1326
            res = dict((id, value.unbrowse()) for id, value in res.iteritems())
3732
1255
1327
3733
1256
        return res
1328
        return res
3734
1257
1329
3735
@@ -1445,7 +1517,7 @@
3736
1445
        default_val = self._get_default(obj, cr, uid, prop_name, context)
1517
        default_val = self._get_default(obj, cr, uid, prop_name, context)
3737
1446
1518
3738
1447
        property_create = False
1519
        property_create = False
3740
1448
        if isinstance(default_val, openerp.osv.orm.browse_record):
1520
        if isinstance(default_val, openerp.osv.orm.BaseModel):
3741
1449
            if default_val.id != id_val:
1521
            if default_val.id != id_val:
3742
1450
                property_create = True
1522
                property_create = True
3743
1451
        elif default_val != id_val:
1523
        elif default_val != id_val:
3744
@@ -1532,52 +1604,6 @@
3745
1532
        self.field_id = {}
1604
        self.field_id = {}
3746
1533
1605
3747
1534
1606
3748
1535
def field_to_dict(model, cr, user, field, context=None):
3749
1536
    """ Return a dictionary representation of a field.
3750
1537
3751
1538
    The string, help, and selection attributes (if any) are untranslated.  This
3752
1539
    representation is the one returned by fields_get() (fields_get() will do
3753
1540
    the translation).
3754
1541
3755
1542
    """
3756
1543
3757
1544
    res = {'type': field._type}
3758
1545
    # some attributes for m2m/function field are added as debug info only
3759
1546
    if isinstance(field, function):
3760
1547
        res['function'] = field._fnct and field._fnct.func_name or False
3761
1548
        res['store'] = field.store
3762
1549
        if isinstance(field.store, dict):
3763
1550
            res['store'] = str(field.store)
3764
1551
        res['fnct_search'] = field._fnct_search and field._fnct_search.func_name or False
3765
1552
        res['fnct_inv'] = field._fnct_inv and field._fnct_inv.func_name or False
3766
1553
        res['fnct_inv_arg'] = field._fnct_inv_arg or False
3767
1554
    if isinstance(field, many2many):
3768
1555
        (table, col1, col2) = field._sql_names(model)
3769
1556
        res['m2m_join_columns'] = [col1, col2]
3770
1557
        res['m2m_join_table'] = table
3771
1558
    for arg in ('string', 'readonly', 'states', 'size', 'group_operator', 'required',
3772
1559
            'change_default', 'translate', 'help', 'select', 'selectable', 'groups',
3773
1560
            'deprecated', 'digits', 'invisible', 'filters'):
3774
1561
        if getattr(field, arg, None):
3775
1562
            res[arg] = getattr(field, arg)
3776
1563
3777
1564
    if hasattr(field, 'selection'):
3778
1565
        if isinstance(field.selection, (tuple, list)):
3779
1566
            res['selection'] = field.selection
3780
1567
        else:
3781
1568
            # call the 'dynamic selection' function
3782
1569
            res['selection'] = field.selection(model, cr, user, context)
3783
1570
    if res['type'] in ('one2many', 'many2many', 'many2one'):
3784
1571
        res['relation'] = field._obj
3785
1572
        res['domain'] = field._domain(model) if callable(field._domain) else field._domain
3786
1573
        res['context'] = field._context
3787
1574
3788
1575
    if isinstance(field, one2many):
3789
1576
        res['relation_field'] = field._fields_id
3790
1577
3791
1578
    return res
3792
1579
3793
1580
3794
1581
class column_info(object):
1607
class column_info(object):
3795
1582
    """ Struct containing details about an osv column, either one local to
1608
    """ Struct containing details about an osv column, either one local to
3796
1583
        its model, or one inherited via _inherits.
1609
        its model, or one inherited via _inherits.
3797
@@ -1618,5 +1644,7 @@
3798
1618
            self.__class__.__name__, self.name, self.column,
1644
            self.__class__.__name__, self.name, self.column,
3799
1619
            self.parent_model, self.parent_column, self.original_parent)
1645
            self.parent_model, self.parent_column, self.original_parent)
3800
1620
1646
3801
1647
3802
1648
from openerp.osv.scope import Scope
3803
1649
3804
1621
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
1650
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
3805
1622
3806
1623
1651
3807
=== added file 'openerp/osv/fields2.py'
3808
--- openerp/osv/fields2.py	1970-01-01 00:00:00 +0000
3809
+++ openerp/osv/fields2.py	2014-01-22 16:19:54 +0000
3810
@@ -0,0 +1,995 @@
3811
1
# -*- coding: utf-8 -*-
3812
2
##############################################################################
3813
3
#
3814
4
#    OpenERP, Open Source Management Solution
3815
5
#    Copyright (C) 2013 OpenERP (<http://www.openerp.com>).
3816
6
#
3817
7
#    This program is free software: you can redistribute it and/or modify
3818
8
#    it under the terms of the GNU Affero General Public License as
3819
9
#    published by the Free Software Foundation, either version 3 of the
3820
10
#    License, or (at your option) any later version.
3821
11
#
3822
12
#    This program is distributed in the hope that it will be useful,
3823
13
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
3824
14
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3825
15
#    GNU Affero General Public License for more details.
3826
16
#
3827
17
#    You should have received a copy of the GNU Affero General Public License
3828
18
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
3829
19
#
3830
20
##############################################################################
3831
21
3832
22
""" High-level objects for fields. """
3833
23
3834
24
from copy import copy
3835
25
from datetime import date, datetime
3836
26
from functools import partial
3837
27
from operator import attrgetter
3838
28
import logging
3839
29
3840
30
from openerp.tools import float_round, ustr, html_sanitize, lazy_property
3841
31
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DATE_FORMAT
3842
32
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DATETIME_FORMAT
3843
33
3844
34
DATE_LENGTH = len(date.today().strftime(DATE_FORMAT))
3845
35
DATETIME_LENGTH = len(datetime.now().strftime(DATETIME_FORMAT))
3846
36
3847
37
_logger = logging.getLogger(__name__)
3848
38
3849
39
3850
40
class SpecialValue(object):
3851
41
    """ Encapsulates a value in the cache in place of a normal value. """
3852
42
    def __init__(self, value):
3853
43
        self.value = value
3854
44
    def get(self):
3855
45
        return self.value
3856
46
3857
47
class FailedValue(SpecialValue):
3858
48
    """ Special value that encapsulates an exception instead of a value. """
3859
49
    def __init__(self, exception):
3860
50
        self.exception = exception
3861
51
    def get(self):
3862
52
        raise self.exception
3863
53
3864
54
def _check_value(value):
3865
55
    """ Return `value`, or call its getter if `value` is a :class:`SpecialValue`. """
3866
56
    return value.get() if isinstance(value, SpecialValue) else value
3867
57
3868
58
3869
59
def default(value):
3870
60
    """ Return a compute function that provides a constant default value. """
3871
61
    def compute(field, records):
3872
62
        for record in records:
3873
63
            record[field.name] = value
3874
64
3875
65
    return compute
3876
66
3877
67
3878
68
def compute_related(field, records):
3879
69
    """ Compute the related `field` on `records`. """
3880
70
    scope = records._scope
3881
71
    sudo_scope = scope.sudo()
3882
72
    for record in records:
3883
73
        # bypass access rights check when traversing the related path
3884
74
        value = record.scoped(sudo_scope) if record.id else record
3885
75
        for name in field.related:
3886
76
            value = value[name]
3887
77
        # re-scope the resulting value
3888
78
        if isinstance(value, BaseModel):
3889
79
            value = value.scoped(scope)
3890
80
        record[field.name] = value
3891
81
3892
82
def inverse_related(field, records):
3893
83
    """ Inverse the related `field` on `records`. """
3894
84
    for record in records:
3895
85
        other = record
3896
86
        for name in field.related[:-1]:
3897
87
            other = other[name]
3898
88
        if other:
3899
89
            other[field.related[-1]] = record[field.name]
3900
90
3901
91
def search_related(field, operator, value):
3902
92
    """ Determine the domain to search on `field`. """
3903
93
    return [('.'.join(field.related), operator, value)]
3904
94
3905
95
3906
96
class MetaField(type):
3907
97
    """ Metaclass for field classes. """
3908
98
    by_type = {}
3909
99
3910
100
    def __init__(cls, name, bases, attrs):
3911
101
        super(MetaField, cls).__init__(name, bases, attrs)
3912
102
        if cls.type:
3913
103
            cls.by_type[cls.type] = cls
3914
104
3915
105
3916
106
class Field(object):
3917
107
    """ Base class of all fields. """
3918
108
    __metaclass__ = MetaField
3919
109
3920
110
    interface_for = None        # the column or field interfaced by self, if any
3921
111
3922
112
    name = None                 # name of the field
3923
113
    model_name = None           # name of the model of this field
3924
114
    type = None                 # type of the field (string)
3925
115
    relational = False          # whether the field is a relational one
3926
116
    inverse_field = None        # inverse field (object), if it exists
3927
117
3928
118
    store = True                # whether the field is stored in database
3929
119
    depends = ()                # collection of field dependencies
3930
120
    compute = None              # name of model method that computes value
3931
121
    inverse = None              # name of model method that inverses field
3932
122
    search = None               # name of model method that searches on field
3933
123
    related = None              # sequence of field names, for related fields
3934
124
3935
125
    string = None               # field label
3936
126
    help = None                 # field tooltip
3937
127
    readonly = False
3938
128
    required = False
3939
129
    states = None
3940
130
    groups = False              # csv list of group xml ids
3941
131
3942
132
    # arguments passed to column class by to_column()
3943
133
    _column_string = attrgetter('string')
3944
134
    _column_help = attrgetter('help')
3945
135
    _column_readonly = attrgetter('readonly')
3946
136
    _column_required = attrgetter('required')
3947
137
    _column_states = attrgetter('states')
3948
138
    _column_groups = attrgetter('groups')
3949
139
3950
140
    # attributes copied from related field by setup_related()
3951
141
    _related_string = attrgetter('string')
3952
142
    _related_help = attrgetter('help')
3953
143
    _related_readonly = attrgetter('readonly')
3954
144
    _related_required = attrgetter('required')
3955
145
    _related_states = attrgetter('states')
3956
146
    _related_groups = attrgetter('groups')
3957
147
3958
148
    # attributes exported by get_description()
3959
149
    _description_depends = attrgetter('depends')
3960
150
    _description_related = attrgetter('related')
3961
151
    _description_string = attrgetter('string')
3962
152
    _description_help = attrgetter('help')
3963
153
    _description_readonly = attrgetter('readonly')
3964
154
    _description_required = attrgetter('required')
3965
155
    _description_states = attrgetter('states')
3966
156
    _description_groups = attrgetter('groups')
3967
157
3968
158
    def __init__(self, string=None, **kwargs):
3969
159
        kwargs['string'] = string
3970
160
        for attr, value in kwargs.iteritems():
3971
161
            setattr(self, attr, value)
3972
162
3973
163
    def reset(self):
3974
164
        """ Prepare `self` for a new setup. This resets all lazy properties. """
3975
165
        lazy_property.reset_all(self)
3976
166
3977
167
    def copy(self, **kwargs):
3978
168
        """ make a copy of `self`, possibly modified with parameters `kwargs` """
3979
169
        field = copy(self)
3980
170
        for attr, value in kwargs.iteritems():
3981
171
            setattr(field, attr, value)
3982
172
        # Note: lazy properties will be recomputed later thanks to reset()
3983
173
        return field
3984
174
3985
175
    def set_model_name(self, model_name, name):
3986
176
        """ assign the model and field names of `self` """
3987
177
        self.model_name = model_name
3988
178
        self.name = name
3989
179
        if not self.string:
3990
180
            self.string = name.replace('_', ' ').capitalize()
3991
181
3992
182
    @lazy_property
3993
183
    def model(self):
3994
184
        """ return the model instance of `self` """
3995
185
        return scope[self.model_name]
3996
186
3997
187
    def __str__(self):
3998
188
        return "%s.%s" % (self.model_name, self.name)
3999
189
4000
190
    def get_description(self):
4001
191
        """ Return a dictionary that describes the field `self`. """
4002
192
        desc = {'type': self.type, 'store': self.store}
4003
193
        for attr in dir(self):
4004
194
            if attr.startswith('_description_'):
4005
195
                value = getattr(self, attr)(self)
4006
196
                if value:
4007
197
                    desc[attr[13:]] = value
4008
198
        return desc
4009
199
4010
200
    def to_column(self):
4011
201
        """ return a low-level field object corresponding to `self` """
4012
202
        assert self.store
4013
203
        if self.interface_for:
4014
204
            assert isinstance(self.interface_for, fields._column)
4015
205
            return self.interface_for
4016
206
4017
207
        _logger.debug("Create fields._column for Field %s", self)
4018
208
        args = {}
4019
209
        for attr in dir(self):
4020
210
            if attr.startswith('_column_'):
4021
211
                args[attr[8:]] = getattr(self, attr)(self)
4022
212
        return getattr(fields, self.type)(**args)
4023
213
4024
214
    #
4025
215
    # Conversion of values
4026
216
    #
4027
217
4028
218
    def null(self):
4029
219
        """ return the null value for this field """
4030
220
        return False
4031
221
4032
222
    def convert_to_cache(self, value):
4033
223
        """ convert `value` to the cache level; `value` may come from an
4034
224
            assignment, or have the format of methods :meth:`BaseModel.read` or
4035
225
            :meth:`BaseModel.write`
4036
226
        """
4037
227
        return value
4038
228
4039
229
    def convert_to_read(self, value, use_name_get=True):
4040
230
        """ convert `value` from the cache to a value as returned by method
4041
231
            :meth:`BaseModel.read`
4042
232
        """
4043
233
        return value
4044
234
4045
235
    def convert_to_write(self, value):
4046
236
        """ convert `value` from the cache to a valid value for method
4047
237
            :meth:`BaseModel.write`
4048
238
        """
4049
239
        return self.convert_to_read(value)
4050
240
4051
241
    def convert_to_export(self, value):
4052
242
        """ convert `value` from the cache to a valid value for export. """
4053
243
        return bool(value) and ustr(value)
4054
244
4055
245
    def convert_to_display_name(self, value):
4056
246
        """ convert `value` from the cache to a suitable display name. """
4057
247
        return ustr(value)
4058
248
4059
249
    #
4060
250
    # Getter/setter methods
4061
251
    #
4062
252
4063
253
    def __get__(self, record, owner):
4064
254
        """ return the value of field `self` on `record` """
4065
255
        if record is None:
4066
256
            return self         # the field is accessed through the owner class
4067
257
4068
258
        cache, id = record._scope.cache, record._id
4069
259
4070
260
        try:
4071
261
            return _check_value(cache[self][id])
4072
262
        except KeyError:
4073
263
            pass
4074
264
4075
265
        # cache miss, retrieve value
4076
266
        with record._scope:
4077
267
            if id:
4078
268
                # normal record -> read or compute value for this field
4079
269
                self.determine_value(record[0])
4080
270
            elif record:
4081
271
                # new record -> compute default value for this field
4082
272
                record.add_default_value(self.name)
4083
273
            else:
4084
274
                # null record -> return the null value for this field
4085
275
                return self.null()
4086
276
4087
277
        # the result should be in cache now
4088
278
        return _check_value(cache[self][id])
4089
279
4090
280
    def __set__(self, record, value):
4091
281
        """ set the value of field `self` on `record` """
4092
282
        if not record:
4093
283
            raise Warning("Null record %s may not be assigned" % record)
4094
284
4095
285
        with record._scope as _scope:
4096
286
            # adapt value to the cache level
4097
287
            value = self.convert_to_cache(value)
4098
288
4099
289
            # notify the change, which may cause cache invalidation
4100
290
            if _scope.draft or not record._id:
4101
291
                self.modified_draft(record)
4102
292
            else:
4103
293
                record.write({self.name: self.convert_to_write(value)})
4104
294
4105
295
            # store the value in cache
4106
296
            _scope.cache[self][record._id] = value
4107
297
4108
298
    #
4109
299
    # Management of the computation of field values.
4110
300
    #
4111
301
4112
302
    @lazy_property
4113
303
    def _compute_function(self):
4114
304
        """ Return a function to call with records to compute this field. """
4115
305
        if isinstance(self.compute, basestring):
4116
306
            return getattr(type(self.model), self.compute)
4117
307
        elif callable(self.compute):
4118
308
            return partial(self.compute, self)
4119
309
        else:
4120
310
            raise Warning("No way to compute field %s" % self)
4121
311
4122
312
    @lazy_property
4123
313
    def _compute_one(self):
4124
314
        """ Test whether the compute function has the decorator ``@one``. """
4125
315
        from openerp import one
4126
316
        return getattr(self._compute_function, '_api', None) is one
4127
317
4128
318
    def compute_value(self, records, check_exists=False):
4129
319
        """ Invoke the compute method on `records`. If `check` is ``True``, the
4130
320
            method filters out non-existing records before computing them.
4131
321
        """
4132
322
        # if required, keep new and existing records only
4133
323
        if check_exists:
4134
324
            all_recs = records
4135
325
            new_recs = [rec for rec in records if not rec.id]
4136
326
            records = sum(new_recs, records.exists())
4137
327
4138
328
            # mark non-existing records in cache
4139
329
            exc = MissingError("Computing a field on non-existing records.")
4140
330
            (all_recs - records)._update_cache(FailedValue(exc))
4141
331
4142
332
        # mark the field failed in cache, so that access before computation
4143
333
        # raises an exception
4144
334
        exc = Warning("Field %s is accessed before being computed." % self)
4145
335
        records._update_cache({self.name: FailedValue(exc)})
4146
336
4147
337
        self._compute_function(records)
4148
338
4149
339
    def determine_value(self, record):
4150
340
        """ Determine the value of `self` for `record`. """
4151
341
        if self.store:
4152
342
            # recompute field on record if required
4153
343
            recs_todo = scope.recomputation.todo(self)
4154
344
            if record in recs_todo:
4155
345
                # execute the compute method in NON-DRAFT mode, so that assigned
4156
346
                # fields are written to the database
4157
347
                if self._compute_one:
4158
348
                    self.compute_value(record, check_exists=True)
4159
349
                else:
4160
350
                    self.compute_value(recs_todo, check_exists=True)
4161
351
            else:
4162
352
                record._prefetch_field(self.name)
4163
353
4164
354
        else:
4165
355
            # execute the compute method in DRAFT mode, so that assigned fields
4166
356
            # are not written to the database
4167
357
            with record._scope.draft():
4168
358
                if self._compute_one:
4169
359
                    self.compute_value(record)
4170
360
                else:
4171
361
                    record._in_cache()
4172
362
                    recs = record._in_cache_without(self.name)
4173
363
                    self.compute_value(recs, check_exists=True)
4174
364
4175
365
    def determine_default(self, record):
4176
366
        """ determine the default value of field `self` on `record` """
4177
367
        record._update_cache({self.name: SpecialValue(self.null())})
4178
368
        if self.compute:
4179
369
            self.compute_value(record)
4180
370
4181
371
    def determine_inverse(self, records):
4182
372
        """ Given the value of `self` on `records`, inverse the computation. """
4183
373
        if isinstance(self.inverse, basestring):
4184
374
            getattr(records, self.inverse)()
4185
375
        elif callable(self.inverse):
4186
376
            self.inverse(self, records)
4187
377
4188
378
    def determine_domain(self, operator, value):
4189
379
        """ Return a domain representing a condition on `self`. """
4190
380
        if isinstance(self.search, basestring):
4191
381
            return getattr(self.model.browse(), self.search)(operator, value)
4192
382
        elif callable(self.search):
4193
383
            return self.search(self, operator, value)
4194
384
        else:
4195
385
            return [(self.name, operator, value)]
4196
386
4197
387
    #
4198
388
    # Setup of related fields.
4199
389
    #
4200
390
4201
391
    @lazy_property
4202
392
    def related_field(self):
4203
393
        """ return the related field corresponding to `self` """
4204
394
        if self.related:
4205
395
            model = self.model
4206
396
            for name in self.related[:-1]:
4207
397
                model = model[name]
4208
398
            return model._fields[self.related[-1]]
4209
399
        return None
4210
400
4211
401
    def setup_related(self):
4212
402
        """ Setup the attributes of the related field `self`. """
4213
403
        assert self.related
4214
404
        # fix the type of self.related if necessary
4215
405
        if isinstance(self.related, basestring):
4216
406
            self.related = tuple(self.related.split('.'))
4217
407
4218
408
        # check type consistency
4219
409
        field = self.related_field
4220
410
        if self.type != field.type:
4221
411
            raise Warning("Type of related field %s is inconsistent with %s" % (self, field))
4222
412
4223
413
        # determine dependencies, compute, inverse, and search
4224
414
        self.depends = ('.'.join(self.related),)
4225
415
        self.compute = compute_related
4226
416
        self.inverse = inverse_related
4227
417
        self.search = search_related
4228
418
4229
419
        # copy attributes from field to self (readonly, required, etc.)
4230
420
        field.setup()
4231
421
        for attr in dir(self):
4232
422
            if attr.startswith('_related_'):
4233
423
                if not getattr(self, attr[9:]):
4234
424
                    setattr(self, attr[9:], getattr(self, attr)(field))
4235
425
4236
426
    #
4237
427
    # Field setup.
4238
428
    #
4239
429
    # Recomputation of computed fields: each field stores a set of triggers
4240
430
    # (`field`, `path`); when the field is modified, it invalidates the cache of
4241
431
    # `field` and registers the records to recompute based on `path`. See method
4242
432
    # `modified` below for details.
4243
433
    #
4244
434
4245
435
    @lazy_property
4246
436
    def _triggers(self):
4247
437
        """ List of pairs (`field`, `path`), where `field` is a field to
4248
438
            recompute, and `path` is the dependency between `field` and `self`
4249
439
            (dot-separated sequence of field names between `field.model` and
4250
440
            `self.model`).
4251
441
        """
4252
442
        return []
4253
443
4254
444
    def setup(self):
4255
445
        """ Complete the setup of `self`: make it process its dependencies and
4256
446
            store triggers on other fields to be recomputed.
4257
447
        """
4258
448
        return self._setup              # trigger _setup() if not done yet
4259
449
4260
450
    @lazy_property
4261
451
    def _setup(self):
4262
452
        if self.related:
4263
453
            # setup all attributes of related field
4264
454
            self.setup_related()
4265
455
        else:
4266
456
            # retrieve dependencies from compute method
4267
457
            if isinstance(self.compute, basestring):
4268
458
                method = getattr(type(self.model), self.compute)
4269
459
            else:
4270
460
                method = self.compute
4271
461
4272
462
            depends = getattr(method, '_depends', ())
4273
463
            self.depends = depends(self.model) if callable(depends) else depends
4274
464
4275
465
        # put invalidation/recomputation triggers on dependencies
4276
466
        for path in self.depends:
4277
467
            self._depends_on_model(self.model, [], path.split('.'))
4278
468
4279
469
    def _depends_on_model(self, model, path0, path1):
4280
470
        """ Make `self` depend on `model`; `path0 + path1` is a dependency of
4281
471
            `self`, and `path0` is the sequence of field names from `self.model`
4282
472
            to `model`.
4283
473
        """
4284
474
        name, tail = path1[0], path1[1:]
4285
475
        if name == '*':
4286
476
            # special case: add triggers on all fields of model
4287
477
            fields = model._fields.values()
4288
478
            if not path0:
4289
479
                fields.remove(self)     # self cannot depend directly on itself
4290
480
        else:
4291
481
            fields = (model._fields[name],)
4292
482
4293
483
        for field in fields:
4294
484
            field._add_trigger_for(self, path0, tail)
4295
485
4296
486
    def _add_trigger_for(self, field, path0, path1):
4297
487
        """ Add a trigger on `self` to recompute `field`; `path0` is the
4298
488
            sequence of field names from `field.model` to `self.model`; ``path0
4299
489
            + [self.name] + path1`` is a dependency of `field`.
4300
490
        """
4301
491
        self._triggers.append((field, '.'.join(path0) if path0 else 'id'))
4302
492
        _logger.debug("Add trigger on field %s to recompute field %s", self, field)
4303
493
4304
494
    #
4305
495
    # Notification when fields are modified
4306
496
    #
4307
497
4308
498
    def modified(self, records):
4309
499
        """ Notify that field `self` has been modified on `records`: prepare the
4310
500
            fields/records to recompute, and return a spec indicating what to
4311
501
            invalidate.
4312
502
        """
4313
503
        # invalidate cache for self
4314
504
        ids = records.unbrowse()
4315
505
        spec = [(self, ids)]
4316
506
4317
507
        # invalidate the fields that depend on self, and prepare their
4318
508
        # recomputation
4319
509
        for field, path in self._triggers:
4320
510
            if field.store:
4321
511
                with scope(user=SUPERUSER_ID, context={'active_test': False}):
4322
512
                    target = field.model.search([(path, 'in', ids)])
4323
513
                spec.append((field, target.unbrowse()))
4324
514
                scope.recomputation.todo(field, target)
4325
515
            else:
4326
516
                spec.append((field, None))
4327
517
4328
518
        return spec
4329
519
4330
520
    def modified_draft(self, records):
4331
521
        """ Same as :meth:`modified`, but in draft mode. """
4332
522
        # invalidate self and dependent fields on records only
4333
523
        model_name = self.model_name
4334
524
        fields = [self] + [f for f, _ in self._triggers if f.model_name == model_name]
4335
525
        ids = records._ids
4336
526
        scope.invalidate([(f, ids) for f in fields])
4337
527
4338
528
4339
529
class Boolean(Field):
4340
530
    """ Boolean field. """
4341
531
    type = 'boolean'
4342
532
4343
533
    def convert_to_cache(self, value):
4344
534
        return bool(value)
4345
535
4346
536
    def convert_to_export(self, value):
4347
537
        return ustr(value)
4348
538
4349
539
4350
540
class Integer(Field):
4351
541
    """ Integer field. """
4352
542
    type = 'integer'
4353
543
4354
544
    def convert_to_cache(self, value):
4355
545
        return int(value or 0)
4356
546
4357
547
4358
548
class Float(Field):
4359
549
    """ Float field. """
4360
550
    type = 'float'
4361
551
    _digits = None
4362
552
4363
553
    _column_digits = staticmethod(lambda self: not callable(self._digits) and self._digits)
4364
554
    _column_digits_compute = staticmethod(lambda self: callable(self._digits) and self._digits)
4365
555
4366
556
    _related_digits = attrgetter('digits')
4367
557
    _description_digits = attrgetter('digits')
4368
558
4369
559
    def __init__(self, string=None, digits=None, **kwargs):
4370
560
        self._digits = digits
4371
561
        super(Float, self).__init__(string=string, **kwargs)
4372
562
4373
563
    @lazy_property
4374
564
    def digits(self):
4375
565
        return self._digits(scope.cr) if callable(self._digits) else self._digits
4376
566
4377
567
    def convert_to_cache(self, value):
4378
568
        # apply rounding here, otherwise value in cache may be wrong!
4379
569
        if self.digits:
4380
570
            return float_round(float(value or 0.0), precision_digits=self.digits[1])
4381
571
        else:
4382
572
            return float(value or 0.0)
4383
573
4384
574
4385
575
class _String(Field):
4386
576
    """ Abstract class for string fields. """
4387
577
    translate = False
4388
578
4389
579
    _column_translate = attrgetter('translate')
4390
580
    _related_translate = attrgetter('translate')
4391
581
    _description_translate = attrgetter('translate')
4392
582
4393
583
4394
584
class Char(_String):
4395
585
    """ Char field. """
4396
586
    type = 'char'
4397
587
    size = None
4398
588
4399
589
    _column_size = attrgetter('size')
4400
590
    _related_size = attrgetter('size')
4401
591
    _description_size = attrgetter('size')
4402
592
4403
593
    def convert_to_cache(self, value):
4404
594
        return bool(value) and ustr(value)[:self.size]
4405
595
4406
596
4407
597
class Text(_String):
4408
598
    """ Text field. """
4409
599
    type = 'text'
4410
600
4411
601
    def convert_to_cache(self, value):
4412
602
        return bool(value) and ustr(value)
4413
603
4414
604
4415
605
class Html(_String):
4416
606
    """ Html field. """
4417
607
    type = 'html'
4418
608
4419
609
    def convert_to_cache(self, value):
4420
610
        return bool(value) and html_sanitize(value)
4421
611
4422
612
4423
613
class Date(Field):
4424
614
    """ Date field. """
4425
615
    type = 'date'
4426
616
4427
617
    def convert_to_cache(self, value):
4428
618
        if isinstance(value, (date, datetime)):
4429
619
            value = value.strftime(DATE_FORMAT)
4430
620
        elif value:
4431
621
            # check the date format
4432
622
            value = value[:DATE_LENGTH]
4433
623
            datetime.strptime(value, DATE_FORMAT)
4434
624
        return value or False
4435
625
4436
626
4437
627
class Datetime(Field):
4438
628
    """ Datetime field. """
4439
629
    type = 'datetime'
4440
630
4441
631
    def convert_to_cache(self, value):
4442
632
        if isinstance(value, (date, datetime)):
4443
633
            value = value.strftime(DATETIME_FORMAT)
4444
634
        elif value:
4445
635
            # check the datetime format
4446
636
            value = value[:DATETIME_LENGTH]
4447
637
            datetime.strptime(value, DATETIME_FORMAT)
4448
638
        return value or False
4449
639
4450
640
4451
641
class Binary(Field):
4452
642
    """ Binary field. """
4453
643
    type = 'binary'
4454
644
4455
645
4456
646
class Selection(Field):
4457
647
    """ Selection field. """
4458
648
    type = 'selection'
4459
649
    selection = None        # [(value, string), ...], model method or method name
4460
650
4461
651
    _description_selection = staticmethod(lambda self: self.get_selection())
4462
652
4463
653
    def __init__(self, selection, string=None, **kwargs):
4464
654
        """ Selection field.
4465
655
4466
656
            :param selection: specifies the possible values for this field.
4467
657
                It is given as either a list of pairs (`value`, `string`), or a
4468
658
                model method, or a method name.
4469
659
        """
4470
660
        if callable(selection):
4471
661
            from openerp import api
4472
662
            selection = api.expected(api.model, selection)
4473
663
        super(Selection, self).__init__(selection=selection, string=string, **kwargs)
4474
664
4475
665
    @staticmethod
4476
666
    def _column_selection(self):
4477
667
        if isinstance(self.selection, basestring):
4478
668
            method = self.selection
4479
669
            return lambda self, *a, **kw: getattr(self, method)(*a, **kw)
4480
670
        else:
4481
671
            return self.selection
4482
672
4483
673
    def setup_related(self):
4484
674
        super(Selection, self).setup_related()
4485
675
        # selection must be computed on related field
4486
676
        self.selection = lambda model: self.related_field.get_selection()
4487
677
4488
678
    def get_selection(self):
4489
679
        """ return the selection list (pairs (value, string)) """
4490
680
        value = self.selection
4491
681
        if isinstance(value, basestring):
4492
682
            value = getattr(self.model, value)()
4493
683
        elif callable(value):
4494
684
            value = value(self.model)
4495
685
        return value
4496
686
4497
687
    def get_values(self):
4498
688
        """ return a list of the possible values """
4499
689
        return [item[0] for item in self.get_selection()]
4500
690
4501
691
    def convert_to_cache(self, value):
4502
692
        if value in self.get_values():
4503
693
            return value
4504
694
        elif not value:
4505
695
            return False
4506
696
        raise ValueError("Wrong value for %s: %r" % (self, value))
4507
697
4508
698
    def convert_to_export(self, value):
4509
699
        if not isinstance(self.selection, list):
4510
700
            # FIXME: this reproduces an existing buggy behavior!
4511
701
            return value
4512
702
        for item in self.get_selection():
4513
703
            if item[0] == value:
4514
704
                return item[1]
4515
705
        return False
4516
706
4517
707
4518
708
class Reference(Selection):
4519
709
    """ Reference field. """
4520
710
    type = 'reference'
4521
711
    size = 128
4522
712
4523
713
    _column_size = attrgetter('size')
4524
714
    _related_size = attrgetter('size')
4525
715
4526
716
    def __init__(self, selection, string=None, **kwargs):
4527
717
        """ Reference field.
4528
718
4529
719
            :param selection: specifies the possible model names for this field.
4530
720
                It is given as either a list of pairs (`value`, `string`), or a
4531
721
                model method, or a method name.
4532
722
        """
4533
723
        super(Reference, self).__init__(selection=selection, string=string, **kwargs)
4534
724
4535
725
    def convert_to_cache(self, value):
4536
726
        if isinstance(value, BaseModel):
4537
727
            if value._name in self.get_values() and len(value) <= 1:
4538
728
                return value.scoped() or False
4539
729
        elif isinstance(value, basestring):
4540
730
            res_model, res_id = value.split(',')
4541
731
            return scope[res_model].browse(int(res_id))
4542
732
        elif not value:
4543
733
            return False
4544
734
        raise ValueError("Wrong value for %s: %r" % (self, value))
4545
735
4546
736
    def convert_to_read(self, value, use_name_get=True):
4547
737
        return "%s,%s" % (value._name, value.id) if value else False
4548
738
4549
739
    def convert_to_export(self, value):
4550
740
        return bool(value) and value.name_get()[0][1]
4551
741
4552
742
    def convert_to_display_name(self, value):
4553
743
        return ustr(value and value.display_name)
4554
744
4555
745
4556
746
class _Relational(Field):
4557
747
    """ Abstract class for relational fields. """
4558
748
    relational = True
4559
749
    comodel_name = None                 # name of model of values
4560
750
    domain = None                       # domain for searching values
4561
751
    context = None                      # context for searching values
4562
752
4563
753
    _column_obj = attrgetter('comodel_name')
4564
754
    _column_domain = attrgetter('domain')
4565
755
    _column_context = attrgetter('context')
4566
756
4567
757
    _description_relation = attrgetter('comodel_name')
4568
758
    _description_domain = staticmethod(lambda self: \
4569
759
        self.domain(self.model) if callable(self.domain) else self.domain)
4570
760
    _description_context = attrgetter('context')
4571
761
4572
762
    def __init__(self, **kwargs):
4573
763
        super(_Relational, self).__init__(**kwargs)
4574
764
        if callable(self.domain):
4575
765
            from openerp import api
4576
766
            self.domain = api.expected(api.model, self.domain)
4577
767
4578
768
    @lazy_property
4579
769
    def comodel(self):
4580
770
        """ return the comodel instance of `self` """
4581
771
        return scope[self.comodel_name]
4582
772
4583
773
    def null(self):
4584
774
        return self.comodel.browse()
4585
775
4586
776
    def _add_trigger_for(self, field, path0, path1):
4587
777
        # overridden to traverse relations and manage inverse fields
4588
778
        Field._add_trigger_for(self, field, path0, [])
4589
779
4590
780
        if self.inverse_field:
4591
781
            # add trigger on inverse field, too
4592
782
            Field._add_trigger_for(self.inverse_field, field, path0 + [self.name], [])
4593
783
4594
784
        if path1:
4595
785
            # recursively traverse the dependency
4596
786
            field._depends_on_model(self.comodel, path0 + [self.name], path1)
4597
787
4598
788
    def modified(self, records):
4599
789
        # Invalidate cache for self.inverse_field, too. Note that recomputation
4600
790
        # of fields that depend on self.inverse_field is already covered by the
4601
791
        # triggers (see above).
4602
792
        spec = super(_Relational, self).modified(records)
4603
793
        if self.inverse_field:
4604
794
            spec.append((self.inverse_field, None))
4605
795
        return spec
4606
796
4607
797
4608
798
class Many2one(_Relational):
4609
799
    """ Many2one field. """
4610
800
    type = 'many2one'
4611
801
    ondelete = 'set null'               # what to do when value is deleted
4612
802
    auto_join = False                   # whether joins are generated upon search
4613
803
    delegate = False                    # whether self implements delegation
4614
804
4615
805
    _column_ondelete = attrgetter('ondelete')
4616
806
    _column_auto_join = attrgetter('auto_join')
4617
807
4618
808
    def __init__(self, comodel_name, string=None, **kwargs):
4619
809
        super(Many2one, self).__init__(comodel_name=comodel_name, string=string, **kwargs)
4620
810
4621
811
    @lazy_property
4622
812
    def inverse_field(self):
4623
813
        for field in self.comodel._fields.itervalues():
4624
814
            if isinstance(field, One2many) and field.inverse_field == self:
4625
815
                return field
4626
816
        return None
4627
817
4628
818
    @lazy_property
4629
819
    def inherits(self):
4630
820
        """ Whether `self` implements inheritance between model and comodel. """
4631
821
        return self.name in self.model._inherits.itervalues()
4632
822
4633
823
    def convert_to_cache(self, value):
4634
824
        if isinstance(value, BaseModel):
4635
825
            if value._name == self.comodel_name and len(value) <= 1:
4636
826
                return value.scoped()
4637
827
            raise ValueError("Wrong value for %s: %r" % (self, value))
4638
828
        elif isinstance(value, tuple):
4639
829
            return self.comodel.browse(value[0])
4640
830
        elif isinstance(value, dict):
4641
831
            return self.comodel.new(value)
4642
832
        else:
4643
833
            return self.comodel.browse(value)
4644
834
4645
835
    def convert_to_read(self, value, use_name_get=True):
4646
836
        if use_name_get and value:
4647
837
            # evaluate name_get() in sudo scope, because the visibility of a
4648
838
            # many2one field value (id and name) depends on the current record's
4649
839
            # access rights, and not the value's access rights.
4650
840
            with value._scope.sudo():
4651
841
                return value.name_get()[0]
4652
842
        else:
4653
843
            return value.id
4654
844
4655
845
    def convert_to_write(self, value):
4656
846
        return value.id
4657
847
4658
848
    def convert_to_export(self, value):
4659
849
        return bool(value) and value.name_get()[0][1]
4660
850
4661
851
    def convert_to_display_name(self, value):
4662
852
        return ustr(value.display_name)
4663
853
4664
854
    def determine_default(self, record):
4665
855
        super(Many2one, self).determine_default(record)
4666
856
        if self.inherits:
4667
857
            # special case: fields that implement inheritance between models
4668
858
            value = record[self.name]
4669
859
            if not value:
4670
860
                # the default value cannot be null, use a new record instead
4671
861
                record[self.name] = self.comodel.new()
4672
862
4673
863
4674
864
class _RelationalMulti(_Relational):
4675
865
    """ Abstract class for relational fields *2many. """
4676
866
4677
867
    def convert_to_cache(self, value):
4678
868
        if isinstance(value, BaseModel):
4679
869
            if value._name == self.comodel_name:
4680
870
                return value.scoped()
4681
871
        elif isinstance(value, list):
4682
872
            # value is a list of record ids or commands
4683
873
            result = self.comodel.browse()
4684
874
            for command in value:
4685
875
                if isinstance(command, (tuple, list)):
4686
876
                    if command[0] == 0:
4687
877
                        result += self.comodel.new(command[2])
4688
878
                    elif command[0] == 1:
4689
879
                        record = self.comodel.browse(command[1])
4690
880
                        record.update(command[2])
4691
881
                        result += record
4692
882
                    elif command[0] == 2:
4693
883
                        pass
4694
884
                    elif command[0] == 3:
4695
885
                        pass
4696
886
                    elif command[0] == 4:
4697
887
                        result += self.comodel.browse(command[1])
4698
888
                    elif command[0] == 5:
4699
889
                        result = self.comodel.browse()
4700
890
                    elif command[0] == 6:
4701
891
                        result = self.comodel.browse(command[2])
4702
892
                elif isinstance(command, dict):
4703
893
                    result += self.comodel.new(command)
4704
894
                else:
4705
895
                    result += self.comodel.browse(command)
4706
896
            return result
4707
897
        elif not value:
4708
898
            return self.null()
4709
899
        raise ValueError("Wrong value for %s: %s" % (self, value))
4710
900
4711
901
    def convert_to_read(self, value, use_name_get=True):
4712
902
        return value.unbrowse()
4713
903
4714
904
    def convert_to_write(self, value):
4715
905
        result = [(5,)]
4716
906
        for record in value:
4717
907
            # TODO: modified record (1, id, values)
4718
908
            if not record.id:
4719
909
                values = record._convert_to_write(record._get_cache())
4720
910
                result.append((0, 0, values))
4721
911
            else:
4722
912
                result.append((4, record.id))
4723
913
        return result
4724
914
4725
915
    def convert_to_export(self, value):
4726
916
        return bool(value) and ','.join(name for id, name in value.name_get())
4727
917
4728
918
    def convert_to_display_name(self, value):
4729
919
        raise NotImplementedError()
4730
920
4731
921
4732
922
class One2many(_RelationalMulti):
4733
923
    """ One2many field. """
4734
924
    type = 'one2many'
4735
925
    inverse_name = None                 # name of the inverse field
4736
926
    auto_join = False                   # whether joins are generated upon search
4737
927
    limit = None                        # optional limit to use upon read
4738
928
4739
929
    _column_fields_id = attrgetter('inverse_name')
4740
930
    _column_auto_join = attrgetter('auto_join')
4741
931
    _column_limit = attrgetter('limit')
4742
932
4743
933
    _description_relation_field = attrgetter('inverse_name')
4744
934
4745
935
    def __init__(self, comodel_name, inverse_name=None, string=None, **kwargs):
4746
936
        super(One2many, self).__init__(
4747
937
            comodel_name=comodel_name, inverse_name=inverse_name, string=string, **kwargs)
4748
938
4749
939
    @lazy_property
4750
940
    def inverse_field(self):
4751
941
        return self.inverse_name and self.comodel._fields[self.inverse_name]
4752
942
4753
943
4754
944
class Many2many(_RelationalMulti):
4755
945
    """ Many2many field. """
4756
946
    type = 'many2many'
4757
947
    relation = None                     # name of table
4758
948
    column1 = None                      # column of table referring to model
4759
949
    column2 = None                      # column of table referring to comodel
4760
950
    limit = None                        # optional limit to use upon read
4761
951
4762
952
    _column_rel = attrgetter('relation')
4763
953
    _column_id1 = attrgetter('column1')
4764
954
    _column_id2 = attrgetter('column2')
4765
955
    _column_limit = attrgetter('limit')
4766
956
4767
957
    def __init__(self, comodel_name, relation=None, column1=None, column2=None,
4768
958
                string=None, **kwargs):
4769
959
        super(Many2many, self).__init__(comodel_name=comodel_name, relation=relation,
4770
960
            column1=column1, column2=column2, string=string, **kwargs)
4771
961
4772
962
    @lazy_property
4773
963
    def inverse_field(self):
4774
964
        if not self.compute:
4775
965
            expected = (self.relation, self.column2, self.column1)
4776
966
            for field in self.comodel._fields.itervalues():
4777
967
                if isinstance(field, Many2many) and \
4778
968
                        (field.relation, field.column1, field.column2) == expected:
4779
969
                    return field
4780
970
        return None
4781
971
4782
972
4783
973
class Id(Field):
4784
974
    """ Special case for field 'id'. """
4785
975
    store = False
4786
976
    readonly = True
4787
977
4788
978
    def to_column(self):
4789
979
        raise NotImplementedError()
4790
980
4791
981
    def __get__(self, instance, owner):
4792
982
        if instance is None:
4793
983
            return self         # the field is accessed through the class owner
4794
984
        return instance._id
4795
985
4796
986
    def __set__(self, instance, value):
4797
987
        raise NotImplementedError()
4798
988
4799
989
4800
990
# imported here to avoid dependency cycle issues
4801
991
from openerp import SUPERUSER_ID
4802
992
from openerp.exceptions import Warning, MissingError
4803
993
from openerp.osv import fields
4804
994
from openerp.osv.orm import BaseModel
4805
995
from openerp.osv.scope import proxy as scope
4806
0
996
4807
=== modified file 'openerp/osv/orm.py'
4808
--- openerp/osv/orm.py	2014-01-17 12:02:35 +0000
4809
+++ openerp/osv/orm.py	2014-01-22 16:19:54 +0000
4810
@@ -21,46 +21,49 @@
4811
21
21
4812
22
22
4813
23
"""
23
"""
4815
24
  Object relational mapping to database (postgresql) module
24
    Object Relational Mapping module:
4816
25
     * Hierarchical structure
25
     * Hierarchical structure
4819
26
     * Constraints consistency, validations
26
     * Constraints consistency and validation
4820
27
     * Object meta Data depends on its status
27
     * Object metadata depends on its status
4821
28
     * Optimised processing by complex query (multiple actions at once)
28
     * Optimised processing by complex query (multiple actions at once)
4823
29
     * Default fields value
29
     * Default field values
4824
30
     * Permissions optimisation
30
     * Permissions optimisation
4825
31
     * Persistant object: DB postgresql
31
     * Persistant object: DB postgresql
4827
32
     * Datas conversions
32
     * Data conversion
4828
33
     * Multi-level caching system
33
     * Multi-level caching system
4834
34
     * 2 different inheritancies
34
     * Two different inheritance mechanisms
4835
35
     * Fields:
35
     * Rich set of field types:
4836
36
          - classicals (varchar, integer, boolean, ...)
36
          - classical (varchar, integer, boolean, ...)
4837
37
          - relations (one2many, many2one, many2many)
37
          - relational (one2many, many2one, many2many)
4838
38
          - functions
38
          - functional
4839
39
39
4840
40
"""
40
"""
4841
41
41
4842
42
import calendar
42
import calendar
4844
43
import collections
43
from collections import defaultdict, Iterable
4845
44
import copy
44
import copy
4846
45
import datetime
45
import datetime
4847
46
import itertools
46
import itertools
4848
47
import logging
47
import logging
4849
48
import operator
48
import operator
4850
49
import pickle
49
import pickle
4851
50
import functools
4852
50
import re
51
import re
4853
51
import simplejson
52
import simplejson
4854
52
import time
53
import time
4855
53
import traceback
4856
54
import types
4857
55
54
4858
56
import babel.dates
55
import babel.dates
4859
57
import dateutil.parser
56
import dateutil.parser
4860
58
import psycopg2
57
import psycopg2
4861
59
from lxml import etree
58
from lxml import etree
4862
60
59
4863
60
import api
4864
61
from scope import proxy as scope_proxy
4865
61
import fields
62
import fields
4866
62
import openerp
63
import openerp
4867
63
import openerp.tools as tools
64
import openerp.tools as tools
4868
65
from openerp.exceptions import except_orm, AccessError, MissingError
4869
66
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
4870
64
from openerp.tools.config import config
67
from openerp.tools.config import config
4871
65
from openerp.tools.misc import CountingStream
68
from openerp.tools.misc import CountingStream
4872
66
from openerp.tools.safe_eval import safe_eval as eval
69
from openerp.tools.safe_eval import safe_eval as eval
4873
@@ -238,6 +241,10 @@
4874
238
def intersect(la, lb):
241
def intersect(la, lb):
4875
239
    return filter(lambda x: x in lb, la)
242
    return filter(lambda x: x in lb, la)
4876
240
243
4877
244
def same_name(f, g):
4878
245
    """ Test whether functions `f` and `g` are identical or have the same name """
4879
246
    return f == g or getattr(f, '__name__', 0) == getattr(g, '__name__', 1)
4880
247
4881
241
def fix_import_export_id_paths(fieldname):
248
def fix_import_export_id_paths(fieldname):
4882
242
    """
249
    """
4883
243
    Fixes the id fields in import and exports, and splits field paths
250
    Fixes the id fields in import and exports, and splits field paths
4884
@@ -251,303 +258,6 @@
4885
251
    fixed_external_id = re.sub(r'([^/]):id', r'\1/id', fixed_db_id)
258
    fixed_external_id = re.sub(r'([^/]):id', r'\1/id', fixed_db_id)
4886
252
    return fixed_external_id.split('/')
259
    return fixed_external_id.split('/')
4887
253
260
4888
254
class except_orm(Exception):
4889
255
    def __init__(self, name, value):
4890
256
        self.name = name
4891
257
        self.value = value
4892
258
        self.args = (name, value)
4893
259
4894
260
class BrowseRecordError(Exception):
4895
261
    pass
4896
262
4897
263
class browse_null(object):
4898
264
    """ Readonly python database object browser
4899
265
    """
4900
266
4901
267
    def __init__(self):
4902
268
        self.id = False
4903
269
4904
270
    def __getitem__(self, name):
4905
271
        return None
4906
272
4907
273
    def __getattr__(self, name):
4908
274
        return None  # XXX: return self ?
4909
275
4910
276
    def __int__(self):
4911
277
        return False
4912
278
4913
279
    def __str__(self):
4914
280
        return ''
4915
281
4916
282
    def __nonzero__(self):
4917
283
        return False
4918
284
4919
285
    def __unicode__(self):
4920
286
        return u''
4921
287
4922
288
    def __iter__(self):
4923
289
        raise NotImplementedError("Iteration is not allowed on %s" % self)
4924
290
4925
291
4926
292
#
4927
293
# TODO: execute an object method on browse_record_list
4928
294
#
4929
295
class browse_record_list(list):
4930
296
    """ Collection of browse objects
4931
297
4932
298
        Such an instance will be returned when doing a ``browse([ids..])``
4933
299
        and will be iterable, yielding browse() objects
4934
300
    """
4935
301
4936
302
    def __init__(self, lst, context=None):
4937
303
        if not context:
4938
304
            context = {}
4939
305
        super(browse_record_list, self).__init__(lst)
4940
306
        self.context = context
4941
307
4942
308
4943
309
class browse_record(object):
4944
310
    """ An object that behaves like a row of an object's table.
4945
311
        It has attributes after the columns of the corresponding object.
4946
312
4947
313
        Examples::
4948
314
4949
315
            uobj = pool.get('res.users')
4950
316
            user_rec = uobj.browse(cr, uid, 104)
4951
317
            name = user_rec.name
4952
318
    """
4953
319
4954
320
    def __init__(self, cr, uid, id, table, cache, context=None,
4955
321
                 list_class=browse_record_list, fields_process=None):
4956
322
        """
4957
323
        :param table: the browsed object (inherited from orm)
4958
324
        :param dict cache: a dictionary of model->field->data to be shared
4959
325
                           across browse objects, thus reducing the SQL
4960
326
                           read()s. It can speed up things a lot, but also be
4961
327
                           disastrous if not discarded after write()/unlink()
4962
328
                           operations
4963
329
        :param dict context: dictionary with an optional context
4964
330
        """
4965
331
        if fields_process is None:
4966
332
            fields_process = {}
4967
333
        if context is None:
4968
334
            context = {}
4969
335
        self._list_class = list_class
4970
336
        self._cr = cr
4971
337
        self._uid = uid
4972
338
        self._id = id
4973
339
        self._table = table # deprecated, use _model!
4974
340
        self._model = table
4975
341
        self._table_name = self._table._name
4976
342
        self.__logger = logging.getLogger('openerp.osv.orm.browse_record.' + self._table_name)
4977
343
        self._context = context
4978
344
        self._fields_process = fields_process
4979
345
4980
346
        cache.setdefault(table._name, {})
4981
347
        self._data = cache[table._name]
4982
348
4983
349
#        if not (id and isinstance(id, (int, long,))):
4984
350
#            raise BrowseRecordError(_('Wrong ID for the browse record, got %r, expected an integer.') % (id,))
4985
351
#        if not table.exists(cr, uid, id, context):
4986
352
#            raise BrowseRecordError(_('Object %s does not exists') % (self,))
4987
353
4988
354
        if id not in self._data:
4989
355
            self._data[id] = {'id': id}
4990
356
4991
357
        self._cache = cache
4992
358
4993
359
    def __getitem__(self, name):
4994
360
        if name == 'id':
4995
361
            return self._id
4996
362
4997
363
        if name not in self._data[self._id]:
4998
364
            # build the list of fields we will fetch
4999
365
5000
366
            # fetch the definition of the field which was asked for
Status:	Work in progress
Proposed branch:	lp:~openerp-dev/openobject-server/trunk-apiculture-rco
Merge into:	lp:openobject-server
Diff against target:	11970 lines (+6435/-2392) 92 files modified doc/03_module_dev_02.rst (+1/-0) doc/03_module_dev_03.rst (+13/-4) doc/api_models.rst (+16/-2) doc/index.rst (+4/-3) doc/new_api.rst (+138/-0) openerp/__init__.py (+15/-0) openerp/addons/base/__openerp__.py (+1/-2) openerp/addons/base/base.sql (+1/-36) openerp/addons/base/base_menu.xml (+4/-0) openerp/addons/base/ir/ir_actions.py (+6/-6) openerp/addons/base/ir/ir_attachment.py (+2/-2) openerp/addons/base/ir/ir_cron.py (+5/-4) openerp/addons/base/ir/ir_mail_server.py (+3/-6) openerp/addons/base/ir/ir_model.py (+38/-42) openerp/addons/base/ir/ir_rule.py (+2/-2) openerp/addons/base/ir/ir_sequence.py (+4/-3) openerp/addons/base/ir/ir_translation.py (+3/-3) openerp/addons/base/ir/ir_ui_menu.py (+18/-16) openerp/addons/base/ir/ir_ui_view.py (+14/-8) openerp/addons/base/ir/ir_values.py (+26/-1) openerp/addons/base/module/module.py (+66/-45) openerp/addons/base/res/ir_property.py (+3/-4) openerp/addons/base/res/res_company.py (+2/-1) openerp/addons/base/res/res_config.py (+2/-2) openerp/addons/base/res/res_currency.py (+11/-18) openerp/addons/base/res/res_partner.py (+147/-143) openerp/addons/base/res/res_users.py (+13/-13) openerp/addons/base/security/base_security.xml (+0/-5) openerp/addons/base/test/base_test.yml (+1/-1) openerp/addons/base/test/test_ir_rule.yml (+1/-1) openerp/addons/base/test/test_osv_expression.yml (+2/-2) openerp/cli/server.py (+1/-0) openerp/exceptions.py (+15/-1) openerp/modules/loading.py (+2/-0) openerp/modules/module.py (+18/-16) openerp/modules/registry.py (+34/-14) openerp/netsvc.py (+2/-6) openerp/osv/__init__.py (+3/-2) openerp/osv/api.py (+760/-0) openerp/osv/expression.py (+125/-105) openerp/osv/fields.py (+138/-110) openerp/osv/fields2.py (+995/-0) openerp/osv/orm.py (+1679/-1348) openerp/osv/scope.py (+380/-0) openerp/report/custom.py (+5/-6) openerp/report/print_xml.py (+12/-30) openerp/report/report_sxw.py (+18/-87) openerp/service/model.py (+1/-1) openerp/service/security.py (+1/-1) openerp/tests/__init__.py (+3/-3) openerp/tests/addons/test_impex/models.py (+55/-39) openerp/tests/addons/test_impex/tests/test_export.py (+8/-11) openerp/tests/addons/test_impex/tests/test_import.py (+5/-5) openerp/tests/addons/test_impex/tests/test_load.py (+6/-6) openerp/tests/addons/test_inherit/__init__.py (+3/-0) openerp/tests/addons/test_inherit/__openerp__.py (+15/-0) openerp/tests/addons/test_inherit/ir.model.access.csv (+1/-0) openerp/tests/addons/test_inherit/models.py (+29/-0) openerp/tests/addons/test_inherit/tests/__init__.py (+12/-0) openerp/tests/addons/test_inherit/tests/test_inherit.py (+17/-0) openerp/tests/addons/test_new_api/__init__.py (+2/-0) openerp/tests/addons/test_new_api/__openerp__.py (+15/-0) openerp/tests/addons/test_new_api/demo_data.xml (+14/-0) openerp/tests/addons/test_new_api/models.py (+196/-0) openerp/tests/addons/test_new_api/tests/__init__.py (+18/-0) openerp/tests/addons/test_new_api/tests/test_attributes.py (+25/-0) openerp/tests/addons/test_new_api/tests/test_field_conversions.py (+11/-0) openerp/tests/addons/test_new_api/tests/test_new_fields.py (+397/-0) openerp/tests/addons/test_new_api/tests/test_onchange.py (+46/-0) openerp/tests/addons/test_new_api/tests/test_related.py (+3/-58) openerp/tests/addons/test_new_api_extend/__init__.py (+3/-0) openerp/tests/addons/test_new_api_extend/__openerp__.py (+14/-0) openerp/tests/addons/test_new_api_extend/models.py (+12/-0) openerp/tests/addons/test_new_api_extend/tests/__init__.py (+8/-0) openerp/tests/addons/test_new_api_extend/tests/extend_class.py (+26/-0) openerp/tests/addons/test_workflow/models.py (+8/-7) openerp/tests/addons/test_workflow/tests/test_workflow.py (+1/-1) openerp/tests/common.py (+7/-2) openerp/tests/test_acl.py (+34/-20) openerp/tests/test_api.py (+462/-0) openerp/tests/test_orm.py (+14/-0) openerp/tools/__init__.py (+1/-1) openerp/tools/cache.py (+86/-86) openerp/tools/convert.py (+3/-1) openerp/tools/func.py (+29/-1) openerp/tools/misc.py (+7/-0) openerp/tools/test_reports.py (+1/-1) openerp/tools/translate.py (+46/-41) openerp/tools/yaml_import.py (+3/-1) openerp/workflow/workitem.py (+3/-4) openerpcommand/read.py (+1/-1) setup.py (+34/-1)
To merge this branch:	bzr merge lp:~openerp-dev/openobject-server/trunk-apiculture-rco
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
OpenERP Core Team		2013-04-04	Pending
Review via email: mp+157040@code.launchpad.net