Merge lp:~openerp-dev/openobject-server/trunk-apiculture into lp:openobject-server

[Raphael Collet (OpenERP)]

The new API

[lp:~openerp-dev/openobject-server/trunk-apiculture]

5107. By Raphael Collet (OpenERP) on 2013-10-16

[FIX] orm: make resolve_2many_commands() robust when argument is False

5108. By Raphael Collet (OpenERP) on 2013-10-16

[FIX] orm, fields2: make field 'id' non-overridable
The implementation fields2.Id is critical to make "record.id" work properly.

5109. By Raphael Collet (OpenERP) on 2013-10-16

[MERGE] from trunk

5110. By Raphael Collet (OpenERP) on 2013-10-16

[IMP] fields2: cleanup of Field.interface

5111. By Raphael Collet (OpenERP) on 2013-10-16

[IMP] fields2: improve code about digits in field Float

5112. By Raphael Collet (OpenERP) on 2013-10-17

[IMP] fields, fields2: cleanup of code converting one to another

5113. By Raphael Collet (OpenERP) on 2013-10-17

[IMP] fields2: uniformize internal API to export field attributes

5114. By Raphael Collet (OpenERP) on 2013-10-17

[FIX] orm: in _add_missing_default_values, do not ask default values for magic fields

5115. By Raphael Collet (OpenERP) on 2013-10-24

[IMP] openerp/tools: optimize lazy_property.reset_all()

5116. By Raphael Collet (OpenERP) on 2013-10-24

[REVERT] snake-casing of model names: not worth the bugs and performance penalty

5117. By Raphael Collet (OpenERP) on 2013-10-24

[MERGE] trunk-apiculture-stw: make logs from mail server less noisy

5118. By Stephane Wirtel (OpenERP) on 2013-10-25

[FIX][TMP] Use a fields.char instead of the fields.function(selection) for the ir.ui.view#type field

5119. By Stephane Wirtel (OpenERP) on 2013-10-25

[FIX] Authorize the modules to define new kind of views.

5120. By Raphael Collet (OpenERP) on 2013-10-28

[IMP] ir_ui_view: improve method name

5121. By Stephane Wirtel (OpenERP) on 2013-10-28

[MERGE] trunk-apiculture-recname: avoid non-null constraint if _rec_name is required

5122. By Raphael Collet (OpenERP) on 2013-10-29

[FIX] ir_ui_menu: put the menu cache on the model's class, instead of an instance

5123. By Stephane Wirtel (OpenERP) on 2013-10-30

[FIX] In the ORM, the functions who start with 'set_' are used by the
default_get method. But it's not the case for set_default_value_on_column.
We rename this method to avoid this mistake.

5124. By Raphael Collet (OpenERP) on 2013-11-05

[FIX] ir_model_data: put the cache dictionary 'loads' on the class instead of an instance

5125. By Raphael Collet (OpenERP) on 2013-11-05

[IMP] orm: refactor method create_instance()

5126. By Raphael Collet (OpenERP) on 2013-11-05

[IMP] orm: remove method __getattr__ from BaseModel; it is bug-prone and not really useful

5127. By Raphael Collet (OpenERP) on 2013-11-06

[IMP] scope: small code refactoring

5128. By Raphael Collet (OpenERP) on 2013-11-06

[IMP] ir_sequence: small code cleanup to help API converters

5129. By Raphael Collet (OpenERP) on 2013-11-06

[IMP] orm, scope: move the 'draft' flag on the scope instead of the records

5130. By Raphael Collet (OpenERP) on 2013-11-06

[IMP] scope: draft mode is now global to all scopes

5131. By Stephane Wirtel (OpenERP) on 2013-11-07

[FIX] openerp/report: use_global_header is a transient field on the ir.action.report.xml object. We use it to avoid a change in the API.

5132. By Stephane Wirtel (OpenERP) on 2013-11-07

[FIX] test_mail: Rewrite the XSS test

5133. By Raphael Collet (OpenERP) on 2013-11-07

[IMP] orm: simplify the records cache (remove slots)

5134. By Raphael Collet (OpenERP) on 2013-11-12

[IMP] api, fields: @depends can now be given a function to compute dependencies
For field 'display_name', this optimizes triggers, since dependencies were given
as '*', which adds a trigger on *all* fields of the model!

5135. By Raphael Collet (OpenERP) on 2013-11-12

[MERGE] from trunk

5136. By Raphael Collet (OpenERP) on 2013-11-18

[MERGE] from trunk

5137. By Raphael Collet (OpenERP) on 2013-11-19

[FIX] orm: insert the instance in the registry sooner (fixes missing fields in _inherits_reload())

5138. By Stephane Wirtel (OpenERP) on 2013-11-19

[IMP] Add a new test for the inheritance computing.

5139. By Stephane Wirtel (OpenERP) on 2013-11-19

[IMP] Add a test for the new api. This test will create a new model and checks
that we can add a new attribute on the instance of a model.

Sometimes, by example, in the report engine, we add a new attribute on the
instance. By the way, we can add this attribute without any write to the
database.

5140. By Stephane Wirtel (OpenERP) on 2013-11-19

[FIX] Add a new attribue into the instance of the ir.actions.report.xml instance
because we need of a flag to use or not the right header in the report engine.

The previous implementation was wrong! Sorry

5141. By Stephane Wirtel (OpenERP) on 2013-11-19

[REF] Rewrite the fields_get method of the ORM. Especially the part for the
translation. This new implementation is just a refactoring and does not change
the behavior the function.

5142. By Raphael Collet (OpenERP) on 2013-11-19

[IMP] orm: improve __sub__ and __and__ on records, avoid comparing dict contents

5143. By Raphael Collet (OpenERP) on 2013-11-19

[IMP] base: always use method read() with multiple ids (this is necessary to change its API)

5144. By Raphael Collet (OpenERP) on 2013-11-20

[FIX] res_company: fix call to read()

5145. By Raphael Collet (OpenERP) on 2013-11-20

[IMP] new fields: decorator @one enables recursive computation of fields

5146. By Raphael Collet (OpenERP) on 2013-11-20

[IMP] new fields: enable recursive computation of stored fields, too

5147. By Raphael Collet (OpenERP) on 2013-11-20

[IMP] orm: reimplement method read() using the new API
 - call chain:
    record.read() uses new API to get and convert values
    -> field.__get__() retrieves value from cache or compute it
    -> field.determine_value() determines whether to compute or read value
    -> record._prefetch_field() determines which records and fields to read
    -> record._read_into_cache() actually reads data and store it in cache
 - exceptions are stored as values in cache, and raised upon reading cache
 - added a new exception for missing records
 - ISSUE: we cannot reproduce the behavior of read() with a single id; it now
   returns a list of dicts instead of a dict

5148. By Stephane Wirtel (OpenERP) on 2013-11-21

[FIX] base: The default value for the name of a currency rate is now a
field.datetime, and thus in this case, we have to use the default value for this
kind of a field.

5149. By Stephane Wirtel (OpenERP) on 2013-11-26

[FIX] openerp/osv/orm: Check if the fields parameter of the read method is not
None or False. In this case, the method will use the _fields attribute of the
current object. Otherwise, this code will crash because a boolean is not
iterable.

5150. By Raphael Collet (OpenERP) on 2013-12-02

[IMP] scope: optimize API of scope.invalidate(), resulting in 5% to 10% speedup
 - every call to proxy.invalidate iterates over all scopes (which is costly to access)
 - the new api groups many calls into a single one, which leads to less access to all_scopes

5151. By Raphael Collet (OpenERP) on 2013-12-02

[IMP] orm: rename _read_cache into _get_cache to make it less confusing

5152. By Raphael Collet (OpenERP) on 2013-12-02

[IMP] orm: change structure of the cache, resulting in 5-10% speedup
 - new cache is indexed by field object, then by record id
 - cache access is a bit slower, but invalidation is way faster

5153. By Raphael Collet (OpenERP) on 2013-12-03

[IMP] orm: private method _update_cache now updates all records in self

5154. By Raphael Collet (OpenERP) on 2013-12-03

[REF] fields2: generalize FailedValues to special values stored in the cache
 - SpecialValue encapsulates null values in new records missing default values
 - FailedValue encapsulates exceptions for various kinds of failures to report
 - These special values transmit information from the point where a field value
   is determined to the point where the cache is actually read.

5155. By Raphael Collet (OpenERP) on 2013-12-03

[FIX] fields2: undefined variable

5156. By Raphael Collet (OpenERP) on 2013-12-03

[FIX] base: missing dependency on computed field

5157. By Raphael Collet (OpenERP) on 2013-12-05

[MERGE] from trunk

5158. By Raphael Collet (OpenERP) on 2013-12-09

[IMP] scope: rename method SUDO() into sudo()

5159. By Raphael Collet (OpenERP) on 2013-12-09

[FIX] new fields: fix scope mess in related fields, and evaluate name_get() in sudo mode in convert_to_read()

5160. By Raphael Collet (OpenERP) on 2013-12-09

[FIX] fields2: add cache converter on text fields, and remove it from binary fields
 - this fixes two broken tests in test_impex
 - change type of field 'domain' on 'ir.rule' to 'binary' (value is a Python list)

5161. By Raphael Collet (OpenERP) on 2013-12-09

[FIX] fields: add missing comma in tuple

5162. By Raphael Collet (OpenERP) on 2013-12-10

[FIX] orm: method name_get() must evaluate display_name in the current scope, not self's own scope

5163. By Raphael Collet (OpenERP) on 2013-12-10

[REF] orm: make AccessError and MissingError children classes of except_orm
Why? Because some modules handle access right errors by catching except_orm!

5164. By Raphael Collet (OpenERP) on 2013-12-10

[FIX] orm: before getting records in cache, always make sure the record to read is in cache!

5165. By Raphael Collet (OpenERP) on 2013-12-11

[IMP] orm: improve method check_field_access_rights()

5166. By Raphael Collet (OpenERP) on 2013-12-11

[FIX] fields2: when setting related fields, do not assign null records

5167. By Raphael Collet (OpenERP) on 2013-12-12

[IMP] orm: add properties _cr, _uid, _context on recordsets (bw compatibility w/ browse records)

5168. By Stephane Wirtel (OpenERP) on 2013-12-12

[IMP] Keep the backward compatibility with the old version of OpenERP

5169. By Stephane Wirtel (OpenERP) on 2013-12-16

[FIX] Pass the rights parameter to the right method in the wrapper

5170. By Raphael Collet (OpenERP) on 2014-01-06

[MERGE] from trunk

5171. By Raphael Collet (OpenERP) on 2014-01-06

[IMP] orm: simplify the query for reading 'classic_write' columns

5172. By Stephane Wirtel (OpenERP) on 2014-01-06

[FIX] On OSX, the system has a lot of Bitmap fonts, and in this case, Reportlab
can not load the 'head' table from the structure of the TTF file. There is no
good way to check if a TTF file is an old style or new style.

5173. By Raphael Collet (OpenERP) on 2014-01-07

[FIX] orm: add access rights check for fields in read()

5174. By Raphael Collet (OpenERP) on 2014-01-09

[IMP] api: add method decorators 'old' and 'new' to manually define api implementations
This allows to remove the hack that handles the case of method 'read': its old-style
implementation is given explicitly.

5175. By Raphael Collet (OpenERP) on 2014-01-13

[FIX] fields: decorate functions used in fields (selection, domain) to make them callable with both apis

5176. By Raphael Collet (OpenERP) on 2014-01-13

[IMP] api: make scope getter function more specific

5177. By Raphael Collet (OpenERP) on 2014-01-13

[MERGE] from trunk

5178. By Stephane Wirtel (OpenERP) on 2014-01-13

[MERGE] from trunk

5179. By Raphael Collet (OpenERP) on 2014-01-14

[FIX] fields: add api wrapper for selection function in function fields

5180. By Raphael Collet (OpenERP) on 2014-01-14

[IMP] orm: improve code of method create()

5181. By Raphael Collet (OpenERP) on 2014-01-20

[MERGE] from trunk

5182. By Raphael Collet (OpenERP) on 2014-01-21

[IMP] orm: modify the chain of calls for reading records such that overridden read() is taken into account
 - motivation: if method read() is overridden, field.__get__() uses it!
 - records.read() calls records._read_from_database() to store values in cache,
   then it retrieves values from the cache (included computed fields)
 - field.__get__() retrieves stored fields by calling record._prefetch_field(),
   which calls records.read() for stored fields only (no call loop!)

5183. By Raphael Collet (OpenERP) on 2014-01-21

[FIX] orm: in _read_from_database(), avoid getting post fields with empty ids list

5184. By Raphael Collet (OpenERP) on 2014-01-22

[FIX] scope: make the draft switch more robust in case of exceptions

5185. By Raphael Collet (OpenERP) on 2014-01-22

[IMP] api: make the decorators 'old' and 'new' more intuitive

5186. By Raphael Collet (OpenERP) on 2014-01-28

[MERGE] from trunk

5187. By Raphael Collet (OpenERP) on 2014-01-28

[IMP] orm: do not override some magic fields when they are already declared

5188. By Raphael Collet (OpenERP) on 2014-01-29

[FIX] orm: in _apply_ir_rules, fix and simplify code that tests truthness of a model
 - in the new API, the model is an empty instance, hence not true
 - as the 'child_model' is always self, simply use self

5189. By Raphael Collet (OpenERP) on 2014-01-30

[IMP] yaml_import: add hook to get the right line number when debugging python in yaml files

5190. By Raphael Collet (OpenERP) on 2014-01-30

[FIX] ir_actions: wrong test with self.pool.get

5191. By Raphael Collet (OpenERP) on 2014-02-03

[IMP] api: in guess(), old-style methods with kwargs are assumed to use context

5192. By Raphael Collet (OpenERP) on 2014-02-04

[MERGE] from trunk

5193. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] api: make api guesser more robust when class value is not a function

5194. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] ir_ui_view: abusive use of registry.get

5195. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] ir_model: return None instead of a browse_null, since no model is available

5196. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] res_users: rename _table_name into _name

5197. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] ir_qweb: fix old-fashioned ._model

5198. By Raphael Collet (OpenERP) on 2014-02-04

[FIX] tests: mute logger in ir_ui_view

5199. By Raphael Collet (OpenERP) on 2014-02-05

[FIX] orm: use clear() to reset the ormcache dict, instead of assigning ormcache on an instance!

5200. By Raphael Collet (OpenERP) on 2014-02-05

[FIX] orm: reintroduce attribute _model for backward compatibility

5201. By Raphael Collet (OpenERP) on 2014-02-05

[FIX] fields: reintroduce class method selection.reify()

5202. By Raphael Collet (OpenERP) on 2014-02-05

[FIX] fields: parameter 'domain' may be a callable that takes one argument (the model)

5203. By Raphael Collet (OpenERP) on 2014-02-10

[FIX] ir_ui_view: add api decorator to method that does not follow conventions

5204. By Raphael Collet (OpenERP) on 2014-02-10

[MERGE] from trunk

5205. By Raphael Collet (OpenERP) on 2014-02-10

[MERGE] from trunk

5206. By Raphael Collet (OpenERP) on 2014-02-10

[MERGE] from trunk

5207. By Raphael Collet (OpenERP) on 2014-02-10

[FIX] openerp: fix imports (circular dependencies)

5208. By Raphael Collet (OpenERP) on 2014-02-10

[FIX] tests: move test_fields under module test_new_api, which defines a model for it

5209. By Raphael Collet (OpenERP) on 2014-02-11

[MERGE] from trunk

5210. By Raphael Collet (OpenERP) on 2014-02-12

[IMP] orm: rewrite method browse in both old and new style

5211. By Raphael Collet (OpenERP) on 2014-02-13

[MERGE] from trunk

[Christophe Simonis (OpenERP) (kangol)]

First (global) look:
openerp/addons/base/ir/ir_translation.py: why removing the check of the existence of the record?
tools/translate.py: as there is always a scope why not rewrite _() to use current scope instead of using the stack to find the lang... (if no scope, just return the input)?
tools/convert.py: why create a new scope for each tag? a scope for the whole file is enough. NOTE: IIRC a tag <record> can use another uid.
tools/yaml_import.py: same here, a scope for the whole file.
osv/fields.py: in get() methods, no need to create a new scope, current scope is ok.
osv/scope.py: I don't like the "proxy" variable name. what's wrong with scope (except the easy confusion with Scope)
osv/orm.py: not yet review...

review: Needs Fixing

[Christophe Simonis (OpenERP) (kangol)]

About one scope per xml/yaml file: After some tests, it make the code more complex, difficult to read. And runbot turn red, so I must left some place where to create another scope. A more importantly, it doesn't seem to make any difference in term of speed. So keep it as it (at least for now)

[lp:~openerp-dev/openobject-server/trunk-apiculture]

5212. By Raphael Collet (OpenERP) on 2014-02-17

[MERGE] from trunk

5213. By Raphael Collet (OpenERP) on 2014-02-17

[FIX] openerp.http: introduce scope for processing request

5214. By Raphael Collet (OpenERP) on 2014-02-18

[IMP] orm: turn recomputation manager's api into a mutable mapping

5215. By Raphael Collet (OpenERP) on 2014-02-19

[IMP] orm: use a proxy dictionary to access a record's cache as record._cache[name]

5216. By Raphael Collet (OpenERP) on 2014-02-20

[IMP] orm: improve method onchange() to handle *2many fields

5217. By Raphael Collet (OpenERP) on 2014-02-20

[FIX] orm: do not set inverse fields in cache, as this does not work with related fields

5218. By Raphael Collet (OpenERP) on 2014-02-20

[IMP] orm, fields: improve method convert_to_write() to have nicer results in the case of onchange()

5219. By Raphael Collet (OpenERP) on 2014-02-24

[IMP] orm: improve method record.map(fields)

5220. By Raphael Collet (OpenERP) on 2014-02-24

[ADD] orm: add flag _dirty on records, and use it to determine changes in onchange()

5221. By Raphael Collet (OpenERP) on 2014-02-24

[IMP] orm: move code around, and add some documentation

5222. By Raphael Collet (OpenERP) on 2014-02-24

[FIX] orm: small fixes and improvements in RecordCache

5223. By Raphael Collet (OpenERP) on 2014-02-26

[IMP] test_new_api: rewrite all models and tests, and define views for manual test

5224. By Raphael Collet (OpenERP) on 2014-02-27

[FIX] orm, test_new_api: fix onchange method to handle {one,many}2many fields

5225. By Raphael Collet (OpenERP) on 2014-02-27

[IMP] fields2: when assigning records.stuff = value, only records[0] is updated

5226. By Raphael Collet (OpenERP) on 2014-02-27

[FIX] orm, test_new_api: fix onchange method in special case (modified {one,many}2many field becomes dirty)

5227. By Raphael Collet (OpenERP) on 2014-02-27

[IMP] orm: move hack in onchange() to something cleaner in new()

5228. By Raphael Collet (OpenERP) on 2014-02-27

[FIX] fields2: related fields never have an inverse field

5229. By Raphael Collet (OpenERP) on 2014-02-27

[IMP] orm: setitem in record._cache does not convert value

5230. By Raphael Collet (OpenERP) on 2014-02-27

[IMP] orm: optimize cache invalidation in methods _create() and _write()

5231. By Raphael Collet (OpenERP) on 2014-03-03

[MERGE] from trunk

5232. By Raphael Collet (OpenERP) on 2014-03-04

[FIX] fields2: properties 'model' and 'comodel' cannot be memoized, since they refer to a scope

5233. By Raphael Collet (OpenERP) on 2014-03-04

[IMP] orm: swap arguments of generic method onchange()

5234. By Raphael Collet (OpenERP) on 2014-03-04

[FIX] fields2: fix Many2many.inverse_field by setting up field attributes correcly

5235. By Raphael Collet (OpenERP) on 2014-03-05

[FIX] orm: allow method new() to take 'id' in values; this helps onchange()

5236. By Raphael Collet (OpenERP) on 2014-03-05

[IMP] orm: in onchange(), for *2many fields, export the subfields in tocheck only

5237. By Raphael Collet (OpenERP) on 2014-03-06

[FIX] test_new_api: fix views

5238. By Raphael Collet (OpenERP) on 2014-03-06

[IMP] orm: in onchange(), prefetch all subrecords to avoid having false dirty records

5239. By Raphael Collet (OpenERP) on 2014-03-06

[ADD] ir.ui.view: automatic addition of on_change attributes using computed field dependencies

5240. By Raphael Collet (OpenERP) on 2014-03-10

[IMP] yaml_import: add new-style onchange evaluation

5241. By Raphael Collet (OpenERP) on 2014-03-13

[IMP] fields2: allow assigning date strings to datetime fields (automatically add 00:00:00)

5242. By Raphael Collet (OpenERP) on 2014-03-17

[FIX] when converting many2one for write, never let a NewId escape, and return a dict instead

5243. By Raphael Collet (OpenERP) on 2014-03-17

[IMP] orm: improve assert message in browse()

5244. By Raphael Collet (OpenERP) on 2014-03-18

[FIX] orm: improve onchange() to not let it modify its arguments

5245. By Raphael Collet (OpenERP) on 2014-03-18

[FIX] fields2: in Many2one.convert_to_write, convert dictionary too

5246. By Raphael Collet (OpenERP) on 2014-03-18

[IMP] test_new_api: add missing access rights

5247. By Raphael Collet (OpenERP) on 2014-03-18

[FIX] fields2: in One2many.convert_to_write, select fields from the right model!

5248. By Raphael Collet (OpenERP) on 2014-03-19

[IMP] design change: make the registry instance old-style API, and use new-style API with records only

5249. By Raphael Collet (OpenERP) on 2014-03-19

[IMP] orm: rename method scoped() into attach_scope() and improve it

5250. By Raphael Collet (OpenERP) on 2014-03-20

[IMP] fields2: improve implementation of get_description(), to_column(), and setup_related()

5251. By Raphael Collet (OpenERP) on 2014-03-20

[IMP] fields2: remove properties 'model' and 'comodel' that were depending on scope

5252. By Raphael Collet (OpenERP) on 2014-03-20

[IMP] fields2: make get_description() scope-free

5253. By Raphael Collet (OpenERP) on 2014-03-24

[IMP] fields2: make methods determine_* and modified_* scope-free

5254. By Raphael Collet (OpenERP) on 2014-03-25

[IMP] fields2: make methods convert_to_* scope-free

5255. By Raphael Collet (OpenERP) on 2014-03-25

[IMP] fields2: make all methods scope-free

5256. By Raphael Collet (OpenERP) on 2014-03-25

[IMP] fields2: simple code reorganization

5257. By Raphael Collet (OpenERP) on 2014-03-25

[IMP] scope: reimplement draft mode and recomputation object

5258. By Raphael Collet (OpenERP) on 2014-03-26

[IMP] orm: decorate invalidate_cache() with @model, and fix calls accordingly

5259. By Raphael Collet (OpenERP) on 2014-03-26

[IMP] api: add function propagate_returns()

5260. By Raphael Collet (OpenERP) on 2014-03-26

[IMP] design change: scopes are no longer stacked, we only use the scope of records

5261. By Raphael Collet (OpenERP) on 2014-03-26

[FIX] test_new_api: fix scope usage according to new design

5262. By Raphael Collet (OpenERP) on 2014-03-26

[IMP] orm: add method sudo() on records

5263. By Raphael Collet (OpenERP) on 2014-03-27

[IMP] openerp: remove unused imports

5264. By Raphael Collet (OpenERP) on 2014-03-27

[IMP] fields2: improve field triggers (and hide more their implementation)

5265. By Raphael Collet (OpenERP) on 2014-03-27

[FIX] scope: method invalidate() was unexpectedly screwing up cache while computing default values

5266. By Raphael Collet (OpenERP) on 2014-03-27

[FIX] yaml_import: fix call to onchange()

5267. By Raphael Collet (OpenERP) on 2014-03-27

[IMP] orm: improve api of _prefetch_field() and _in_cache_without()

5268. By Raphael Collet (OpenERP) on 2014-03-31

[FIX] openerp/tools/translate: adapt to api changes

5269. By Raphael Collet (OpenERP) on 2014-03-31

[MERGE] from trunk

5270. By Raphael Collet (OpenERP) on 2014-03-31

[IMP] orm: print traceback when recomputation fails

5271. By Raphael Collet (OpenERP) on 2014-03-31

[IMP] scope: in scope, store context as an immutable dict

5272. By Raphael Collet (OpenERP) on 2014-03-31

[IMP] yaml_import: when logging assertion failures, print line number

5273. By Raphael Collet (OpenERP) on 2014-03-31

[FIX] scope: add method has_key() in Context, for backward compatibility

5274. By Raphael Collet (OpenERP) on 2014-03-31

[IMP] base: do not modify context dictionary in method

5275. By Raphael Collet (OpenERP) on 2014-03-31

[IMP] scope: improve usage of immutable dict, and move its implementation to openerp.tools

5276. By Raphael Collet (OpenERP) on 2014-04-01

[FIX] ir_cron: add scope management, and make it reentrant

5277. By Raphael Collet (OpenERP) on 2014-04-02

[IMP] scope: remove method sudo() on scopes, which is not much useful, contrary to sudo() on records

5278. By Raphael Collet (OpenERP) on 2014-04-02

[IMP] api: fix documentation

5279. By Raphael Collet (OpenERP) on 2014-04-02

[REF] scope: rename 'scope' into 'env', and 'Scope' into 'Environment'

5280. By Raphael Collet (OpenERP) on 2014-04-02

[IMP] orm: rename method map() into _map_field()

5281. By Raphael Collet (OpenERP) on 2014-04-02

[IMP] orm, env: rename property cache_ids into prefetch

5282. By Raphael Collet (OpenERP) on 2014-04-03

[IMP] orm, env: simplify and improve implementation of recomputation

5283. By Raphael Collet (OpenERP) on 2014-04-03

[IMP] orm, env: improve implementation of draft mode

5284. By Raphael Collet (OpenERP) on 2014-04-07

[IMP] fields2: improve management of compute, inverse, search, and add support for default values

5285. By Raphael Collet (OpenERP) on 2014-04-07

[FIX] fields2: add support for recursively defined fields

5286. By Raphael Collet (OpenERP) on 2014-04-07

[MERGE] from trunk

5287. By Raphael Collet (OpenERP) on 2014-04-14

[MERGE] from trunk

5288. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] orm: simplify new-style api of field-specific onchange methods

5289. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] ir_ui_view: automatically add on_change="1" in the presence of a specific onchange method

5290. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] fields2: add methods today(), now(), from_string() and to_string() on Date and Datetime

5291. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] orm: add methods filter() and map() on records

5292. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] openerp: add _ and new field classes in top-level module

5293. By Raphael Collet (OpenERP) on 2014-04-16

[IMP] fields2: allow a function to be passed as default value

5294. By Raphael Collet (OpenERP) on 2014-04-17

[IMP] orm: improve method sudo(), and rename attach_env to _attach_env

5295. By Raphael Collet (OpenERP) on 2014-04-17

[FIX] ir_ui_menu: rewrite method _filter_visible_menu() because of an infinite recursion when prefetching menu.child_id

5296. By Raphael Collet (OpenERP) on 2014-04-17

[FIX] fields2: handle the case where an integer field is used as inverse for a one2many

5297. By Raphael Collet (OpenERP) on 2014-04-17

[MERGE] from trunk

5298. By Raphael Collet (OpenERP) on 2014-04-17

[IMP] orm: rename attribute _env to env

5299. By Raphael Collet (OpenERP) on 2014-04-22

[FIX] fields2: make field 'id' stored in order to make it present in 'ir.model.fields'

5300. By Raphael Collet (OpenERP) on 2014-04-22

[FIX] orm: fix value of 'select_level' when creating entries in 'ir.model.fields'

5301. By Raphael Collet (OpenERP) on 2014-04-22

[IMP] fields2: add an option 'index' to create an index

5302. By Raphael Collet (OpenERP) on 2014-04-22

[IMP] env: use the new API of ir.model.data

5303. By Raphael Collet (OpenERP) on 2014-04-24

[IMP] yaml_import: extend tag !python to support the new api

5304. By Raphael Collet (OpenERP) on 2014-04-29

[IMP] orm: in method exists(), mark non-existing records in cache

5305. By Raphael Collet (OpenERP) on 2014-04-29

[IMP] orm, fields2: when recomputing a stored field, mark all computed fields as done

5306. By Raphael Collet (OpenERP) on 2014-04-29

[IMP] fields2: when recomputing several fields, save them all in one shot

5307. By Raphael Collet (OpenERP) on 2014-04-29

[MERGE] from trunk

5308. By Raphael Collet (OpenERP) on 2014-04-30

[FIX] fields2: clarify method determine_value, and use self.depends instead of self.compute for computed fields

5309. By Raphael Collet (OpenERP) on 2014-04-30

[FIX] fields2: recompute records in their original env

5310. By Raphael Collet (OpenERP) on 2014-04-30

[IMP] orm: optimize onchange() by removing prefetching that no longer seems necessary

5311. By Raphael Collet (OpenERP) on 2014-05-05

[MERGE] from trunk

5312. By Raphael Collet (OpenERP) on 2014-05-05

[IMP] fields, field2: add attributes 'deprecated' and 'oldname' on Field

5313. By Raphael Collet (OpenERP) on 2014-05-05

[IMP] api: add an explicit decorator for onchange methods

5314. By Raphael Collet (OpenERP) on 2014-05-05

[IMP] orm, fields2: improve api of method add_default_value

5315. By Raphael Collet (OpenERP) on 2014-05-06

[FIX] fields2: when assigning a dependency of a field being computed, do not invalidate the latter

5316. By Raphael Collet (OpenERP) on 2014-05-06

[IMP] orm: remove property _id, and change method unbrowse() into property ids

5317. By Raphael Collet (OpenERP) on 2014-05-08

[IMP] fields2: add support for free attributes on fields; they are passed as parameters when converting to a column object

5318. By Raphael Collet (OpenERP) on 2014-05-08

[IMP] fields2: rename interface_for into _origin

5319. By Raphael Collet (OpenERP) on 2014-05-08

[FIX] res_config: fixed lookup for non-existing column

5320. By Raphael Collet (OpenERP) on 2014-05-12

[REV] orm: reintroduce method __getattr__ for signals because it is used everywhere in addons

5321. By Raphael Collet (OpenERP) on 2014-05-12

[MERGE] from trunk

5322. By Raphael Collet (OpenERP) on 2014-05-12

[IMP] api: optimize hasattr(self, '_ids') in method wrapper

5323. By Raphael Collet (OpenERP) on 2014-05-12

[FIX] fields2: in related fields, do not copy attributes required and states from related field

5324. By Raphael Collet (OpenERP) on 2014-05-14

[FIX] fields2: web client does not like (5,) in many2many fields

5325. By Raphael Collet (OpenERP) on 2014-05-14

[FIX] ir_ui_view: use _fields instead of _columns or _all_columns, because pure computed fields are not recognized

5326. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] res_currency: improve new api of methods like round(), is_zero(), etc

5327. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] orm: add small method for sorting recordsets

5328. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] env: add parameter to method ref() to prevent exceptions

5329. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] fields2: improve convert_to_write for *2many fields

5330. By Raphael Collet (OpenERP) on 2014-05-14

[FIX] res_users: when reifying a list of groups, parse the list in case it contains commands

5331. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] test_new_api: fix test on copied attributes of related fields

5332. By Raphael Collet (OpenERP) on 2014-05-15

[IMP] orm: when updating tables, recompute fields with actual dependencies

5333. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] orm, fields2: for recomputing fields, now recompute() saves to database

The former implementation had a subtle bug when a field to recompute depends on
another field to recompute. The second field was determined in draft mode, so it
was computed in cache but not saved to database. Later, method recompute() finds
its value in cache and marks it as done!

5334. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] orm: in onchange(), do not expect field to be in values; this happens in yaml files when field is false

5335. By Raphael Collet (OpenERP) on 2014-05-19

[ADD] fields2: method Date.context_today()

Unmerged revisions

5335. By Raphael Collet (OpenERP) on 2014-05-19

[ADD] fields2: method Date.context_today()

5334. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] orm: in onchange(), do not expect field to be in values; this happens in yaml files when field is false

5333. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] orm, fields2: for recomputing fields, now recompute() saves to database

The former implementation had a subtle bug when a field to recompute depends on
another field to recompute. The second field was determined in draft mode, so it
was computed in cache but not saved to database. Later, method recompute() finds
its value in cache and marks it as done!

5332. By Raphael Collet (OpenERP) on 2014-05-15

[IMP] orm: when updating tables, recompute fields with actual dependencies

5331. By Raphael Collet (OpenERP) on 2014-05-15

[FIX] test_new_api: fix test on copied attributes of related fields

5330. By Raphael Collet (OpenERP) on 2014-05-14

[FIX] res_users: when reifying a list of groups, parse the list in case it contains commands

5329. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] fields2: improve convert_to_write for *2many fields

5328. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] env: add parameter to method ref() to prevent exceptions

5327. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] orm: add small method for sorting recordsets

5326. By Raphael Collet (OpenERP) on 2014-05-14

[IMP] res_currency: improve new api of methods like round(), is_zero(), etc

=== modified file 'doc/03_module_dev_02.rst'
--- doc/03_module_dev_02.rst	2013-06-19 09:13:32 +0000
+++ doc/03_module_dev_02.rst	2014-05-19 13:53:27 +0000
@@ -615,6 +615,7 @@
   	  reference. :guilabel:`relation` is the table to look up that
   	  reference in.
 
+.. _fields-functional:
 
 Functional Fields
 +++++++++++++++++

=== modified file 'doc/03_module_dev_03.rst'
--- doc/03_module_dev_03.rst	2013-09-04 12:58:42 +0000
+++ doc/03_module_dev_03.rst	2014-05-19 13:53:27 +0000
@@ -70,15 +70,21 @@
 On Change
 +++++++++
 
-The on_change attribute defines a method that is called when the content of a view field has changed.
+The on_change attribute defines a method that is called when the
+content of a view field has changed.
 
-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::
+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::
 
         <field name="name_of_field" on_change="name_of_method(other_field'_1_', ..., other_field'_n_')"/> 
 
 The example below is from the sale order view.
 
-You can use the 'context' keyword to access data in the context that can be used as params of the function.::
+You can use the 'context' keyword to access data in the context that
+can be used as params of the function.::
 
         <field name="shop_id" on_change="onchange_shop_id(shop_id)"/>
 
@@ -100,7 +106,10 @@
             return {'value':v} 
 
 
-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.
+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.
 
 Note that it is possible to change more than just the values of
 fields. For example, it is possible to change the value of some fields

=== modified file 'doc/api_models.rst'
--- doc/api_models.rst	2012-11-11 02:10:22 +0000
+++ doc/api_models.rst	2014-05-19 13:53:27 +0000
@@ -1,7 +1,21 @@
 
-ORM and models
---------------
+ORM and Models
+==============
 
 .. automodule:: openerp.osv.orm
    :members:
    :undoc-members:
+
+Scope Management
+================
+
+.. automodule:: openerp.osv.scope
+   :members:
+   :undoc-members:
+
+API Decorators
+==============
+
+.. automodule:: openerp.osv.api
+   :members:
+   :undoc-members:

=== modified file 'doc/index.rst'
--- doc/index.rst	2013-07-31 15:16:36 +0000
+++ doc/index.rst	2014-05-19 13:53:27 +0000
@@ -38,9 +38,10 @@
 .. toctree::
    :maxdepth: 1
 
-   orm-methods.rst
-   api_models.rst
-   routing.rst
+   new_api
+   orm-methods
+   api_models
+   routing
 
 Changelog
 '''''''''

=== added file 'doc/new_api.rst'
--- doc/new_api.rst	1970-01-01 00:00:00 +0000
+++ doc/new_api.rst	2014-05-19 13:53:27 +0000
@@ -0,0 +1,138 @@
+==================
+High-level ORM API
+==================
+
+.. _compute:
+
+Computed fields: defaults and function fields
+=============================================
+
+The high-level API attempts to unify concepts of programmatic value generation
+for function fields (stored or not) and default values through the use of
+computed fields.
+
+Fields are marked as computed by setting their ``compute`` attribute to the
+name of the method used to compute then::
+
+    has_sibling = fields.Integer(compute='compute_has_sibling')
+
+by default computation methods behave as simple defaults in case no
+corresponding value is found in the database::
+
+    def default_number_of_employees(self):
+        self.number_of_employees = 1
+
+.. todo::
+
+    literal defaults::
+
+        has_sibling = fields.Integer(compute=fields.default(1))
+
+but they can also be used for computed fields by specifying fields used for
+the computation. The dependencies can be dotted for "cascading" through
+related models::
+
+    @api.depends('parent_id.children_count')
+    def compute_has_sibling(self):
+        self.has_sibling = self.parent_id.children_count >= 2
+
+.. todo::
+
+    function-based::
+
+        has_sibling = fields.Integer()
+        @has_sibling.computer
+        @api.depends('parent_id.children_count')
+        def compute_has_sibling(self):
+            self.has_sibling = self.parent_id.children_count >= 2
+
+note that computation methods (defaults or others) do not *return* a value,
+they *set*  values the current object. This means the high-level API does not
+need :ref:`an explicit multi <fields-functional>`: a ``multi`` method is
+simply one which computes several values at once::
+
+    @api.depends('company_id')
+    def compute_relations(self):
+        self.computed_company = self.company_id
+        self.computed_companies = self.company_id.to_recordset()
+
+Automatic onchange
+==================
+
+Using to the improved and expanded :ref:`computed fields <compute>`, the
+high-level ORM API is able to infer the effect of fields on
+one another, and thus automatically provide a basic form of onchange without
+having to implement it by hand, or implement dozens of onchange functions to
+get everything right.
+
+
+
+
+.. todo::
+
+    deferred records::
+
+        partner = Partner.record(42, defer=True)
+        partner.name = "foo"
+        partner.user_id = juan
+        partner.save() # only saved to db here
+
+        with scope.defer():
+            # all records in this scope or children scopes are deferred
+            #   until corresponding scope poped or until *this* scope poped?
+            partner = Partner.record(42)
+            partner.name = "foo"
+            partner.user_id = juan
+        # saved here, also for recordset &al, ~transaction
+
+        # temp deferment, maybe simpler? Or for bulk operations?:
+        with Partner.record(42) as partner:
+            partner.name = "foo"
+            partner.user_id = juan
+
+    ``id = False`` => always defered? null v draft?
+
+.. todo:: keyword arguments passed positionally (common for context, completely breaks everything)
+
+.. todo:: optional arguments (report_aged_receivable)
+
+.. todo:: non-id ids? (mail thread_id)
+
+.. todo:: partial signatures on overrides (e.g. message_post)
+
+.. todo::
+
+    ::
+
+        field = fields.Char()
+
+        @field.computer
+        def foo(self):
+            "compute foo here"
+
+    ~
+
+    ::
+
+        field = fields.Char(compute='foo')
+
+        def foo(self):
+            "compute foo here"
+
+.. todo:: doc
+
+.. todo:: incorrect dependency spec?
+
+.. todo:: dynamic dependencies?
+
+    ::
+
+        @api.depends(???)
+        def foo(self)
+            self.a = self[self.b]
+
+.. todo:: recursive onchange
+
+    Country & state. Change country -> remove state; set state -> set country
+
+.. todo:: onchange list affected?

=== modified file 'openerp/__init__.py'
--- openerp/__init__.py	2014-02-09 15:18:22 +0000
+++ openerp/__init__.py	2014-05-19 13:53:27 +0000
@@ -67,9 +67,7 @@
 # Imports
 #----------------------------------------------------------
 import addons
-import cli
 import conf
-import http
 import loglevels
 import modules
 import netsvc
@@ -82,5 +80,22 @@
 import tools
 import workflow
 
+#----------------------------------------------------------
+# Model classes, fields, api decorators, and environment
+#----------------------------------------------------------
+from openerp.osv.orm import BaseModel, AbstractModel, Model, TransientModel
+from openerp.osv import fields2 as fields
+from openerp.osv.fields2 import Boolean, Integer, Float, Char, Text, Html, \
+    Date, Datetime, Binary, Selection, Reference, Many2one, One2many, Many2many
+from openerp.osv import api
+from openerp.osv.api import model, multi, one, constrains, depends, onchange, returns
+from openerp.osv.env import Environment
+from openerp.tools.translate import _
+
+#----------------------------------------------------------
+# Other imports, which may require stuff from above
+#----------------------------------------------------------
+import cli
+import http
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== modified file 'openerp/addons/base/__openerp__.py'
--- openerp/addons/base/__openerp__.py	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/__openerp__.py	2014-05-19 13:53:27 +0000
@@ -39,7 +39,6 @@
         'res/res_country_data.xml',
         'security/base_security.xml',
         'base_menu.xml',
-        'res/res_security.xml',
         'res/res_config.xml',
         'res/res.country.state.csv',
         'ir/ir_actions.xml',
@@ -83,7 +82,7 @@
         'res/res_users_view.xml',
         'res/res_partner_data.xml',
         'res/ir_property_view.xml',
-        'security/base_security.xml',
+        'res/res_security.xml',
         'security/ir.model.access.csv',
     ],
     'demo': [

=== modified file 'openerp/addons/base/base_menu.xml'
--- openerp/addons/base/base_menu.xml	2013-10-06 11:26:08 +0000
+++ openerp/addons/base/base_menu.xml	2014-05-19 13:53:27 +0000
@@ -28,6 +28,10 @@
                 <menuitem id="menu_security" name="Security" parent="menu_custom" sequence="25"/>
                 <menuitem id="menu_ir_property" name="Parameters" parent="menu_custom" sequence="24"/>
 
+        <record model="ir.ui.menu" id="base.menu_administration">
+            <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
+        </record>
+
         <record id="action_client_base_menu" model="ir.actions.client">
             <field name="name">Open Settings Menu</field>
             <field name="tag">reload</field>

=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py	2014-05-09 09:49:20 +0000
+++ openerp/addons/base/ir/ir_actions.py	2014-05-19 13:53:27 +0000
@@ -316,14 +316,14 @@
             }
             for res in results:
                 model = res.get('res_model')
-                if model and self.pool.get(model):
+                if model in self.pool:
                     try:
                         with tools.mute_logger("openerp.tools.safe_eval"):
                             eval_context = eval(res['context'] or "{}", eval_dict) or {}
                     except Exception:
                         continue
                     custom_context = dict(context, **eval_context)
-                    res['help'] = self.pool.get(model).get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
+                    res['help'] = self.pool[model].get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
         if ids_int:
             return results[0]
         return results
@@ -339,7 +339,7 @@
         dataobj = self.pool.get('ir.model.data')
         data_id = dataobj._get_id (cr, SUPERUSER_ID, module, xml_id)
         res_id = dataobj.browse(cr, uid, data_id, context).res_id
-        return self.read(cr, uid, res_id, [], context)
+        return self.read(cr, uid, [res_id], [], context)[0]
 
 VIEW_TYPES = [
     ('tree', 'Tree'),
@@ -559,7 +559,7 @@
         'sequence': 5,
         'code': """# You can use the following variables:
 #  - self: ORM model of the record on which the action is triggered
-#  - object: browse_record of the record on which the action is triggered if there is one, otherwise None
+#  - object: Record on which the action is triggered if there is one, otherwise None
 #  - pool: ORM model pool (i.e. self.pool)
 #  - cr: database cursor
 #  - uid: current user id
@@ -815,7 +815,7 @@
     def run_action_client_action(self, cr, uid, action, eval_context=None, context=None):
         if not action.action_id:
             raise osv.except_osv(_('Error'), _("Please specify an action to launch!"))
-        return self.pool[action.action_id.type].read(cr, uid, action.action_id.id, context=context)
+        return self.pool[action.action_id.type].read(cr, uid, [action.action_id.id], context=context)[0]
 
     def run_action_code_multi(self, cr, uid, action, eval_context=None, context=None):
         eval(action.code.strip(), eval_context, mode="exec", nocopy=True)  # nocopy allows to return 'action'
@@ -1077,10 +1077,10 @@
             wizard.write({'state': 'done'})
 
         # Load action
-        act_type = self.pool.get('ir.actions.actions').read(cr, uid, wizard.action_id.id, ['type'], context=context)
+        act_type = wizard.action_id.type
 
-        res = self.pool[act_type['type']].read(cr, uid, wizard.action_id.id, [], context=context)
-        if act_type['type'] != 'ir.actions.act_window':
+        res = self.pool[act_type].read(cr, uid, [wizard.action_id.id], [], context=context)[0]
+        if act_type != 'ir.actions.act_window':
             return res
         res.setdefault('context','{}')
         res['nodestroy'] = True

=== modified file 'openerp/addons/base/ir/ir_attachment.py'
--- openerp/addons/base/ir/ir_attachment.py	2014-04-10 15:20:39 +0000
+++ openerp/addons/base/ir/ir_attachment.py	2014-05-19 13:53:27 +0000
@@ -273,7 +273,7 @@
         # performed in batch as much as possible.
         ima = self.pool.get('ir.model.access')
         for model, targets in model_attachments.iteritems():
-            if not self.pool.get(model):
+            if model not in self.pool:
                 continue
             if not ima.check(cr, uid, model, 'read', False):
                 # remove all corresponding attachment ids
@@ -297,7 +297,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
         self.check(cr, uid, ids, 'read', context=context)
-        return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context, load)
+        return super(ir_attachment, self).read(cr, uid, ids, fields_to_read, context=context, load=load)
 
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):

=== modified file 'openerp/addons/base/ir/ir_cron.py'
--- openerp/addons/base/ir/ir_cron.py	2014-02-28 16:15:24 +0000
+++ openerp/addons/base/ir/ir_cron.py	2014-05-19 13:53:27 +0000
@@ -26,7 +26,7 @@
 from dateutil.relativedelta import relativedelta
 
 import openerp
-from openerp import netsvc
+from openerp import SUPERUSER_ID, netsvc, Environment
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval as eval
@@ -149,36 +149,38 @@
         except Exception, e:
             self._handle_callback_exception(cr, uid, model_name, method_name, args, job_id, e)
 
-    def _process_job(self, job_cr, job, cron_cr):
+    def _process_job(self, cr, job, cron_cr):
         """ Run a given job taking care of the repetition.
 
-        :param job_cr: cursor to use to execute the job, safe to commit/rollback
+        :param cr: cursor to use to execute the job, safe to commit/rollback
         :param job: job to be run (as a dictionary).
         :param cron_cr: cursor holding lock on the cron job row, to use to update the next exec date,
             must not be committed/rolled back!
         """
         try:
-            now = datetime.now() 
-            nextcall = datetime.strptime(job['nextcall'], DEFAULT_SERVER_DATETIME_FORMAT)
-            numbercall = job['numbercall']
+            with Environment.manage():
+                now = datetime.now() 
+                nextcall = datetime.strptime(job['nextcall'], DEFAULT_SERVER_DATETIME_FORMAT)
+                numbercall = job['numbercall']
 
-            ok = False
-            while nextcall < now and numbercall:
-                if numbercall > 0:
-                    numbercall -= 1
-                if not ok or job['doall']:
-                    self._callback(job_cr, job['user_id'], job['model'], job['function'], job['args'], job['id'])
-                if numbercall:
-                    nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
-                ok = True
-            addsql = ''
-            if not numbercall:
-                addsql = ', active=False'
-            cron_cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
-                       (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
+                ok = False
+                while nextcall < now and numbercall:
+                    if numbercall > 0:
+                        numbercall -= 1
+                    if not ok or job['doall']:
+                        self._callback(cr, job['user_id'], job['model'], job['function'], job['args'], job['id'])
+                    if numbercall:
+                        nextcall += _intervalTypes[job['interval_type']](job['interval_number'])
+                    ok = True
+                addsql = ''
+                if not numbercall:
+                    addsql = ', active=False'
+                cron_cr.execute("UPDATE ir_cron SET nextcall=%s, numbercall=%s"+addsql+" WHERE id=%s",
+                           (nextcall.strftime(DEFAULT_SERVER_DATETIME_FORMAT), numbercall, job['id']))
+                self.invalidate_cache(cr, SUPERUSER_ID)
 
         finally:
-            job_cr.commit()
+            cr.commit()
             cron_cr.commit()
 
     @classmethod

=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py	2013-11-23 11:30:53 +0000
+++ openerp/addons/base/ir/ir_mail_server.py	2014-05-19 13:53:27 +0000
@@ -461,21 +461,18 @@
                 mdir.add(message.as_string(True))
                 return message_id
 
+            smtp = None
             try:
                 smtp = self.connect(smtp_server, smtp_port, smtp_user, smtp_password, smtp_encryption or False, smtp_debug)
                 smtp.sendmail(smtp_from, smtp_to_list, message.as_string())
             finally:
-                try:
-                    # Close Connection of SMTP Server
+                if smtp is not None:
                     smtp.quit()
-                except Exception:
-                    # ignored, just a consequence of the previous exception
-                    pass
         except Exception, e:
             msg = _("Mail delivery failed via SMTP server '%s'.\n%s: %s") % (tools.ustr(smtp_server),
                                                                              e.__class__.__name__,
                                                                              tools.ustr(e))
-            _logger.exception(msg)
+            _logger.error(msg)
             raise MailDeliveryException(_("Mail Delivery Failed"), msg)
         return message_id
 

=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2014-05-06 12:16:27 +0000
+++ openerp/addons/base/ir/ir_model.py	2014-05-19 13:53:27 +0000
@@ -28,12 +28,11 @@
 import openerp.modules.registry
 from openerp import SUPERUSER_ID
 from openerp import tools
-from openerp.osv import fields,osv
-from openerp.osv.orm import Model, browse_null
+from openerp.osv import fields, osv
+from openerp.osv.orm import BaseModel, Model, MAGIC_COLUMNS, except_orm
+from openerp.tools import config
 from openerp.tools.safe_eval import safe_eval as eval
-from openerp.tools import config
 from openerp.tools.translate import _
-from openerp.osv.orm import except_orm, browse_record, MAGIC_COLUMNS
 
 _logger = logging.getLogger(__name__)
 
@@ -133,15 +132,10 @@
         ('obj_name_uniq', 'unique (model)', 'Each model must be unique!'),
     ]
 
-    # overridden to allow searching both on model name (model field)
-    # and model description (name field)
-    def _name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100, name_get_uid=None):
-        if args is None:
-            args = []
-        domain = args + ['|', ('model', operator, name), ('name', operator, name)]
-        return self.name_get(cr, name_get_uid or uid,
-                             super(ir_model, self).search(cr, uid, domain, limit=limit, context=context),
-                             context=context)
+    def _search_display_name(self, operator, value):
+        # overridden to allow searching both on model name (model field) and
+        # model description (name field)
+        return ['|', ('model', operator, value), ('name', operator, value)]
 
     def _drop_table(self, cr, uid, ids, context=None):
         for model in self.browse(cr, uid, ids, context):
@@ -177,6 +171,7 @@
 
     def write(self, cr, user, ids, vals, context=None):
         if context:
+            context = dict(context)
             context.pop('__last_update', None)
         # Filter out operations 4 link from field id, because openerp-web
         # always write (4,id,False) even for non dirty items
@@ -207,7 +202,7 @@
             _custom = True
         x_custom_model._name = model
         x_custom_model._module = False
-        a = x_custom_model.create_instance(self.pool, cr)
+        a = x_custom_model._build_model(self.pool, cr)
         if not a._columns:
             x_name = 'id'
         elif 'x_name' in a._columns.keys():
@@ -627,8 +622,8 @@
         """ Check if a specific group has the access mode to the specified model"""
         assert mode in ['read','write','create','unlink'], 'Invalid access mode'
 
-        if isinstance(model, browse_record):
-            assert model._table_name == 'ir.model', 'Invalid model object'
+        if isinstance(model, BaseModel):
+            assert model._name == 'ir.model', 'Invalid model object'
             model_name = model.name
         else:
             model_name = model
@@ -686,8 +681,8 @@
 
         assert mode in ['read','write','create','unlink'], 'Invalid access mode'
 
-        if isinstance(model, browse_record):
-            assert model._table_name == 'ir.model', 'Invalid model object'
+        if isinstance(model, BaseModel):
+            assert model._name == 'ir.model', 'Invalid model object'
             model_name = model.model
         else:
             model_name = model
@@ -755,6 +750,7 @@
             pass
 
     def call_cache_clearing_methods(self, cr):
+        self.invalidate_cache(cr, SUPERUSER_ID)
         self.check.clear_cache(self)    # clear the cache of check function
         for model, method in self.__cache_clearing_methods:
             if model in self.pool:
@@ -763,19 +759,19 @@
     #
     # Check rights on actions
     #
-    def write(self, cr, uid, *args, **argv):
-        self.call_cache_clearing_methods(cr)
-        res = super(ir_model_access, self).write(cr, uid, *args, **argv)
-        return res
-
-    def create(self, cr, uid, *args, **argv):
-        self.call_cache_clearing_methods(cr)
-        res = super(ir_model_access, self).create(cr, uid, *args, **argv)
-        return res
-
-    def unlink(self, cr, uid, *args, **argv):
-        self.call_cache_clearing_methods(cr)
-        res = super(ir_model_access, self).unlink(cr, uid, *args, **argv)
+    def write(self, cr, uid, ids, values, context=None):
+        self.call_cache_clearing_methods(cr)
+        res = super(ir_model_access, self).write(cr, uid, ids, values, context=context)
+        return res
+
+    def create(self, cr, uid, values, context=None):
+        self.call_cache_clearing_methods(cr)
+        res = super(ir_model_access, self).create(cr, uid, values, context=context)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        self.call_cache_clearing_methods(cr)
+        res = super(ir_model_access, self).unlink(cr, uid, ids, context=context)
         return res
 
 class ir_model_data(osv.osv):
@@ -831,8 +827,8 @@
         'date_init': fields.datetime('Init Date')
     }
     _defaults = {
-        'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'date_update': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date_init': fields.datetime.now,
+        'date_update': fields.datetime.now,
         'noupdate': False,
         'module': ''
     }
@@ -842,12 +838,11 @@
 
     def __init__(self, pool, cr):
         osv.osv.__init__(self, pool, cr)
-        self.doinit = True
         # also stored in pool to avoid being discarded along with this osv instance
         if getattr(pool, 'model_data_reference_ids', None) is None:
             self.pool.model_data_reference_ids = {}
-
-        self.loads = self.pool.model_data_reference_ids
+        # put loads on the class, in order to share it among all instances
+        type(self).loads = self.pool.model_data_reference_ids
 
     def _auto_init(self, cr, context=None):
         super(ir_model_data, self)._auto_init(cr, context)
@@ -886,7 +881,7 @@
 
     def xmlid_to_object(self, cr, uid, xmlid, raise_if_not_found=False, context=None):
         """ Return a browse_record
-        if not found and raise_if_not_found is True return the browse_null
+        if not found and raise_if_not_found is True return None
         """ 
         t = self.xmlid_to_res_model_res_id(cr, uid, xmlid, raise_if_not_found)
         res_model, res_id = t
@@ -897,7 +892,7 @@
                 return record
             if raise_if_not_found:
                 raise ValueError('No record found for unique ID %s. It may have been deleted.' % (xml_id))
-        return browse_null()
+        return None
 
     # OLD API
     def _get_id(self, cr, uid, module, xml_id):
@@ -922,7 +917,7 @@
 
     def get_object(self, cr, uid, module, xml_id, context=None):
         """ Returns a browsable record for the given module name and xml_id.
-            If not found, raise a ValueError or return a browse_null, depending
+            If not found, raise a ValueError or return None, depending
             on the value of `raise_exception`.
         """
         return self.xmlid_to_object(cr, uid, "%s.%s" % (module, xml_id), raise_if_not_found=True, context=context)
@@ -959,8 +954,6 @@
         if xml_id and ('.' in xml_id):
             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
             module, xml_id = xml_id.split('.')
-        if (not xml_id) and (not self.doinit):
-            return False
         action_id = False
         if xml_id:
             cr.execute('''SELECT imd.id, imd.res_id, md.id, imd.model, imd.noupdate
@@ -1032,8 +1025,8 @@
         if xml_id and res_id:
             self.loads[(module, xml_id)] = (model, res_id)
             for table, inherit_field in model_obj._inherits.iteritems():
-                inherit_id = model_obj.read(cr, uid, res_id,
-                        [inherit_field])[inherit_field]
+                inherit_id = model_obj.read(cr, uid, [res_id],
+                        [inherit_field])[0][inherit_field]
                 self.loads[(module, xml_id + '_' + table.replace('.', '_'))] = (table, inherit_id)
         return res_id
 
@@ -1056,11 +1049,12 @@
 
         cr.execute('select * from ir_values where model=%s and key=%s and name=%s'+where,(model, key, name))
         res = cr.fetchone()
+        ir_values_obj = openerp.registry(cr.dbname)['ir.values']
         if not res:
-            ir_values_obj = openerp.registry(cr.dbname)['ir.values']
             ir_values_obj.set(cr, uid, key, key2, name, models, value, replace, isobject, meta)
         elif xml_id:
             cr.execute('UPDATE ir_values set value=%s WHERE model=%s and key=%s and name=%s'+where,(value, model, key, name))
+            ir_values_obj.invalidate_cache(cr, uid, ['value'])
         return True
 
     def _module_data_uninstall(self, cr, uid, modules_to_remove, context=None):
@@ -1102,6 +1096,7 @@
                 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,))
                 wkf_todo.extend(cr.fetchall())
                 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))
+                self.invalidate_cache(cr, uid, context=context)
 
         for model,res_id in wkf_todo:
             try:

=== modified file 'openerp/addons/base/ir/ir_qweb.py'
--- openerp/addons/base/ir/ir_qweb.py	2014-05-08 11:51:57 +0000
+++ openerp/addons/base/ir/ir_qweb.py	2014-05-19 13:53:27 +0000
@@ -443,7 +443,7 @@
         record, field_name = template_attributes["field"].rsplit('.', 1)
         record = self.eval_object(record, qwebcontext)
 
-        column = record._model._all_columns[field_name].column
+        column = record._all_columns[field_name].column
         options = json.loads(template_attributes.get('field-options') or '{}')
         field_type = get_field_type(column, options)
 
@@ -504,10 +504,10 @@
 
         :returns: iterable of (attribute name, attribute value) pairs.
         """
-        column = record._model._all_columns[field_name].column
+        column = record._all_columns[field_name].column
         field_type = get_field_type(column, options)
         return [
-            ('data-oe-model', record._model._name),
+            ('data-oe-model', record._name),
             ('data-oe-id', record.id),
             ('data-oe-field', field_name),
             ('data-oe-type', field_type),
@@ -539,7 +539,7 @@
         try:
             content = self.record_to_html(
                 cr, uid, field_name, record,
-                record._model._all_columns[field_name].column,
+                record._all_columns[field_name].column,
                 options, context=context)
             if options.get('html-escape', True):
                 content = werkzeug.utils.escape(content)
@@ -547,7 +547,7 @@
                 content = content.__html__()
         except Exception:
             _logger.warning("Could not get field %s for model %s",
-                            field_name, record._model._name, exc_info=True)
+                            field_name, record._name, exc_info=True)
             content = None
 
         if context and context.get('inherit_branding'):

=== modified file 'openerp/addons/base/ir/ir_rule.py'
--- openerp/addons/base/ir/ir_rule.py	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/ir/ir_rule.py	2014-05-19 13:53:27 +0000
@@ -78,7 +78,7 @@
         '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"),
         'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
         'domain_force': fields.text('Domain'),
-        'domain': fields.function(_domain_force_get, string='Domain', type='text'),
+        'domain': fields.function(_domain_force_get, string='Domain', type='binary'),
         'perm_read': fields.boolean('Apply for Read'),
         'perm_write': fields.boolean('Apply for Write'),
         'perm_create': fields.boolean('Apply for Create'),
@@ -127,7 +127,7 @@
             group_domains = {}                  # map: group -> list of domains
             for rule in self.browse(cr, SUPERUSER_ID, rule_ids):
                 # read 'domain' as UID to have the correct eval context for the rule.
-                rule_domain = self.read(cr, uid, rule.id, ['domain'])['domain']
+                rule_domain = self.read(cr, uid, [rule.id], ['domain'])[0]['domain']
                 dom = expression.normalize_domain(rule_domain)
                 for group in rule.groups:
                     if group in user.groups_id:

=== modified file 'openerp/addons/base/ir/ir_sequence.py'
--- openerp/addons/base/ir/ir_sequence.py	2013-08-23 09:56:35 +0000
+++ openerp/addons/base/ir/ir_sequence.py	2014-05-19 13:53:27 +0000
@@ -234,15 +234,15 @@
             'sec': time.strftime('%S', t),
         }
 
-    def _next(self, cr, uid, seq_ids, context=None):
-        if not seq_ids:
+    def _next(self, cr, uid, ids, context=None):
+        if not ids:
             return False
         if context is None:
             context = {}
         force_company = context.get('force_company')
         if not force_company:
             force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
-        sequences = self.read(cr, uid, seq_ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
+        sequences = self.read(cr, uid, ids, ['name','company_id','implementation','number_next','prefix','suffix','padding'])
         preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
         seq = preferred_sequences[0] if preferred_sequences else sequences[0]
         if seq['implementation'] == 'standard':
@@ -251,6 +251,7 @@
         else:
             cr.execute("SELECT number_next FROM ir_sequence WHERE id=%s FOR UPDATE NOWAIT", (seq['id'],))
             cr.execute("UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s ", (seq['id'],))
+            self.invalidate_cache(cr, uid, ['number_next'], [seq['id']], context=context)
         d = self._interpolation_dict()
         try:
             interpolated_prefix = self._interpolate(seq['prefix'], d)

=== modified file 'openerp/addons/base/ir/ir_translation.py'
--- openerp/addons/base/ir/ir_translation.py	2014-01-22 15:13:27 +0000
+++ openerp/addons/base/ir/ir_translation.py	2014-05-19 13:53:27 +0000
@@ -168,11 +168,11 @@
             else:
                 model_name, field = record.name.split(',')
                 model = self.pool.get(model_name)
-                if model and model.exists(cr, uid, record.res_id, context=context):
+                if model is not None:
                     # Pass context without lang, need to read real stored field, not translation
                     context_no_lang = dict(context, lang=None)
-                    result = model.read(cr, uid, record.res_id, [field], context=context_no_lang)
-                    res[record.id] = result[field] if result else False
+                    result = model.read(cr, uid, [record.res_id], [field], context=context_no_lang)
+                    res[record.id] = result[0][field] if result else False
         return res
 
     def _set_src(self, cr, uid, id, name, value, args, context=None):

=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py	2013-10-06 13:24:24 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py	2014-05-19 13:53:27 +0000
@@ -28,7 +28,7 @@
 import openerp.modules
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
-from openerp import SUPERUSER_ID
+from openerp import SUPERUSER_ID, multi, returns
 
 MENU_ITEM_SEPARATOR = "/"
 
@@ -36,71 +36,74 @@
     _name = 'ir.ui.menu'
 
     def __init__(self, *args, **kwargs):
-        self.cache_lock = threading.RLock()
-        self._cache = {}
+        cls = type(self)
+        # by design, self._menu_cache is specific to the database
+        cls._menu_cache_lock = threading.RLock()
+        cls._menu_cache = {}
         super(ir_ui_menu, self).__init__(*args, **kwargs)
         self.pool.get('ir.model.access').register_cache_clearing_method(self._name, 'clear_cache')
 
     def clear_cache(self):
-        with self.cache_lock:
+        with self._menu_cache_lock:
             # radical but this doesn't frequently happen
-            if self._cache:
+            if self._menu_cache:
                 # Normally this is done by openerp.tools.ormcache
                 # but since we do not use it, set it by ourself.
                 self.pool._any_cache_cleared = True
-            self._cache = {}
+            self._menu_cache.clear()
 
-    def _filter_visible_menus(self, cr, uid, ids, context=None):
-        """Filters the give menu ids to only keep the menu items that should be
-           visible in the menu hierarchy of the current user.
-           Uses a cache for speeding up the computation.
+    @multi
+    @returns('self')
+    def _filter_visible_menus(self):
+        """ Filter `self` to only keep the menu items that should be visible in
+            the menu hierarchy of the current user.
+            Uses a cache for speeding up the computation.
         """
-        with self.cache_lock:
-            modelaccess = self.pool.get('ir.model.access')
-            user_groups = set(self.pool.get('res.users').read(cr, SUPERUSER_ID, uid, ['groups_id'])['groups_id'])
-            result = []
-            for menu in self.browse(cr, uid, ids, context=context):
-                # this key works because user access rights are all based on user's groups (cfr ir_model_access.check)
-                key = (cr.dbname, menu.id, tuple(user_groups))
-                if key in self._cache:
-                    if self._cache[key]:
-                        result.append(menu.id)
-                    #elif not menu.groups_id and not menu.action:
-                    #    result.append(menu.id)
-                    continue
-
-                self._cache[key] = False
-                if menu.groups_id:
-                    restrict_to_groups = [g.id for g in menu.groups_id]
-                    if not user_groups.intersection(restrict_to_groups):
-                        continue
-                    #result.append(menu.id)
-                    #self._cache[key] = True
-                    #continue
-
-                if menu.action:
-                    # we check if the user has access to the action of the menu
-                    data = menu.action
-                    if data:
-                        model_field = { 'ir.actions.act_window':    'res_model',
-                                        'ir.actions.report.xml':    'model',
-                                        'ir.actions.wizard':        'model',
-                                        'ir.actions.server':        'model_id',
-                                      }
-
-                        field = model_field.get(menu.action._name)
-                        if field and data[field]:
-                            if not modelaccess.check(cr, uid, data[field], 'read', False):
-                                continue
-                else:
-                    # if there is no action, it's a 'folder' menu
-                    if not menu.child_id:
-                        # not displayed if there is no children
-                        continue
-
-                result.append(menu.id)
-                self._cache[key] = True
-            return result
+        with self._menu_cache_lock:
+            groups = self.env.user.groups_id
+
+            # visibility is entirely based on the user's groups;
+            # self._menu_cache[key] gives the ids of all visible menus
+            key = frozenset(groups._ids)
+            if key in self._menu_cache:
+                visible = self.browse(self._menu_cache[key])
+
+            else:
+                # retrieve all menus, and determine which ones are visible
+                context = {'ir.ui.menu.full_list': True}
+                menus = self.sudo(context=context).search([])
+
+                # first discard all menus with groups the user does not have
+                menus = menus.filter(
+                    lambda menu: not menu.groups_id or menu.groups_id & groups)
+
+                # take apart menus that have an action
+                action_menus = menus.filter('action')
+                folder_menus = menus - action_menus
+                visible = self.browse()
+
+                # process action menus, check whether their action is allowed
+                access = self.env['ir.model.access']
+                model_fname = {
+                    'ir.actions.act_window': 'res_model',
+                    'ir.actions.report.xml': 'model',
+                    'ir.actions.wizard': 'model',
+                    'ir.actions.server': 'model_id',
+                }
+                for menu in action_menus:
+                    fname = model_fname.get(menu.action._name)
+                    if not fname or not menu.action[fname] or \
+                            access.check(menu.action[fname], 'read', False):
+                        # make menu visible, and its folder ancestors, too
+                        visible += menu
+                        menu = menu.parent_id
+                        while menu and menu in folder_menus and menu not in visible:
+                            visible += menu
+                            menu = menu.parent_id
+
+                self._menu_cache[key] = visible._ids
+
+            return self.filter(lambda menu: menu in visible)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
@@ -153,13 +156,13 @@
             parent_path = ''
         return parent_path + elmt.name
 
-    def create(self, *args, **kwargs):
+    def create(self, cr, uid, values, context=None):
         self.clear_cache()
-        return super(ir_ui_menu, self).create(*args, **kwargs)
+        return super(ir_ui_menu, self).create(cr, uid, values, context=context)
 
-    def write(self, *args, **kwargs):
+    def write(self, cr, uid, ids, values, context=None):
         self.clear_cache()
-        return super(ir_ui_menu, self).write(*args, **kwargs)
+        return super(ir_ui_menu, self).write(cr, uid, ids, values, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         # Detach children and promote them to top-level, because it would be unwise to

=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
--- openerp/addons/base/ir/ir_ui_view.py	2014-05-12 08:05:23 +0000
+++ openerp/addons/base/ir/ir_ui_view.py	2014-05-19 13:53:27 +0000
@@ -37,7 +37,7 @@
 import openerp
 from openerp import tools
 from openerp.http import request
-from openerp.osv import fields, osv, orm
+from openerp.osv import fields, osv, orm, api
 from openerp.tools import graph, SKIPPED_ELEMENT_TYPES
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.view_validation import valid_view
@@ -506,7 +506,7 @@
 
         modifiers = {}
         Model = self.pool.get(model)
-        if not Model:
+        if Model is None:
             self.raise_view_error(cr, user, _('Model not found: %(model)s') % dict(model=model),
                                   view_id, context)
 
@@ -525,10 +525,10 @@
 
                :return: True if field should be included in the result of fields_view_get
             """
-            if node.tag == 'field' and node.get('name') in Model._all_columns:
-                column = Model._all_columns[node.get('name')].column
-                if column.groups and not self.user_has_groups(
-                        cr, user, groups=column.groups, context=context):
+            if node.tag == 'field' and node.get('name') in Model._fields:
+                field = Model._fields[node.get('name')]
+                if field.groups and not self.user_has_groups(
+                        cr, user, groups=field.groups, context=context):
                     node.getparent().remove(node)
                     fields.pop(node.get('name'), None)
                     # no point processing view-level ``groups`` anymore, return
@@ -565,15 +565,8 @@
                 fields = xfields
             if node.get('name'):
                 attrs = {}
-                try:
-                    if node.get('name') in Model._columns:
-                        column = Model._columns[node.get('name')]
-                    else:
-                        column = Model._inherit_fields[node.get('name')][2]
-                except Exception:
-                    column = False
-
-                if column:
+                field = Model._fields.get(node.get('name'))
+                if field:
                     children = False
                     views = {}
                     for f in node:
@@ -581,7 +574,7 @@
                             node.remove(f)
                             ctx = context.copy()
                             ctx['base_model_name'] = model
-                            xarch, xfields = self.postprocess_and_fields(cr, user, column._obj or None, f, view_id, ctx)
+                            xarch, xfields = self.postprocess_and_fields(cr, user, field.comodel_name, f, view_id, ctx)
                             views[str(f.tag)] = {
                                 'arch': xarch,
                                 'fields': xfields
@@ -649,6 +642,36 @@
         orm.transfer_modifiers_to_node(modifiers, node)
         return fields
 
+    def add_on_change(self, cr, user, model_name, arch):
+        """ Add attribute on_change="1" on fields that are dependencies of
+            computed fields on the same view.
+        """
+        # map each field object to its corresponding nodes in arch
+        field_nodes = collections.defaultdict(list)
+
+        def collect(node, model):
+            if node.tag == 'field':
+                field = model._fields.get(node.get('name'))
+                if field:
+                    field_nodes[field].append(node)
+                    if field.relational:
+                        model = self.pool.get(field.comodel_name)
+            for child in node:
+                collect(child, model)
+
+        collect(arch, self.pool[model_name])
+
+        for field, nodes in field_nodes.iteritems():
+            # if field should trigger an onchange, add on_change="1" on the
+            # nodes referring to field
+            model = self.pool[field.model_name]
+            if model._has_onchange(field, field_nodes):
+                for node in nodes:
+                    if not node.get('on_change'):
+                        node.set('on_change', '1')
+
+        return arch
+
     def _disable_workflow_buttons(self, cr, user, model, node):
         """ Set the buttons in node to readonly if the user can't activate them. """
         if model is None or user == 1:
@@ -687,7 +710,7 @@
         """
         fields = {}
         Model = self.pool.get(model)
-        if not Model:
+        if Model is None:
             self.raise_view_error(cr, user, _('Model not found: %(model)s') % dict(model=model), view_id, context)
 
         if node.tag == 'diagram':
@@ -703,6 +726,7 @@
         else:
             fields = Model.fields_get(cr, user, None, context)
 
+        node = self.add_on_change(cr, user, model, node)
         fields_def = self.postprocess(cr, user, model, node, view_id, False, fields, context=context)
         node = self._disable_workflow_buttons(cr, user, model, node)
         if node.tag in ('kanban', 'tree', 'form', 'gantt'):
@@ -868,6 +892,7 @@
         xmlid = imd.search_read(cr, uid, domain, ['module', 'name'])[0]
         return '%s.%s' % (xmlid['module'], xmlid['name'])
 
+    @api.cr_uid_ids_context
     def render(self, cr, uid, id_or_xml_id, values=None, engine='ir.qweb', context=None):
         if isinstance(id_or_xml_id, list):
             id_or_xml_id = id_or_xml_id[0]

=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2014-02-13 11:09:37 +0000
+++ openerp/addons/base/ir/ir_values.py	2014-05-19 13:53:27 +0000
@@ -20,6 +20,7 @@
 ##############################################################################
 import pickle
 
+from openerp import tools
 from openerp.osv import osv, fields
 from openerp.osv.orm import except_orm
 
@@ -188,6 +189,21 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX ir_values_key_model_key2_res_id_user_id_idx ON ir_values (key, model, key2, res_id, user_id)')
 
+    def create(self, cr, uid, vals, context=None):
+        res = super(ir_values, self).create(cr, uid, vals, context=context)
+        self.get_defaults_dict.clear_cache(self)
+        return res
+
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(ir_values, self).write(cr, uid, ids, vals, context=context)
+        self.get_defaults_dict.clear_cache(self)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        res = super(ir_values, self).unlink(cr, uid, ids, context=context)
+        self.get_defaults_dict.clear_cache(self)
+        return res
+
     def set_default(self, cr, uid, model, field_name, value, for_all_users=True, company_id=False, condition=False):
         """Defines a default value for the given model and field_name. Any previous
            default for the same scope (model, field_name, value, for_all_users, company_id, condition)
@@ -319,6 +335,15 @@
                 (row['id'], row['name'], pickle.loads(row['value'].encode('utf-8'))))
         return defaults.values()
 
+    # use ormcache: this is called a lot by BaseModel.add_default_value()!
+    @tools.ormcache(skiparg=2)
+    def get_defaults_dict(self, cr, uid, model, condition=False):
+        """ Returns a dictionary mapping field names with their corresponding
+            default value. This method simply improves the returned value of
+            :meth:`~.get_defaults`.
+        """
+        return dict((f, v) for i, f, v in self.get_defaults(cr, uid, model, condition))
+
     def set_action(self, cr, uid, name, action_slot, model, action, res_id=False):
         """Binds an the given action to the given model's action slot - for later
            retrieval via :meth:`~.get_actions`. Any existing binding of the same action
@@ -395,9 +420,9 @@
             if not action['value']:
                 continue    # skip if undefined
             action_model_name, action_id = action['value'].split(',')
-            action_model = self.pool.get(action_model_name)
-            if not action_model:
+            if action_model_name not in self.pool:
                 continue    # unknow model? skip it
+            action_model = self.pool[action_model_name]
             fields = [field for field in action_model._all_columns if field not in EXCLUDED_FIELDS]
             # FIXME: needs cleanup
             try:

=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py	2014-04-15 05:32:50 +0000
+++ openerp/addons/base/module/module.py	2014-05-19 13:53:27 +0000
@@ -48,7 +48,7 @@
 from openerp.modules import get_module_resource
 from openerp.tools.parse_version import parse_version
 from openerp.tools.translate import _
-from openerp.osv import fields, osv, orm
+from openerp.osv import osv, orm, fields, fields2, api
 
 _logger = logging.getLogger(__name__)
 
@@ -374,34 +374,41 @@
                 msg = _('Unable to process module "%s" because an external dependency is not met: %s')
             raise orm.except_orm(_('Error'), msg % (module_name, e.args[0]))
 
-    def state_update(self, cr, uid, ids, newstate, states_to_update, context=None, level=100):
+    @api.multi
+    def state_update(self, newstate, states_to_update, level=100):
         if level < 1:
             raise orm.except_orm(_('Error'), _('Recursion error in modules dependencies !'))
+
+        # whether some modules are installed with demo data
         demo = False
-        for module in self.browse(cr, uid, ids, context=context):
-            mdemo = False
+
+        for module in self:
+            # determine dependency modules to update/others
+            update_mods, ready_mods = self.browse(), self.browse()
             for dep in module.dependencies_id:
                 if dep.state == 'unknown':
                     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,))
-                ids2 = self.search(cr, uid, [('name', '=', dep.name)])
-                if dep.state != newstate:
-                    mdemo = self.state_update(cr, uid, ids2, newstate, states_to_update, context, level - 1) or mdemo
+                if dep.depend_id.state == newstate:
+                    ready_mods += dep.depend_id
                 else:
-                    od = self.browse(cr, uid, ids2)[0]
-                    mdemo = od.demo or mdemo
-
+                    update_mods += dep.depend_id
+
+            # update dependency modules that require it, and determine demo for module
+            update_demo = update_mods.state_update(newstate, states_to_update, level=level-1)
+            module_demo = module.demo or update_demo or any(mod.demo for mod in ready_mods)
+            demo = demo or module_demo
+
+            # check dependencies and update module itself
             self.check_external_dependencies(module.name, newstate)
-            if not module.dependencies_id:
-                mdemo = module.demo
             if module.state in states_to_update:
-                self.write(cr, uid, [module.id], {'state': newstate, 'demo': mdemo})
-            demo = demo or mdemo
+                module.write({'state': newstate, 'demo': module_demo})
+
         return demo
 
     def button_install(self, cr, uid, ids, context=None):
 
         # Mark the given modules to be installed.
-        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context)
+        self.state_update(cr, uid, ids, 'to install', ['uninstalled'], context=context)
 
         # Mark (recursively) the newly satisfied modules to also be installed
 
@@ -527,7 +534,7 @@
 
     def button_upgrade(self, cr, uid, ids, context=None):
         depobj = self.pool.get('ir.module.module.dependency')
-        todo = self.browse(cr, uid, ids, context=context)
+        todo = list(self.browse(cr, uid, ids, context=context))
         self.update_list(cr, uid)
 
         i = 0
@@ -729,6 +736,7 @@
             cr.execute('INSERT INTO ir_module_module_dependency (module_id, name) values (%s, %s)', (mod_browse.id, dep))
         for dep in (existing - needed):
             cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s and name = %s', (mod_browse.id, dep))
+        self.invalidate_cache(cr, uid, ['dependencies_id'], [mod_browse.id])
 
     def _update_category(self, cr, uid, mod_browse, category='Uncategorized'):
         current_category = mod_browse.category_id
@@ -757,37 +765,49 @@
             if not mod.description:
                 _logger.warning('module %s: description is empty !', mod.name)
 
-class module_dependency(osv.osv):
+
+DEP_STATES = [
+    ('uninstallable', 'Uninstallable'),
+    ('uninstalled', 'Not Installed'),
+    ('installed', 'Installed'),
+    ('to upgrade', 'To be upgraded'),
+    ('to remove', 'To be removed'),
+    ('to install', 'To be installed'),
+    ('unknown', 'Unknown'),
+]
+
+class module_dependency(osv.Model):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
 
-    def _state(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        mod_obj = self.pool.get('ir.module.module')
-        for md in self.browse(cr, uid, ids):
-            ids = mod_obj.search(cr, uid, [('name', '=', md.name)])
-            if ids:
-                result[md.id] = mod_obj.read(cr, uid, [ids[0]], ['state'])[0]['state']
-            else:
-                result[md.id] = 'unknown'
-        return result
-
-    _columns = {
-        # The dependency name
-        'name': fields.char('Name', size=128, select=True),
-
-        # The module that depends on it
-        'module_id': fields.many2one('ir.module.module', 'Module', select=True, ondelete='cascade'),
-
-        'state': fields.function(_state, type='selection', selection=[
-            ('uninstallable', 'Uninstallable'),
-            ('uninstalled', 'Not Installed'),
-            ('installed', 'Installed'),
-            ('to upgrade', 'To be upgraded'),
-            ('to remove', 'To be removed'),
-            ('to install', 'To be installed'),
-            ('unknown', 'Unknown'),
-        ], string='Status', readonly=True, select=True),
-    }
+    # the dependency name
+    name = fields2.Char(size=128)
+
+    # the module that depends on it
+    module_id = fields2.Many2one('ir.module.module', 'Module', ondelete='cascade')
+
+    # the module corresponding to the dependency, and its status
+    depend_id = fields2.Many2one('ir.module.module', 'Dependency',
+        compute='_compute_depend', readonly=True, store=False)
+    state = fields2.Selection(DEP_STATES, string='Status',
+        compute='_compute_state', readonly=True, store=False)
+
+    @api.multi
+    @api.depends('name')
+    def _compute_depend(self):
+        # retrieve all modules corresponding to the dependency names
+        names = list(set(dep.name for dep in self))
+        mods = self.env['ir.module.module'].search([('name', 'in', names)])
+
+        # index modules by name, and assign dependencies
+        name_mod = dict((mod.name, mod) for mod in mods)
+        for dep in self:
+            dep.depend_id = name_mod.get(dep.name)
+
+    @api.one
+    @api.depends('depend_id.state')
+    def _compute_state(self):
+        self.state = self.depend_id.state or 'unknown'
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/addons/base/res/ir_property.py'
--- openerp/addons/base/res/ir_property.py	2014-05-06 08:41:38 +0000
+++ openerp/addons/base/res/ir_property.py	2014-05-19 13:53:27 +0000
@@ -21,8 +21,7 @@
 
 import time
 
-from openerp.osv import osv, fields
-from openerp.osv.orm import browse_record, browse_null
+from openerp.osv import osv, orm, fields
 from openerp.tools.misc import attrgetter
 
 # -------------------------------------------------------------------------
@@ -97,7 +96,7 @@
             raise osv.except_osv('Error', 'Invalid type')
 
         if field == 'value_reference':
-            if isinstance(value, browse_record):
+            if isinstance(value, orm.BaseModel):
                 value = '%s,%d' % (value._name, value.id)
             elif isinstance(value, (int, long)):
                 field_id = values.get('fields_id')
@@ -132,7 +131,7 @@
             return record.value_binary
         elif record.type == 'many2one':
             if not record.value_reference:
-                return browse_null()
+                return False
             model, resource_id = record.value_reference.split(',')
             return self.pool.get(model).browse(cr, uid, int(resource_id), context=context)
         elif record.type == 'datetime':

=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py	2014-03-11 13:38:50 +0000
+++ openerp/addons/base/res/res_company.py	2014-05-19 13:53:27 +0000
@@ -84,7 +84,7 @@
             if company.partner_id:
                 address_data = part_obj.address_get(cr, openerp.SUPERUSER_ID, [company.partner_id.id], adr_pref=['default'])
                 if address_data['default']:
-                    address = part_obj.read(cr, openerp.SUPERUSER_ID, address_data['default'], field_names, context=context)
+                    address = part_obj.read(cr, openerp.SUPERUSER_ID, [address_data['default']], field_names, context=context)[0]
                     for field in field_names:
                         result[company.id][field] = address[field] or False
         return result
@@ -176,6 +176,7 @@
             res += '\n%s: %s' % (title, ', '.join(name for id, name in account_names))
 
         return {'value': {'rml_footer': res, 'rml_footer_readonly': res}}
+
     def onchange_state(self, cr, uid, ids, state_id, context=None):
         if state_id:
             return {'value':{'country_id': self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id }}
@@ -209,8 +210,7 @@
         return res
 
     def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=100):
-        if context is None:
-            context = {}
+        context = dict(context or {})
         if context.pop('user_preference', None):
             # We browse as superuser. Otherwise, the user would be able to
             # select only the currently visible companies (according to rules,

=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py	2014-03-26 14:05:09 +0000
+++ openerp/addons/base/res/res_config.py	2014-05-19 13:53:27 +0000
@@ -293,10 +293,10 @@
     def _already_installed(self, cr, uid, context=None):
         """ For each module (boolean fields in a res.config.installer),
         check if it's already installed (either 'to install', 'to upgrade'
-        or 'installed') and if it is return the module's browse_record
+        or 'installed') and if it is return the module's record
 
         :returns: a list of all installed modules in this installer
-        :rtype: [browse_record]
+        :rtype: recordset (collection of Record)
         """
         modules = self.pool['ir.module.module']
 
@@ -332,7 +332,7 @@
                    for installer in self.read(cr, uid, ids, context=context)
                    for module_name, to_install in installer.iteritems()
                    if module_name != 'id'
-                   if type(self._columns[module_name]) is fields.boolean
+                   if type(self._columns.get(module_name)) is fields.boolean
                    if to_install)
 
         hooks_results = set()

=== modified file 'openerp/addons/base/res/res_currency.py'
--- openerp/addons/base/res/res_currency.py	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/res/res_currency.py	2014-05-19 13:53:27 +0000
@@ -22,6 +22,7 @@
 import re
 import time
 
+from openerp import api, fields as fields2
 from openerp import tools
 from openerp.osv import fields, osv
 from openerp.tools import float_round, float_is_zero, float_compare
@@ -79,7 +80,6 @@
         'rounding': fields.float('Rounding Factor', digits=(12,6)),
         'active': fields.boolean('Active'),
         'company_id':fields.many2one('res.company', 'Company'),
-        'date': fields.date('Date'),
         'base': fields.boolean('Base'),
         '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.")
     }
@@ -111,19 +111,12 @@
                           ON res_currency
                           (name, (COALESCE(company_id,-1)))""")
 
-    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
-        res = super(res_currency, self).read(cr, user, ids, fields, context, load)
-        currency_rate_obj = self.pool.get('res.currency.rate')
-        values = res
-        if not isinstance(values, list):
-            values = [values]
-        for r in values:
-            if r.__contains__('rate_ids'):
-                rates=r['rate_ids']
-                if rates:
-                    currency_date = currency_rate_obj.read(cr, user, rates[0], ['name'])['name']
-                    r['date'] = currency_date
-        return res
+    date = fields2.Date(compute='compute_date', store=True)
+
+    @api.one
+    @api.depends('rate_ids.name')
+    def compute_date(self):
+        self.date = self.rate_ids.name
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         if not args:
@@ -145,16 +138,38 @@
         reads = self.read(cr, uid, ids, ['name','symbol'], context=context, load='_classic_write')
         return [(x['id'], tools.ustr(x['name'])) for x in reads]
 
+    @api.new
+    def round(self, amount):
+        """ Return `amount` rounded according to currency `self`. """
+        return float_round(amount, precision_rounding=self.rounding)
+
+    @round.old
     def round(self, cr, uid, currency, amount):
         """Return ``amount`` rounded  according to ``currency``'s
            rounding rules.
 
-           :param browse_record currency: currency for which we are rounding
+           :param Record currency: currency for which we are rounding
            :param float amount: the amount to round
            :return: rounded float
         """
         return float_round(amount, precision_rounding=currency.rounding)
 
+    @api.new
+    def compare_amounts(self, amount1, amount2):
+        """ Compare `amount1` and `amount2` after rounding them according to
+            `self`'s precision. An amount is considered lower/greater than
+            another amount if their rounded value is different. This is not the
+            same as having a non-zero difference!
+
+            For example 1.432 and 1.431 are equal at 2 digits precision, so this
+            method would return 0. However 0.006 and 0.002 are considered
+            different (returns 1) because they respectively round to 0.01 and
+            0.0, even though 0.006-0.002 = 0.004 which would be considered zero
+            at 2 digits precision.
+        """
+        return float_compare(amount1, amount2, precision_rounding=self.rounding)
+
+    @compare_amounts.old
     def compare_amounts(self, cr, uid, currency, amount1, amount2):
         """Compare ``amount1`` and ``amount2`` after rounding them according to the
            given currency's precision..
@@ -167,7 +182,7 @@
            they respectively round to 0.01 and 0.0, even though
            0.006-0.002 = 0.004 which would be considered zero at 2 digits precision.
 
-           :param browse_record currency: currency for which we are rounding
+           :param Record currency: currency for which we are rounding
            :param float amount1: first amount to compare
            :param float amount2: second amount to compare
            :return: (resp.) -1, 0 or 1, if ``amount1`` is (resp.) lower than,
@@ -176,6 +191,19 @@
         """
         return float_compare(amount1, amount2, precision_rounding=currency.rounding)
 
+    @api.new
+    def is_zero(self, amount):
+        """ Return true if `amount` is small enough to be treated as zero
+            according to currency `self`'s rounding rules.
+
+            Warning: ``is_zero(amount1-amount2)`` is not always equivalent to 
+            ``compare_amounts(amount1,amount2) == 0``, as the former will round
+            after computing the difference, while the latter will round before,
+            giving different results, e.g., 0.006 and 0.002 at 2 digits precision.
+        """
+        return float_is_zero(amount, precision_rounding=self.rounding)
+
+    @is_zero.old
     def is_zero(self, cr, uid, currency, amount):
         """Returns true if ``amount`` is small enough to be treated as
            zero according to ``currency``'s rounding rules.
@@ -185,7 +213,7 @@
            computing the difference, while the latter will round before, giving
            different results for e.g. 0.006 and 0.002 at 2 digits precision.
 
-           :param browse_record currency: currency for which we are rounding
+           :param Record currency: currency for which we are rounding
            :param float amount: amount to compare with currency's zero
         """
         return float_is_zero(amount, precision_rounding=currency.rounding)
@@ -211,10 +239,23 @@
                     'at the date: %s') % (currency_symbol, date))
         return to_currency.rate/from_currency.rate
 
+    @api.new
+    def compute(self, from_amount, to_currency, round=True):
+        """ Convert `from_amount` from currency `self` to `to_currency`. """
+        assert self, "compute from unknown currency"
+        assert to_currency, "compute to unknown currency"
+        # apply conversion rate
+        if self == to_currency:
+            to_amount = from_amount
+        else:
+            to_amount = from_amount * self._get_conversion_rate(self, to_currency)
+        # apply rounding
+        return to_currency.round(to_amount) if round else to_amount
+
+    @compute.old
     def compute(self, cr, uid, from_currency_id, to_currency_id, from_amount,
                 round=True, currency_rate_type_from=False, currency_rate_type_to=False, context=None):
-        if not context:
-            context = {}
+        context = dict(context or {})
         if not from_currency_id:
             from_currency_id = to_currency_id
         if not to_currency_id:
@@ -253,7 +294,7 @@
         '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"),
     }
     _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d'),
+        'name': lambda *a: time.strftime('%Y-%m-%d 00:00:00'),
     }
     _order = "name desc"
 

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2014-04-17 14:55:22 +0000
+++ openerp/addons/base/res/res_partner.py	2014-05-19 13:53:27 +0000
@@ -26,43 +26,44 @@
 
 import openerp
 from openerp import SUPERUSER_ID
-from openerp import tools
+from openerp import tools, model, multi, one, returns
 from openerp.osv import osv, fields
 from openerp.osv.expression import get_unaccent_wrapper
 from openerp.tools.translate import _
 
+ADDRESS_FORMAT_LAYOUTS = {
+    '%(city)s %(state_code)s\n%(zip)s': """
+        <div class="address_format">
+            <field name="city" placeholder="City" style="width: 50%%"/>
+            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 47%%" options='{"no_open": true}'/>
+            <br/>
+            <field name="zip" placeholder="ZIP"/>
+        </div>
+    """,
+    '%(zip)s %(city)s': """
+        <div class="address_format">
+            <field name="zip" placeholder="ZIP" style="width: 40%%"/>
+            <field name="city" placeholder="City" style="width: 57%%"/>
+            <br/>
+            <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
+        </div>
+    """,
+    '%(city)s\n%(state_name)s\n%(zip)s': """
+        <div class="address_format">
+            <field name="city" placeholder="City"/>
+            <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
+            <field name="zip" placeholder="ZIP"/>
+        </div>
+    """
+}
+
+
 class format_address(object):
-    def fields_view_get_address(self, cr, uid, arch, context={}):
-        user_obj = self.pool['res.users']
-        fmt = user_obj.browse(cr, SUPERUSER_ID, uid, context).company_id.country_id
-        fmt = fmt and fmt.address_format
-        layouts = {
-            '%(city)s %(state_code)s\n%(zip)s': """
-                <div class="address_format">
-                    <field name="city" placeholder="City" style="width: 50%%"/>
-                    <field name="state_id" class="oe_no_button" placeholder="State" style="width: 47%%" options='{"no_open": true}'/>
-                    <br/>
-                    <field name="zip" placeholder="ZIP"/>
-                </div>
-            """,
-            '%(zip)s %(city)s': """
-                <div class="address_format">
-                    <field name="zip" placeholder="ZIP" style="width: 40%%"/>
-                    <field name="city" placeholder="City" style="width: 57%%"/>
-                    <br/>
-                    <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
-                </div>
-            """,
-            '%(city)s\n%(state_name)s\n%(zip)s': """
-                <div class="address_format">
-                    <field name="city" placeholder="City"/>
-                    <field name="state_id" class="oe_no_button" placeholder="State" options='{"no_open": true}'/>
-                    <field name="zip" placeholder="ZIP"/>
-                </div>
-            """
-        }
-        for k,v in layouts.items():
-            if fmt and (k in fmt):
+    @model
+    def fields_view_get_address(self, arch):
+        fmt = self.env.user.company_id.country_id.address_format or ''
+        for k, v in ADDRESS_FORMAT_LAYOUTS.items():
+            if k in fmt:
                 doc = etree.fromstring(arch)
                 for node in doc.xpath("//div[@class='address_format']"):
                     tree = etree.fromstring(v)
@@ -72,53 +73,53 @@
         return arch
 
 
-def _tz_get(self,cr,uid, context=None):
+@model
+def _tz_get(self):
     # put POSIX 'Etc/*' entries at the end to avoid confusing users - see bug 1086728
     return [(tz,tz) for tz in sorted(pytz.all_timezones, key=lambda tz: tz if not tz.startswith('Etc/') else '_')]
 
-class res_partner_category(osv.osv):
+
+class res_partner_category(osv.Model):
 
     def name_get(self, cr, uid, ids, context=None):
-        """Return the categories' display name, including their direct
-           parent by default.
+        """ Return the categories' display name, including their direct
+            parent by default.
 
-        :param dict context: the ``partner_category_display`` key can be
-                             used to select the short version of the
-                             category name (without the direct parent),
-                             when set to ``'short'``. The default is
-                             the long version."""
+            If ``context['partner_category_display']`` is ``'short'``, the short
+            version of the category name (without the direct parent) is used.
+            The default is the long version.
+        """
+        if not isinstance(ids, list):
+            ids = [ids]
         if context is None:
             context = {}
+
         if context.get('partner_category_display') == 'short':
             return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
+
         res = []
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = record['parent_id'][1] + ' / ' + name
-            res.append((record['id'], name))
+        for category in self.browse(cr, uid, ids, context=context):
+            names = []
+            current = category
+            while current:
+                names.append(current.name)
+                current = current.parent_id
+            res.append((category.id, ' / '.join(reversed(names))))
         return res
 
-    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
-        if not args:
-            args = []
-        if not context:
-            context = {}
+    @model
+    def name_search(self, name, args=None, operator='ilike', limit=100):
+        args = args or []
         if name:
             # Be sure name_search is symetric to name_get
             name = name.split(' / ')[-1]
-            ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
-        else:
-            ids = self.search(cr, uid, args, limit=limit, context=context)
-        return self.name_get(cr, uid, ids, context)
-
-
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
-        res = self.name_get(cr, uid, ids, context=context)
-        return dict(res)
+            args = [('name', operator, name)] + args
+        categories = self.search(args, limit=limit)
+        return categories.name_get()
+
+    @multi
+    def _name_get_fnc(self, field_name, arg):
+        return dict(self.name_get())
 
     _description = 'Partner Tags'
     _name = 'res.partner.category'
@@ -142,6 +143,7 @@
     _parent_order = 'name'
     _order = 'parent_left'
 
+
 class res_partner_title(osv.osv):
     _name = 'res.partner.title'
     _order = 'name'
@@ -154,16 +156,17 @@
         'domain': 'contact',
     }
 
-def _lang_get(self, cr, uid, context=None):
-    lang_pool = self.pool['res.lang']
-    ids = lang_pool.search(cr, uid, [], context=context)
-    res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
-    return [(r['code'], r['name']) for r in res]
+
+@model
+def _lang_get(self):
+    languages = self.env['res.lang'].search([])
+    return [(language.code, language.name) for language in languages]
 
 # fields copy if 'use_parent_address' is checked
 ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
 
-class res_partner(osv.osv, format_address):
+
+class res_partner(osv.Model, format_address):
     _description = 'Partner'
     _name = "res.partner"
 
@@ -173,26 +176,23 @@
             res[partner.id] = self._display_address(cr, uid, partner, context=context)
         return res
 
-    def _get_image(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
-        return result
-
-    def _get_tz_offset(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = datetime.datetime.now(pytz.timezone(obj.tz or 'GMT')).strftime('%z')
-        return result
-
-    def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-
-    def _has_image(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = obj.image != False
-        return result
+    @multi
+    def _get_tz_offset(self, name, args):
+        return dict(
+            (p.id, datetime.datetime.now(pytz.timezone(p.tz or 'GMT')).strftime('%z'))
+            for p in self)
+
+    @multi
+    def _get_image(self, name, args):
+        return dict((p.id, tools.image_get_resized_images(p.image)) for p in self)
+
+    @one
+    def _set_image(self, name, value, args):
+        return self.write({'image': tools.image_resize_image_big(value)})
+
+    @multi
+    def _has_image(self, name, args):
+        return dict((p.id, bool(p.image)) for p in self)
 
     def _commercial_partner_compute(self, cr, uid, ids, name, args, context=None):
         """ Returns the partner that is considered the commercial
@@ -303,16 +303,15 @@
         'commercial_partner_id': fields.function(_commercial_partner_id, type='many2one', relation='res.partner', string='Commercial Entity', store=_commercial_partner_store_triggers)
     }
 
-    def _default_category(self, cr, uid, context=None):
-        if context is None:
-            context = {}
-        if context.get('category_id'):
-            return [context['category_id']]
-        return False
+    @model
+    def _default_category(self):
+        category_id = self.env.context.get('category_id', False)
+        return [category_id] if category_id else False
 
-    def _get_default_image(self, cr, uid, is_company, context=None, colorize=False):
-        img_path = openerp.modules.get_module_resource('base', 'static/src/img',
-                                                       ('company_image.png' if is_company else 'avatar.png'))
+    @model
+    def _get_default_image(self, is_company, colorize=False):
+        img_path = openerp.modules.get_module_resource(
+            'base', 'static/src/img', 'company_image.png' if is_company else 'avatar.png')
         with open(img_path, 'rb') as f:
             image = f.read()
 
@@ -330,13 +329,17 @@
             res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
         return res
 
+    @model
+    def _default_company(self):
+        return self.env['res.company']._company_default_get('res.partner')
+
     _defaults = {
         'active': True,
-        'lang': lambda self, cr, uid, ctx: ctx.get('lang', 'en_US'),
-        'tz': lambda self, cr, uid, ctx: ctx.get('tz', False),
+        'lang': model(lambda self: self.env.lang),
+        'tz': model(lambda self: self.env.context.get('tz', False)),
         'customer': True,
         'category_id': _default_category,
-        'company_id': lambda self, cr, uid, ctx: self.pool['res.company']._company_default_get(cr, uid, 'res.partner', context=ctx),
+        'company_id': _default_company,
         'color': 0,
         'is_company': False,
         'type': 'contact', # type 'default' is wildcard and thus inappropriate
@@ -348,15 +351,15 @@
         (osv.osv._check_recursion, 'You cannot create recursive Partner hierarchies.', ['parent_id']),
     ]
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
+    @one
+    def copy(self, default=None):
+        default = dict(default or {})
         default['user_ids'] = False
-        name = self.read(cr, uid, [id], ['name'], context)[0]['name']
-        default.update({'name': _('%s (copy)') % name})
-        return super(res_partner, self).copy(cr, uid, id, default, context)
+        default['name'] = _('%s (copy)') % self.name
+        return super(res_partner, self).copy(default)
 
-    def onchange_type(self, cr, uid, ids, is_company, context=None):
+    @multi
+    def onchange_type(self, is_company):
         value = {}
         value['title'] = False
         if is_company:
@@ -388,10 +391,11 @@
             result['value'] = {'use_parent_address': False}
         return result
 
-    def onchange_state(self, cr, uid, ids, state_id, context=None):
+    @multi
+    def onchange_state(self, state_id):
         if state_id:
-            country_id = self.pool['res.country.state'].browse(cr, uid, state_id, context).country_id.id
-            return {'value':{'country_id':country_id}}
+            state = self.env['res.country.state'].browse(state_id)
+            return {'value': {'country_id': state.country_id.id}}
         return {}
 
     def _check_ean_key(self, cr, uid, ids, context=None):
@@ -509,30 +513,32 @@
             if not parent.is_company:
                 parent.write({'is_company': True})
 
-    def write(self, cr, uid, ids, vals, context=None):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        #res.partner must only allow to set the company_id of a partner if it
-        #is the same as the company of all users that inherit from this partner
-        #(this is to allow the code from res_users to write to the partner!) or
-        #if setting the company_id to False (this is compatible with any user company)
+    @multi
+    def write(self, vals):
+        # res.partner must only allow to set the company_id of a partner if it
+        # is the same as the company of all users that inherit from this partner
+        # (this is to allow the code from res_users to write to the partner!) or
+        # if setting the company_id to False (this is compatible with any user
+        # company)
         if vals.get('company_id'):
-            for partner in self.browse(cr, uid, ids, context=context):
+            company = self.env['res.company'].browse(vals['company_id'])
+            for partner in self:
                 if partner.user_ids:
-                    user_companies = set([user.company_id.id for user in partner.user_ids])
-                    if len(user_companies) > 1 or vals['company_id'] not in user_companies:
+                    companies = set(user.company_id for user in partner.user_ids)
+                    if len(companies) > 1 or company not in companies:
                         raise osv.except_osv(_("Warning"),_("You can not change the company as the partner/user has multiple user linked with different companies."))
-        result = super(res_partner,self).write(cr, uid, ids, vals, context=context)
-        for partner in self.browse(cr, uid, ids, context=context):
-            self._fields_sync(cr, uid, partner, vals, context)
+
+        result = super(res_partner, self).write(vals)
+        for partner in self:
+            self._fields_sync(partner, vals)
         return result
 
-    def create(self, cr, uid, vals, context=None):
-        new_id = super(res_partner, self).create(cr, uid, vals, context=context)
-        partner = self.browse(cr, uid, new_id, context=context)
-        self._fields_sync(cr, uid, partner, vals, context)
-        self._handle_first_contact_creation(cr, uid, partner, context)
-        return new_id
+    @model
+    def create(self, vals):
+        partner = super(res_partner, self).create(vals)
+        self._fields_sync(partner, vals)
+        self._handle_first_contact_creation(partner)
+        return partner
 
     def open_commercial_entity(self, cr, uid, ids, context=None):
         """ Utility method used to add an "Open Company" button in partner views """
@@ -736,14 +742,11 @@
             return False
         return _('Partners: ')+self.pool['res.partner.category'].browse(cr, uid, context['category_id'], context).name
 
-    def main_partner(self, cr, uid):
-        ''' Return the id of the main partner
-        '''
-        model_data = self.pool['ir.model.data']
-        return model_data.browse(cr, uid,
-                            model_data.search(cr, uid, [('module','=','base'),
-                                                ('name','=','main_partner')])[0],
-                ).res_id
+    @model
+    @returns('self')
+    def main_partner(self):
+        ''' Return the main partner '''
+        return self.env.ref('base.main_partner')
 
     def _display_address(self, cr, uid, address, without_company=False, context=None):
 
@@ -759,14 +762,14 @@
 
         # get the information that will be injected into the display format
         # get the address format
-        address_format = address.country_id and address.country_id.address_format or \
+        address_format = address.country_id.address_format or \
               "%(street)s\n%(street2)s\n%(city)s %(state_code)s %(zip)s\n%(country_name)s"
         args = {
-            'state_code': address.state_id and address.state_id.code or '',
-            'state_name': address.state_id and address.state_id.name or '',
-            'country_code': address.country_id and address.country_id.code or '',
-            'country_name': address.country_id and address.country_id.name or '',
-            'company_name': address.parent_id and address.parent_id.name or '',
+            'state_code': address.state_id.code or '',
+            'state_name': address.state_id.name or '',
+            'country_code': address.country_id.code or '',
+            'country_name': address.country_id.name or '',
+            'company_name': address.parent_id.name or '',
         }
         for field in self._address_fields(cr, uid, context=context):
             args[field] = getattr(address, field) or ''

=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2014-05-12 08:05:23 +0000
+++ openerp/addons/base/res/res_users.py	2014-05-19 13:53:27 +0000
@@ -25,11 +25,10 @@
 from lxml.builder import E
 
 import openerp
-from openerp import SUPERUSER_ID
+from openerp import SUPERUSER_ID, BaseModel
 from openerp import tools
 import openerp.exceptions
-from openerp.osv import fields,osv, expression
-from openerp.osv.orm import browse_record
+from openerp.osv import fields, osv, expression
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -226,9 +225,8 @@
     def _get_company(self,cr, uid, context=None, uid2=False):
         if not uid2:
             uid2 = uid
-        user = self.pool['res.users'].read(cr, uid, uid2, ['company_id'], context)
-        company_id = user.get('company_id', False)
-        return company_id and company_id[0] or False
+        user = self.pool['res.users'].browse(cr, uid, uid2, context)
+        return user.company_id.id
 
     def _get_companies(self, cr, uid, context=None):
         c = self._get_company(cr, uid, context)
@@ -249,6 +247,9 @@
             pass
         return result
 
+    def _get_default_image(self, cr, uid, context=None):
+        return self.pool['res.partner']._get_default_image(cr, uid, False, colorize=True, context=context)
+
     _defaults = {
         'password': '',
         'active': True,
@@ -256,7 +257,7 @@
         'company_id': _get_company,
         'company_ids': _get_companies,
         'groups_id': _get_group,
-        'image': lambda self, cr, uid, ctx={}: self.pool['res.partner']._get_default_image(cr, uid, False, ctx, colorize=True),
+        'image': _get_default_image,
     }
 
     # User can write on a few of his own fields (but not his groups for example)
@@ -304,7 +305,8 @@
                     break
             else:
                 if 'company_id' in values:
-                    if not (values['company_id'] in self.read(cr, SUPERUSER_ID, uid, ['company_ids'], context=context)['company_ids']):
+                    user = self.browse(cr, SUPERUSER_ID, uid, context=context)
+                    if not (values['company_id'] in user.company_ids.ids):
                         del values['company_id']
                 uid = 1 # safe fields only, so we write as super-user to bypass access rights
 
@@ -369,8 +371,8 @@
             else:
                 context_key = False
             if context_key:
-                res = getattr(user,k) or False
-                if isinstance(res, browse_record):
+                res = getattr(user, k) or False
+                if isinstance(res, BaseModel):
                     res = res.id
                 result[context_key] = res or False
         return result
@@ -392,7 +394,7 @@
         if not res:
             raise openerp.exceptions.AccessDenied()
 
-    def login(self, db, login, password):
+    def _login(self, db, login, password):
         if not password:
             return False
         user_id = False
@@ -421,6 +423,7 @@
                 try:
                     cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,), log_exceptions=False)
                     cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,))
+                    self.invalidate_cache(cr, user_id, ['login_date'], [user_id])
                 except Exception:
                     _logger.debug("Failed to update last_login for db:%s login:%s", db, login, exc_info=True)
         except openerp.exceptions.AccessDenied:
@@ -442,7 +445,7 @@
            :param dict user_agent_env: environment dictionary describing any
                relevant environment attributes
         """
-        uid = self.login(db, login, password)
+        uid = self._login(db, login, password)
         if uid == openerp.SUPERUSER_ID:
             # Successfully logged in as admin!
             # Attempt to guess the web base url...
@@ -670,6 +673,21 @@
         (yes if f(x) else nos).append(x)
     return yes, nos
 
+def parse_m2m(commands):
+    "return a list of ids corresponding to a many2many value"
+    ids = []
+    for command in commands:
+        if isinstance(command, (tuple, list)):
+            if command[0] in (1, 4):
+                ids.append(command[2])
+            elif command[0] == 5:
+                ids = []
+            elif command[0] == 6:
+                ids = list(command[2])
+        else:
+            ids.append(command)
+    return ids
+
 
 class groups_view(osv.osv):
     _inherit = 'res.groups'
@@ -695,7 +713,7 @@
         # we have to try-catch this, because at first init the view does not exist
         # but we are already creating some basic groups
         view = self.pool['ir.model.data'].xmlid_to_object(cr, SUPERUSER_ID, 'base.user_groups_view', context=context)
-        if view and view.exists() and view._table_name == 'ir.ui.view':
+        if view and view.exists() and view._name == 'ir.ui.view':
             xml1, xml2 = [], []
             xml1.append(E.separator(string=_('Application'), colspan="4"))
             for app, kind, gs in self.get_groups_by_application(cr, uid, context):
@@ -841,7 +859,7 @@
 
     def _get_reified_groups(self, fields, values):
         """ compute the given reified group fields from values['groups_id'] """
-        gids = set(values.get('groups_id') or [])
+        gids = set(parse_m2m(values.get('groups_id') or []))
         for f in fields:
             if is_boolean_group(f):
                 values[f] = get_boolean_group(f) in gids

=== modified file 'openerp/addons/base/security/base_security.xml'
--- openerp/addons/base/security/base_security.xml	2014-05-01 21:45:01 +0000
+++ openerp/addons/base/security/base_security.xml	2014-05-19 13:53:27 +0000
@@ -41,12 +41,15 @@
             <field name="implied_ids" eval="[(4, ref('group_sale_salesman'))]"/>
         </record>
 
+<<<<<<< TREE
         <!-- Set accesses to menu -->
         <record model="ir.ui.menu" id="base.menu_administration">
             <field name="name">Settings</field>
             <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
         </record>
 
+=======
+>>>>>>> MERGE-SOURCE
         <record model="ir.rule" id="res_partner_rule">
             <field name="name">res.partner company</field>
             <field name="model_id" ref="model_res_partner"/>

=== modified file 'openerp/addons/base/tests/__init__.py'
--- openerp/addons/base/tests/__init__.py	2014-02-16 21:44:56 +0000
+++ openerp/addons/base/tests/__init__.py	2014-05-19 13:53:27 +0000
@@ -1,10 +1,9 @@
 import test_acl
+import test_api
 import test_base
 import test_basecase
 import test_db_cursor
 import test_expression
-import test_expression
-import test_fields
 import test_func
 import test_ir_actions
 import test_ir_attachment

=== modified file 'openerp/addons/base/tests/base_test.yml'
--- openerp/addons/base/tests/base_test.yml	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/tests/base_test.yml	2014-05-19 13:53:27 +0000
@@ -277,7 +277,7 @@
             rate_id = res_currency_rate.create(cr, 1, {'name':'2000-01-01',
                                                        'rate': value,
                                                        'currency_id': currency.id})
-            rate = res_currency_rate.read(cr, 1, rate_id, ['rate'])['rate']
+            rate = res_currency_rate.read(cr, 1, [rate_id], ['rate'])[0]['rate']
             assert rate == expected, 'Roundtrip error: got %s back from db, expected %s' % (rate, expected)
         # res.currency.rate uses 6 digits of precision by default
         try_roundtrip(2.6748955, 2.674896)

=== modified file 'openerp/addons/base/tests/test_acl.py'
--- openerp/addons/base/tests/test_acl.py	2014-02-09 00:37:45 +0000
+++ openerp/addons/base/tests/test_acl.py	2014-05-19 13:53:27 +0000
@@ -20,6 +20,22 @@
         self.tech_group = self.registry('ir.model.data').get_object(self.cr, self.uid,
                                                                     *(GROUP_TECHNICAL_FEATURES.split('.')))
 
+    def _set_field_groups(self, model, field_name, groups):
+        field = model._fields[field_name]
+        column = model._columns[field_name]
+        old_groups = field.groups
+        old_prefetch = column._prefetch
+    
+        field.groups = groups
+        column.groups = groups
+        column._prefetch = False
+
+        @self.addCleanup
+        def cleanup():
+            field.groups = old_groups
+            column.groups = old_groups
+            column._prefetch = old_prefetch
+
     def test_field_visibility_restriction(self):
         """Check that model-level ``groups`` parameter effectively restricts access to that
            field for users who do not belong to one of the explicitly allowed groups"""
@@ -33,8 +49,9 @@
         self.assertNotEquals(view_arch.xpath("//field[@name='accuracy']"), [],
                              "Field 'accuracy' must be found in view definition before the test")
 
-        # Restrict access to the field and check it's gone
-        self.res_currency._columns['accuracy'].groups = GROUP_TECHNICAL_FEATURES
+        # restrict access to the field and check it's gone
+        self._set_field_groups(self.res_currency, 'accuracy', GROUP_TECHNICAL_FEATURES)
+
         fields = self.res_currency.fields_get(self.cr, self.demo_uid, [])
         form_view = self.res_currency.fields_view_get(self.cr, self.demo_uid, False, 'form')
         view_arch = etree.fromstring(form_view.get('arch'))
@@ -56,7 +73,6 @@
 
         #cleanup
         self.tech_group.write({'users': [(3, self.demo_uid)]})
-        self.res_currency._columns['accuracy'].groups = False
 
     @mute_logger('openerp.osv.orm')
     def test_field_crud_restriction(self):
@@ -68,7 +84,8 @@
         self.assert_(self.res_partner.write(self.cr, self.demo_uid, [1], {'bank_ids': []}))
 
         # Now restrict access to the field and check it's forbidden
-        self.res_partner._columns['bank_ids'].groups = GROUP_TECHNICAL_FEATURES
+        self._set_field_groups(self.res_partner, 'bank_ids', GROUP_TECHNICAL_FEATURES)
+
         with self.assertRaises(openerp.osv.orm.except_orm):
             self.res_partner.read(self.cr, self.demo_uid, [1], ['bank_ids'])
         with self.assertRaises(openerp.osv.orm.except_orm):
@@ -83,25 +100,22 @@
 
         #cleanup
         self.tech_group.write({'users': [(3, self.demo_uid)]})
-        self.res_partner._columns['bank_ids'].groups = False
 
+    @mute_logger('openerp.osv.orm')
     def test_fields_browse_restriction(self):
         """Test access to records having restricted fields"""
-        self.res_partner._columns['email'].groups = GROUP_TECHNICAL_FEATURES
-        try:
-            P = self.res_partner
-            pid = P.search(self.cr, self.demo_uid, [], limit=1)[0]
-            part = P.browse(self.cr, self.demo_uid, pid)
-            # accessing fields must no raise exceptions...
-            part.name
-            # ... except if they are restricted
-            with self.assertRaises(openerp.osv.orm.except_orm) as cm:
-                with mute_logger('openerp.osv.orm'):
-                    part.email
-
-            self.assertEqual(cm.exception.args[0], 'Access Denied')
-        finally:
-            self.res_partner._columns['email'].groups = False
+        self._set_field_groups(self.res_partner, 'email', GROUP_TECHNICAL_FEATURES)
+
+        pid = self.res_partner.search(self.cr, self.demo_uid, [], limit=1)[0]
+        part = self.res_partner.browse(self.cr, self.demo_uid, pid)
+        # accessing fields must no raise exceptions...
+        part.name
+        # ... except if they are restricted
+        with self.assertRaises(openerp.osv.orm.except_orm) as cm:
+            with mute_logger('openerp.osv.orm'):
+                part.email
+
+        self.assertEqual(cm.exception.args[0], 'AccessError')
 
 if __name__ == '__main__':
     unittest2.main()

=== added file 'openerp/addons/base/tests/test_api.py'
--- openerp/addons/base/tests/test_api.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/base/tests/test_api.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,442 @@
+
+from openerp import BaseModel
+from openerp.tools import mute_logger
+from openerp.osv.orm import except_orm
+from openerp.tests import common
+
+
+class TestAPI(common.TransactionCase):
+    """ test the new API of the ORM """
+
+    def assertIsRecordset(self, value, model):
+        self.assertIsInstance(value, BaseModel)
+        self.assertEqual(value._name, model)
+
+    def assertIsRecord(self, value, model):
+        self.assertIsRecordset(value, model)
+        self.assertTrue(len(value) <= 1)
+
+    def assertIsNull(self, value, model):
+        self.assertIsRecordset(value, model)
+        self.assertFalse(value)
+
+    @mute_logger('openerp.osv.orm')
+    def test_00_query(self):
+        """ Build a recordset, and check its contents. """
+        domain = [('name', 'ilike', 'j')]
+        ids = self.registry('res.partner').search(self.cr, self.uid, domain)
+        partners = self.env['res.partner'].search(domain)
+
+        # partners is a collection of browse records corresponding to ids
+        self.assertTrue(ids)
+        self.assertTrue(partners)
+
+        # partners and its contents are instance of the model, and share its ormcache
+        self.assertIsRecordset(partners, 'res.partner')
+        self.assertIs(partners._ormcache, self.env['res.partner']._ormcache)
+        for p in partners:
+            self.assertIsRecord(p, 'res.partner')
+            self.assertIs(p._ormcache, self.env['res.partner']._ormcache)
+
+        self.assertEqual([p.id for p in partners], ids)
+        self.assertEqual(self.env['res.partner'].browse(ids), partners)
+
+    @mute_logger('openerp.osv.orm')
+    def test_01_query_offset(self):
+        """ Build a recordset with offset, and check equivalence. """
+        partners1 = self.env['res.partner'].search([], offset=10)
+        partners2 = self.env['res.partner'].search([])[10:]
+        self.assertIsRecordset(partners1, 'res.partner')
+        self.assertIsRecordset(partners2, 'res.partner')
+        self.assertEqual(list(partners1), list(partners2))
+
+    @mute_logger('openerp.osv.orm')
+    def test_02_query_limit(self):
+        """ Build a recordset with offset, and check equivalence. """
+        partners1 = self.env['res.partner'].search([], limit=10)
+        partners2 = self.env['res.partner'].search([])[:10]
+        self.assertIsRecordset(partners1, 'res.partner')
+        self.assertIsRecordset(partners2, 'res.partner')
+        self.assertEqual(list(partners1), list(partners2))
+
+    @mute_logger('openerp.osv.orm')
+    def test_03_query_offset_limit(self):
+        """ Build a recordset with offset and limit, and check equivalence. """
+        partners1 = self.env['res.partner'].search([], offset=3, limit=7)
+        partners2 = self.env['res.partner'].search([])[3:10]
+        self.assertIsRecordset(partners1, 'res.partner')
+        self.assertIsRecordset(partners2, 'res.partner')
+        self.assertEqual(list(partners1), list(partners2))
+
+    @mute_logger('openerp.osv.orm')
+    def test_05_immutable(self):
+        """ Check that a recordset remains the same, even after updates. """
+        domain = [('name', 'ilike', 'j')]
+        partners = self.env['res.partner'].search(domain)
+        self.assertTrue(partners)
+        ids = map(int, partners)
+
+        # modify those partners, and check that partners has not changed
+        self.registry('res.partner').write(self.cr, self.uid, ids, {'active': False})
+        self.assertEqual(ids, map(int, partners))
+
+        # redo the search, and check that the result is now empty
+        partners2 = self.env['res.partner'].search(domain)
+        self.assertFalse(partners2)
+
+    @mute_logger('openerp.osv.orm')
+    def test_06_fields(self):
+        """ Check that relation fields return records, recordsets or nulls. """
+        user = self.registry('res.users').browse(self.cr, self.uid, self.uid)
+        self.assertIsRecord(user, 'res.users')
+        self.assertIsRecord(user.partner_id, 'res.partner')
+        self.assertIsRecordset(user.groups_id, 'res.groups')
+
+        partners = self.env['res.partner'].search([])
+        for name, cinfo in partners._all_columns.iteritems():
+            if cinfo.column._type == 'many2one':
+                for p in partners:
+                    self.assertIsRecord(p[name], cinfo.column._obj)
+            elif cinfo.column._type == 'reference':
+                for p in partners:
+                    if p[name]:
+                        self.assertIsRecord(p[name], cinfo.column._obj)
+            elif cinfo.column._type in ('one2many', 'many2many'):
+                for p in partners:
+                    self.assertIsRecordset(p[name], cinfo.column._obj)
+
+    @mute_logger('openerp.osv.orm')
+    def test_07_null(self):
+        """ Check behavior of null instances. """
+        # select a partner without a parent
+        partner = self.env['res.partner'].search([('parent_id', '=', False)])[0]
+
+        # check partner and related null instances
+        self.assertTrue(partner)
+        self.assertIsRecord(partner, 'res.partner')
+
+        self.assertFalse(partner.parent_id)
+        self.assertIsNull(partner.parent_id, 'res.partner')
+
+        self.assertIs(partner.parent_id.id, False)
+
+        self.assertFalse(partner.parent_id.user_id)
+        self.assertIsNull(partner.parent_id.user_id, 'res.users')
+
+        self.assertIs(partner.parent_id.user_id.name, False)
+
+        self.assertFalse(partner.parent_id.user_id.groups_id)
+        self.assertIsRecordset(partner.parent_id.user_id.groups_id, 'res.groups')
+
+    @mute_logger('openerp.osv.orm')
+    def test_10_old_old(self):
+        """ Call old-style methods in the old-fashioned way. """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+        ids = map(int, partners)
+
+        # call method name_get on partners' model, and check its effect
+        res = partners._model.name_get(self.cr, self.uid, ids)
+        self.assertEqual(len(res), len(ids))
+        self.assertEqual(set(val[0] for val in res), set(ids))
+
+    @mute_logger('openerp.osv.orm')
+    def test_20_old_new(self):
+        """ Call old-style methods in the new API style. """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+
+        # call method name_get on partners itself, and check its effect
+        res = partners.name_get()
+        self.assertEqual(len(res), len(partners))
+        self.assertEqual(set(val[0] for val in res), set(map(int, partners)))
+
+    @mute_logger('openerp.osv.orm')
+    def test_25_old_new(self):
+        """ Call old-style methods on records (new API style). """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+
+        # call method name_get on partner records, and check its effect
+        for p in partners:
+            res = p.name_get()
+            self.assertTrue(isinstance(res, list) and len(res) == 1)
+            self.assertTrue(isinstance(res[0], tuple) and len(res[0]) == 2)
+            self.assertEqual(res[0][0], p.id)
+
+    @mute_logger('openerp.osv.orm')
+    def test_30_new_old(self):
+        """ Call new-style methods in the old-fashioned way. """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+        ids = map(int, partners)
+
+        # call method write on partners' model, and check its effect
+        partners._model.write(self.cr, self.uid, ids, {'active': False})
+        for p in partners:
+            self.assertFalse(p.active)
+
+    @mute_logger('openerp.osv.orm')
+    def test_40_new_new(self):
+        """ Call new-style methods in the new API style. """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+
+        # call method write on partners itself, and check its effect
+        partners.write({'active': False})
+        for p in partners:
+            self.assertFalse(p.active)
+
+    @mute_logger('openerp.osv.orm')
+    def test_45_new_new(self):
+        """ Call new-style methods on records (new API style). """
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertTrue(partners)
+
+        # call method write on partner records, and check its effects
+        for p in partners:
+            p.write({'active': False})
+        for p in partners:
+            self.assertFalse(p.active)
+
+    @mute_logger('openerp.osv.orm')
+    @mute_logger('openerp.addons.base.ir.ir_model')
+    def test_50_environment(self):
+        """ Test environment on records. """
+        # partners and reachable records are attached to self.env
+        partners = self.env['res.partner'].search([('name', 'ilike', 'j')])
+        self.assertEqual(partners.env, self.env)
+        for x in (partners, partners[0], partners[0].company_id):
+            self.assertEqual(x.env, self.env)
+        for p in partners:
+            self.assertEqual(p.env, self.env)
+
+        # check that the current user can read and modify company data
+        partners[0].company_id.name
+        partners[0].company_id.write({'name': 'Fools'})
+
+        # create an environment with the demo user
+        demo = self.env['res.users'].search([('login', '=', 'demo')])[0]
+        demo_env = self.env(user=demo)
+        self.assertNotEqual(demo_env, self.env)
+
+        # partners and related records are still attached to self.env
+        self.assertEqual(partners.env, self.env)
+        for x in (partners, partners[0], partners[0].company_id):
+            self.assertEqual(x.env, self.env)
+        for p in partners:
+            self.assertEqual(p.env, self.env)
+
+        # create record instances attached to demo_env
+        demo_partners = partners.sudo(user=demo)
+        self.assertEqual(demo_partners.env, demo_env)
+        for x in (demo_partners, demo_partners[0], demo_partners[0].company_id):
+            self.assertEqual(x.env, demo_env)
+        for p in demo_partners:
+            self.assertEqual(p.env, demo_env)
+
+        # demo user can read but not modify company data
+        demo_partners[0].company_id.name
+        with self.assertRaises(except_orm):
+            demo_partners[0].company_id.write({'name': 'Pricks'})
+
+        # remove demo user from all groups
+        demo.write({'groups_id': [(5,)]})
+
+        # demo user can no longer access partner data
+        with self.assertRaises(except_orm):
+            demo_partners[0].company_id.name
+
+    @mute_logger('openerp.osv.orm')
+    def test_55_draft(self):
+        """ Test draft mode nesting. """
+        env = self.env
+        self.assertFalse(env.draft)
+        with env.do_in_draft():
+            self.assertTrue(env.draft)
+            with env.do_in_draft():
+                self.assertTrue(env.draft)
+                with env.do_in_draft():
+                    self.assertTrue(env.draft)
+                self.assertTrue(env.draft)
+            self.assertTrue(env.draft)
+        self.assertFalse(env.draft)
+
+    @mute_logger('openerp.osv.orm')
+    def test_60_cache(self):
+        """ Check the record cache behavior """
+        partners = self.env['res.partner'].search([('child_ids', '!=', False)])
+        partner1, partner2 = partners[0], partners[1]
+        children1, children2 = partner1.child_ids, partner2.child_ids
+        self.assertTrue(children1)
+        self.assertTrue(children2)
+
+        # take a child contact
+        child = children1[0]
+        self.assertEqual(child.parent_id, partner1)
+        self.assertIn(child, partner1.child_ids)
+        self.assertNotIn(child, partner2.child_ids)
+
+        # fetch data in the cache
+        for p in partners:
+            p.name, p.company_id.name, p.user_id.name, p.contact_address
+        self.env.check_cache()
+
+        # change its parent
+        child.write({'parent_id': partner2.id})
+        self.env.check_cache()
+
+        # check recordsets
+        self.assertEqual(child.parent_id, partner2)
+        self.assertNotIn(child, partner1.child_ids)
+        self.assertIn(child, partner2.child_ids)
+        self.assertEqual(set(partner1.child_ids + child), set(children1))
+        self.assertEqual(set(partner2.child_ids), set(children2 + child))
+        self.env.check_cache()
+
+        # delete it
+        child.unlink()
+        self.env.check_cache()
+
+        # check recordsets
+        self.assertEqual(set(partner1.child_ids), set(children1) - set([child]))
+        self.assertEqual(set(partner2.child_ids), set(children2))
+        self.env.check_cache()
+
+    @mute_logger('openerp.osv.orm')
+    def test_60_cache_prefetching(self):
+        """ Check the record cache prefetching """
+        self.env.invalidate_all()
+
+        # all the records of an instance already have an entry in cache
+        partners = self.env['res.partner'].search([])
+        partner_ids = self.env.prefetch['res.partner']
+        self.assertEqual(set(partners.ids), set(partner_ids))
+
+        # countries have not been fetched yet; their cache must be empty
+        countries = self.env['res.country'].browse()
+        self.assertFalse(self.env.prefetch['res.country'])
+
+        # reading ONE partner should fetch them ALL
+        countries |= partners[0].country_id
+        country_cache = self.env.cache[partners._fields['country_id']]
+        self.assertLessEqual(set(partners._ids), set(country_cache))
+
+        # read all partners, and check that the cache already contained them
+        country_ids = list(self.env.prefetch['res.country'])
+        for p in partners:
+            countries |= p.country_id
+        self.assertLessEqual(set(countries.ids), set(country_ids))
+
+    @mute_logger('openerp.osv.orm')
+    def test_70_one(self):
+        """ Check method one(). """
+        # check with many records
+        ps = self.env['res.partner'].search([('name', 'ilike', 'a')])
+        self.assertTrue(len(ps) > 1)
+        with self.assertRaises(except_orm): ps.one()
+
+        p1 = ps[0]
+        self.assertEqual(len(p1), 1)
+        self.assertEqual(p1.one(), p1)
+
+        p0 = self.env['res.partner'].browse()
+        self.assertEqual(len(p0), 0)
+        with self.assertRaises(except_orm): p0.one()
+
+    @mute_logger('openerp.osv.orm')
+    def test_80_contains(self):
+        """ Test membership on recordset. """
+        p1 = self.env['res.partner'].search([('name', 'ilike', 'a')], limit=1).one()
+        ps = self.env['res.partner'].search([('name', 'ilike', 'a')])
+        self.assertTrue(p1 in ps)
+
+    @mute_logger('openerp.osv.orm')
+    def test_80_set_operations(self):
+        """ Check set operations on recordsets. """
+        pa = self.env['res.partner'].search([('name', 'ilike', 'a')])
+        pb = self.env['res.partner'].search([('name', 'ilike', 'b')])
+        self.assertTrue(pa)
+        self.assertTrue(pb)
+        self.assertTrue(set(pa) & set(pb))
+
+        concat = pa + pb
+        self.assertEqual(list(concat), list(pa) + list(pb))
+        self.assertEqual(len(concat), len(pa) + len(pb))
+
+        difference = pa - pb
+        self.assertEqual(len(difference), len(set(difference)))
+        self.assertEqual(set(difference), set(pa) - set(pb))
+        self.assertLessEqual(difference, pa)
+
+        intersection = pa & pb
+        self.assertEqual(len(intersection), len(set(intersection)))
+        self.assertEqual(set(intersection), set(pa) & set(pb))
+        self.assertLessEqual(intersection, pa)
+        self.assertLessEqual(intersection, pb)
+
+        union = pa | pb
+        self.assertEqual(len(union), len(set(union)))
+        self.assertEqual(set(union), set(pa) | set(pb))
+        self.assertGreaterEqual(union, pa)
+        self.assertGreaterEqual(union, pb)
+
+        # one cannot mix different models with set operations
+        ps = pa
+        ms = self.env['ir.ui.menu'].search([])
+        self.assertNotEqual(ps._name, ms._name)
+        self.assertNotEqual(ps, ms)
+
+        with self.assertRaises(except_orm):
+            res = ps + ms
+        with self.assertRaises(except_orm):
+            res = ps - ms
+        with self.assertRaises(except_orm):
+            res = ps & ms
+        with self.assertRaises(except_orm):
+            res = ps | ms
+        with self.assertRaises(except_orm):
+            res = ps < ms
+        with self.assertRaises(except_orm):
+            res = ps <= ms
+        with self.assertRaises(except_orm):
+            res = ps > ms
+        with self.assertRaises(except_orm):
+            res = ps >= ms
+
+    @mute_logger('openerp.osv.orm')
+    def test_80_filter(self):
+        """ Check filter on recordsets. """
+        ps = self.env['res.partner'].search([])
+        customers = ps.browse([p.id for p in ps if p.customer])
+
+        # filter on a single field
+        self.assertEqual(ps.filter(lambda p: p.customer), customers)
+        self.assertEqual(ps.filter('customer'), customers)
+
+        # filter on a sequence of fields
+        self.assertEqual(
+            ps.filter(lambda p: p.parent_id.customer),
+            ps.filter('parent_id.customer')
+        )
+
+    @mute_logger('openerp.osv.orm')
+    def test_80_map(self):
+        """ Check map on recordsets. """
+        ps = self.env['res.partner'].search([])
+        parents = ps.browse()
+        for p in ps: parents |= p.parent_id
+
+        # map a single field
+        self.assertEqual(ps.map(lambda p: p.parent_id), parents)
+        self.assertEqual(ps.map('parent_id'), parents)
+
+        # map a sequence of fields
+        self.assertEqual(
+            ps.map(lambda p: p.parent_id.name),
+            [p.parent_id.name for p in ps]
+        )
+        self.assertEqual(
+            ps.map('parent_id.name'),
+            [p.name for p in parents]
+        )

=== modified file 'openerp/addons/base/tests/test_ir_rule.yml'
--- openerp/addons/base/tests/test_ir_rule.yml	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/tests/test_ir_rule.yml	2014-05-19 13:53:27 +0000
@@ -124,7 +124,7 @@
     Modify the global rule on res_company which triggers a recursive check
     of the rules on company.
 -
-    !record {model: ir.rule, id: base.res_company_rule}:
+    !record {model: ir.rule, id: res_company_rule}:
         domain_force: "[('id','child_of',[user.company_id.id])]"
 -
     Read as demo user the partners (exercising the global company rule).

=== modified file 'openerp/addons/base/tests/test_orm.py'
--- openerp/addons/base/tests/test_orm.py	2014-04-07 09:10:28 +0000
+++ openerp/addons/base/tests/test_orm.py	2014-05-19 13:53:27 +0000
@@ -77,6 +77,16 @@
         with self.assertRaises(Exception):
             self.partner.unlink(cr, uid2, [p1,p2])
 
+    def test_multi_read(self):
+        record_id = self.partner.create(self.cr, UID, {'name': 'MyPartner1'})
+        records = self.partner.read(self.cr, UID, [record_id])
+        self.assertIsInstance(records, list)
+
+    def test_one_read(self):
+        record_id = self.partner.create(self.cr, UID, {'name': 'MyPartner1'})
+        record = self.partner.read(self.cr, UID, record_id)
+        self.assertIsInstance(record, dict)
+
     @mute_logger('openerp.osv.orm')
     def test_search_read(self):
         # simple search_read
@@ -194,8 +204,10 @@
         """ copying a user should automatically copy its partner, too """
         foo_id = self.user.create(self.cr, UID, {'name': 'Foo', 'login': 'foo', 'password': 'foo'})
         foo_before, = self.user.read(self.cr, UID, [foo_id])
+        del foo_before['__last_update']
         bar_id = self.user.copy(self.cr, UID, foo_id, {'login': 'bar', 'password': 'bar'})
         foo_after, = self.user.read(self.cr, UID, [foo_id])
+        del foo_after['__last_update']
 
         self.assertEqual(foo_before, foo_after)
 
@@ -211,9 +223,11 @@
         par_id = self.partner.create(self.cr, UID, {'name': 'Bar'})
 
         foo_before, = self.user.read(self.cr, UID, [foo_id])
+        del foo_before['__last_update']
         partners_before = self.partner.search(self.cr, UID, [])
         bar_id = self.user.copy(self.cr, UID, foo_id, {'partner_id': par_id, 'login': 'bar'})
         foo_after, = self.user.read(self.cr, UID, [foo_id])
+        del foo_after['__last_update']
         partners_after = self.partner.search(self.cr, UID, [])
 
         self.assertEqual(foo_before, foo_after)

=== modified file 'openerp/addons/base/tests/test_osv_expression.yml'
--- openerp/addons/base/tests/test_osv_expression.yml	2014-05-01 18:42:17 +0000
+++ openerp/addons/base/tests/test_osv_expression.yml	2014-05-19 13:53:27 +0000
@@ -83,7 +83,7 @@
     Test one2many operator with False
 -
     !assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
-        - child_ids in (False, None, [])
+        - list(child_ids) == []
 -
     Test many2many operator with empty search list
 -
@@ -92,7 +92,7 @@
     Test many2many operator with False
 -
     !assert {model: res.partner, search: "[('category_id', '=', False)]"}:
-        - category_id in (False, None, [])
+        - list(category_id) == []
 -
     Filtering on invalid value across x2many relationship should return an empty set
 -

=== modified file 'openerp/addons/base/tests/test_views.py'
--- openerp/addons/base/tests/test_views.py	2014-04-08 11:49:36 +0000
+++ openerp/addons/base/tests/test_views.py	2014-05-19 13:53:27 +0000
@@ -7,6 +7,7 @@
 from lxml.builder import E
 
 from openerp.tests import common
+from openerp.tools import mute_logger
 
 Field = E.field
 
@@ -340,6 +341,7 @@
                     name="target"),
                 string="Title"))
 
+    @mute_logger('openerp.addons.base.ir.ir_ui_view')
     def test_invalid_position(self):
         spec = Field(
                 Field(name="whoops"),
@@ -350,6 +352,7 @@
                                               self.base_arch,
                                               spec, None)
 
+    @mute_logger('openerp.addons.base.ir.ir_ui_view')
     def test_incorrect_version(self):
         # Version ignored on //field elements, so use something else
         arch = E.form(E.element(foo="42"))
@@ -362,6 +365,7 @@
                                               arch,
                                               spec, None)
 
+    @mute_logger('openerp.addons.base.ir.ir_ui_view')
     def test_target_not_found(self):
         spec = Field(name="targut")
 

=== modified file 'openerp/addons/test_impex/models.py'
--- openerp/addons/test_impex/models.py	2013-02-11 14:36:47 +0000
+++ openerp/addons/test_impex/models.py	2014-05-19 13:53:27 +0000
@@ -6,6 +6,7 @@
 
 def function_fn(model, cr, uid, ids, field_name, arg, context):
     return dict((id, 3) for id in ids)
+
 def function_fn_write(model, cr, uid, id, field_name, field_value, fnct_inv_arg, context):
     """ just so CreatorCase.export can be used
     """
@@ -23,7 +24,8 @@
     ('datetime', fields.datetime()),
     ('text', fields.text()),
     ('selection', fields.selection([(1, "Foo"), (2, "Bar"), (3, "Qux"), (4, '')])),
-    ('selection.function', fields.selection(selection_fn)),
+    # here use size=-1 to store the values as integers instead of strings
+    ('selection.function', fields.selection(selection_fn, size=-1)),
     # just relate to an integer
     ('many2one', fields.many2one('export.integer')),
     ('one2many', fields.one2many('export.one2many.child', 'parent_id')),
@@ -32,28 +34,29 @@
     # related: specialization of fields.function, should work the same way
     # TODO: reference
 ]
+
 for name, field in models:
-    attrs = {
-        '_name': 'export.%s' % name,
-        '_columns': {
+    class NewModel(orm.Model):
+        _name = 'export.%s' % name
+        _columns = {
             'const': fields.integer(),
-            'value': field
-        },
-        '_defaults': {'const': 4},
-        'name_get': (lambda self, cr, uid, ids, context=None:
-            [(record.id, "%s:%s" % (self._name, record.value))
-             for record in self.browse(cr, uid, ids, context=context)]),
-        'name_search': (lambda self, cr, uid, name, operator, context=None:
-                self.name_get(cr, uid,
-                    self.search(cr, uid, [['value', operator, int(name.split(':')[1])]])
-                    , context=context)
-                if isinstance(name, basestring) and name.split(':')[0] == self._name
-                else [])
-    }
-    NewModel = type(
-        'Export%s' % ''.join(section.capitalize() for section in name.split('.')),
-        (orm.Model,),
-        attrs)
+            'value': field,
+        }
+        _defaults = {
+            'const': 4,
+        }
+
+        def name_get(self, cr, uid, ids, context=None):
+            return [(record.id, "%s:%s" % (self._name, record.value))
+                for record in self.browse(cr, uid, ids, context=context)]
+
+        def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
+            if isinstance(name, basestring) and name.split(':')[0] == self._name:
+                ids = self.search(cr, user, [['value', operator, int(name.split(':')[1])]])
+                return self.name_get(cr, user, ids, context=context)
+            else:
+                return []
+
 
 class One2ManyChild(orm.Model):
     _name = 'export.one2many.child'
@@ -63,28 +66,33 @@
     _columns = {
         'parent_id': fields.many2one('export.one2many'),
         'str': fields.char('unknown', size=None),
-        'value': fields.integer()
+        'value': fields.integer(),
     }
+
     def name_get(self, cr, uid, ids, context=None):
         return [(record.id, "%s:%s" % (self._name, record.value))
             for record in self.browse(cr, uid, ids, context=context)]
+
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
-        return (self.name_get(cr, user,
-                self.search(cr, user, [['value', operator, int(name.split(':')[1])]])
-                , context=context)
-            if isinstance(name, basestring) and name.split(':')[0] == self._name
-            else [])
+        if isinstance(name, basestring) and name.split(':')[0] == self._name:
+            ids = self.search(cr, user, [['value', operator, int(name.split(':')[1])]])
+            return self.name_get(cr, user, ids, context=context)
+        else:
+            return []
+
 
 class One2ManyMultiple(orm.Model):
     _name = 'export.one2many.multiple'
-
     _columns = {
         'parent_id': fields.many2one('export.one2many.recursive'),
         'const': fields.integer(),
         'child1': fields.one2many('export.one2many.child.1', 'parent_id'),
         'child2': fields.one2many('export.one2many.child.2', 'parent_id'),
     }
-    _defaults = { 'const': 36 }
+    _defaults = {
+        'const': 36,
+    }
+
 
 class One2ManyChildMultiple(orm.Model):
     _name = 'export.one2many.multiple.child'
@@ -94,18 +102,24 @@
     _columns = {
         'parent_id': fields.many2one('export.one2many.multiple'),
         'str': fields.char('unknown', size=None),
-        'value': fields.integer()
+        'value': fields.integer(),
     }
+
     def name_get(self, cr, uid, ids, context=None):
         return [(record.id, "%s:%s" % (self._name, record.value))
             for record in self.browse(cr, uid, ids, context=context)]
+
+
 class One2ManyChild1(orm.Model):
     _name = 'export.one2many.child.1'
     _inherit = 'export.one2many.multiple.child'
+
+
 class One2ManyChild2(orm.Model):
     _name = 'export.one2many.child.2'
     _inherit = 'export.one2many.multiple.child'
 
+
 class Many2ManyChild(orm.Model):
     _name = 'export.many2many.other'
     # FIXME: orm.py:1161, fix to name_get on m2o field
@@ -113,21 +127,23 @@
 
     _columns = {
         'str': fields.char('unknown', size=None),
-        'value': fields.integer()
+        'value': fields.integer(),
     }
+
     def name_get(self, cr, uid, ids, context=None):
         return [(record.id, "%s:%s" % (self._name, record.value))
             for record in self.browse(cr, uid, ids, context=context)]
+
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
-        return (self.name_get(cr, user,
-                    self.search(cr, user, [['value', operator, int(name.split(':')[1])]])
-                    , context=context)
-                if isinstance(name, basestring) and name.split(':')[0] == self._name
-                else [])
+        if isinstance(name, basestring) and name.split(':')[0] == self._name:
+            ids = self.search(cr, user, [['value', operator, int(name.split(':')[1])]])
+            return self.name_get(cr, user, ids, context=context)
+        else:
+            return []
+
 
 class SelectionWithDefault(orm.Model):
     _name = 'export.selection.withdefault'
-
     _columns = {
         'const': fields.integer(),
         'value': fields.selection([(1, "Foo"), (2, "Bar")]),
@@ -137,12 +153,12 @@
         'value': 2,
     }
 
+
 class RecO2M(orm.Model):
     _name = 'export.one2many.recursive'
-
     _columns = {
         'value': fields.integer(),
-        'child': fields.one2many('export.one2many.multiple', 'parent_id')
+        'child': fields.one2many('export.one2many.multiple', 'parent_id'),
     }
 
 class OnlyOne(orm.Model):

=== modified file 'openerp/addons/test_impex/tests/test_export.py'
--- openerp/addons/test_impex/tests/test_export.py	2013-10-24 21:47:35 +0000
+++ openerp/addons/test_impex/tests/test_export.py	2014-05-19 13:53:27 +0000
@@ -16,15 +16,14 @@
     def setUp(self):
         super(CreatorCase, self).setUp()
         self.model = self.registry(self.model_name)
+
     def make(self, value):
         id = self.model.create(self.cr, openerp.SUPERUSER_ID, {'value': value})
         return self.model.browse(self.cr, openerp.SUPERUSER_ID, [id])[0]
+
     def export(self, value, fields=('value',), context=None):
         record = self.make(value)
-        return self.model._BaseModel__export_row(
-            self.cr, openerp.SUPERUSER_ID, record,
-            [f.split('/') for f in fields],
-            context=context)
+        return record._BaseModel__export_rows([f.split('/') for f in fields])
 
 class test_boolean_field(CreatorCase):
     model_name = 'export.boolean'
@@ -272,10 +271,10 @@
         # FIXME: selection functions export the *value* itself
         self.assertEqual(
             self.export(1),
-            [[u'1']])
+            [[1]])
         self.assertEqual(
             self.export(3),
-            [[u'3']])
+            [[3]])
         # fucking hell
         self.assertEqual(
             self.export(0),
@@ -433,12 +432,10 @@
         if value is not None: values['value'] = value
         id = self.model.create(self.cr, openerp.SUPERUSER_ID, values)
         return self.model.browse(self.cr, openerp.SUPERUSER_ID, [id])[0]
+
     def export(self, value=None, fields=('child1', 'child2',), context=None, **values):
         record = self.make(value, **values)
-        return self.model._BaseModel__export_row(
-            self.cr, openerp.SUPERUSER_ID, record,
-            [f.split('/') for f in fields],
-            context=context)
+        return record._BaseModel__export_rows([f.split('/') for f in fields])
 
     def test_empty(self):
         self.assertEqual(

=== modified file 'openerp/addons/test_impex/tests/test_import.py'
--- openerp/addons/test_impex/tests/test_import.py	2012-10-10 15:44:36 +0000
+++ openerp/addons/test_impex/tests/test_import.py	2014-05-19 13:53:27 +0000
@@ -57,7 +57,7 @@
 
         ids = ModelData.search(
             self.cr, openerp.SUPERUSER_ID,
-            [('model', '=', record._table_name), ('res_id', '=', record.id)])
+            [('model', '=', record._name), ('res_id', '=', record.id)])
         if ids:
             d = ModelData.read(
                 self.cr, openerp.SUPERUSER_ID, ids, ['name', 'module'])[0]
@@ -65,12 +65,12 @@
                 return '%s.%s' % (d['module'], d['name'])
             return d['name']
 
-        name = dict(record.name_get())[record.id]
+        name = record.name_get()[0][1]
         # fix dotted name_get results, otherwise xid lookups blow up
         name = name.replace('.', '-')
         ModelData.create(self.cr, openerp.SUPERUSER_ID, {
             'name': name,
-            'model': record._table_name,
+            'model': record._name,
             'res_id': record.id,
             'module': '__test__'
         })
@@ -446,7 +446,7 @@
             ]),
             ok(2))
         self.assertEqual(
-            ['3', '1'],
+            [3, 1],
             values(self.read()))
 
     def test_translated(self):
@@ -661,7 +661,7 @@
         id4 = M2O_o.create(self.cr, openerp.SUPERUSER_ID, {'value': 9, 'str': 'record3'})
         records = M2O_o.browse(self.cr, openerp.SUPERUSER_ID, [id1, id2, id3, id4])
 
-        name = lambda record: dict(record.name_get())[record.id]
+        name = lambda record: record.name_get()[0][1]
 
         self.assertEqual(
             self.import_(['value'], [

=== modified file 'openerp/addons/test_impex/tests/test_load.py'
--- openerp/addons/test_impex/tests/test_load.py	2013-02-25 10:55:23 +0000
+++ openerp/addons/test_impex/tests/test_load.py	2014-05-19 13:53:27 +0000
@@ -56,7 +56,7 @@
 
         ids = ModelData.search(
             self.cr, openerp.SUPERUSER_ID,
-            [('model', '=', record._table_name), ('res_id', '=', record.id)])
+            [('model', '=', record._name), ('res_id', '=', record.id)])
         if ids:
             d = ModelData.read(
                 self.cr, openerp.SUPERUSER_ID, ids, ['name', 'module'])[0]
@@ -64,12 +64,12 @@
                 return '%s.%s' % (d['module'], d['name'])
             return d['name']
 
-        name = dict(record.name_get())[record.id]
+        name = record.name_get()[0][1]
         # fix dotted name_get results, otherwise xid lookups blow up
         name = name.replace('.', '-')
         ModelData.create(self.cr, openerp.SUPERUSER_ID, {
             'name': name,
-            'model': record._table_name,
+            'model': record._name,
             'res_id': record.id,
             'module': '__test__'
         })
@@ -521,7 +521,7 @@
         self.assertEqual(len(result['ids']), 2)
         self.assertFalse(result['messages'])
         self.assertEqual(
-            ['3', '1'],
+            [3, 1],
             values(self.read()))
 
     def test_translated(self):
@@ -536,7 +536,7 @@
         ], context={'lang': 'fr_FR'})
         self.assertFalse(result['messages'])
         self.assertEqual(len(result['ids']), 2)
-        self.assertEqual(values(self.read()), ['1', '2'])
+        self.assertEqual(values(self.read()), [1, 2])
 
         result = self.import_(['value'], [['Wheee']], context={'lang': 'fr_FR'})
         self.assertFalse(result['messages'])
@@ -770,7 +770,7 @@
         id4 = M2O_o.create(self.cr, openerp.SUPERUSER_ID, {'value': 9, 'str': 'record3'})
         records = M2O_o.browse(self.cr, openerp.SUPERUSER_ID, [id1, id2, id3, id4])
 
-        name = lambda record: dict(record.name_get())[record.id]
+        name = lambda record: record.name_get()[0][1]
 
         result = self.import_(['value'], [
             ['%s,%s' % (name(records[1]), name(records[2]))],

=== added directory 'openerp/addons/test_inherit'
=== added file 'openerp/addons/test_inherit/__init__.py'
--- openerp/addons/test_inherit/__init__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/__init__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+import models
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'openerp/addons/test_inherit/__openerp__.py'
--- openerp/addons/test_inherit/__openerp__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/__openerp__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'test-inherit',
+    'version': '0.1',
+    'category': 'Tests',
+    'description': """A module to verify the inheritance.""",
+    'author': 'OpenERP SA',
+    'maintainer': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'data': [],
+    'installable': True,
+    'auto_install': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'openerp/addons/test_inherit/ir.model.access.csv'
--- openerp/addons/test_inherit/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/ir.model.access.csv	2014-05-19 13:53:27 +0000
@@ -0,0 +1,1 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"

=== added file 'openerp/addons/test_inherit/models.py'
--- openerp/addons/test_inherit/models.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/models.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+import openerp
+
+# We just create a new model
+class mother(openerp.Model):
+    _name = 'test.inherit.mother'
+
+    name = openerp.fields.Char('Name', required=True)
+
+# We want to inherits from the parent model and we add some fields
+# in the child object
+class daughter(openerp.Model):
+    _name = 'test.inherit.daugther'
+    _inherits = {'test.inherit.mother': 'template_id'}
+
+    template_id = openerp.fields.Many2one('test.inherit.mother', 'Template',
+                                          required=True, ondelete='cascade')
+    field_in_daughter = openerp.fields.Char('Field1')
+
+
+# We add a new field in the parent object. Because of a recent refactoring,
+# this feature was broken.
+# This test and these models try to show the bug and fix it.
+class mother(openerp.Model):
+    _inherit = 'test.inherit.mother'
+
+    field_in_mother = openerp.fields.Char()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'openerp/addons/test_inherit/tests'
=== added file 'openerp/addons/test_inherit/tests/__init__.py'
--- openerp/addons/test_inherit/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/tests/__init__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from . import test_inherit
+
+fast_suite = [
+]
+
+checks = [
+    test_inherit,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'openerp/addons/test_inherit/tests/test_inherit.py'
--- openerp/addons/test_inherit/tests/test_inherit.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_inherit/tests/test_inherit.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from openerp.tests import common
+
+class test_inherits(common.TransactionCase):
+
+    def test_access_from_child_to_parent_model(self):
+        # This test checks if the new added column of a parent model
+        # is accessible from the child model. This test has been written
+        # to verify the purpose of the inheritance computing of the class
+        # in the openerp.osv.orm._build_model.
+        mother = self.registry('test.inherit.mother')
+        daugther = self.registry('test.inherit.daugther')
+
+        self.assertIn('field_in_mother', mother._fields)
+        self.assertIn('field_in_mother', daugther._fields)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added directory 'openerp/addons/test_new_api'
=== added file 'openerp/addons/test_new_api/__init__.py'
--- openerp/addons/test_new_api/__init__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/__init__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import models

=== added file 'openerp/addons/test_new_api/__openerp__.py'
--- openerp/addons/test_new_api/__openerp__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/__openerp__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Test New API',
+    'version': '1.0',
+    'category': 'Tests',
+    'description': """A module to test the new API.""",
+    'author': 'OpenERP SA',
+    'maintainer': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['base'],
+    'installable': True,
+    'auto_install': False,
+    'data': [
+        'ir.model.access.csv',
+        'views.xml',
+        'demo_data.xml',
+    ],
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'openerp/addons/test_new_api/demo_data.xml'
--- openerp/addons/test_new_api/demo_data.xml	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/demo_data.xml	2014-05-19 13:53:27 +0000
@@ -0,0 +1,30 @@
+<openerp>
+    <data>
+        <record id="category_0" model="test_new_api.category">
+            <field name="name">Chat</field>
+        </record>
+        <record id="category_0_0" model="test_new_api.category">
+            <field name="name">Foolish</field>
+            <field name="parent" ref="category_0"/>
+        </record>
+
+        <record id="discussion_0" model="test_new_api.discussion">
+            <field name="name">Stuff</field>
+            <field name="participants" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="message_0_0" model="test_new_api.message">
+            <field name="discussion" ref="discussion_0"/>
+            <field name="body">Hey dude!</field>
+        </record>
+        <record id="message_0_1" model="test_new_api.message">
+            <field name="discussion" ref="discussion_0"/>
+            <field name="author" ref="base.user_demo"/>
+            <field name="body">What's up?</field>
+        </record>
+        <record id="message_0_2" model="test_new_api.message">
+            <field name="discussion" ref="discussion_0"/>
+            <field name="body">This is a much longer message</field>
+        </record>
+    </data>
+</openerp>

=== added file 'openerp/addons/test_new_api/ir.model.access.csv'
--- openerp/addons/test_new_api/ir.model.access.csv	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/ir.model.access.csv	2014-05-19 13:53:27 +0000
@@ -0,0 +1,6 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+access_category,test_new_api_category,test_new_api.model_test_new_api_category,,1,1,1,1
+access_discussion,test_new_api_discussion,test_new_api.model_test_new_api_discussion,,1,1,1,1
+access_message,test_new_api_message,test_new_api.model_test_new_api_message,,1,1,1,1
+access_talk,test_new_api_talk,test_new_api.model_test_new_api_talk,,1,1,1,1
+access_mixed,test_new_api_mixed,test_new_api.model_test_new_api_mixed,,1,1,1,1

=== added file 'openerp/addons/test_new_api/models.py'
--- openerp/addons/test_new_api/models.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/models.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,183 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class res_partner(osv.Model):
+    _inherit = 'res.partner'
+
+    #
+    # add related fields to test them
+    #
+    _columns = {
+        # a regular one
+        'related_company_partner_id': fields.related(
+            'company_id', 'partner_id', type='many2one', obj='res.partner'),
+        # a related field with a single field
+        'single_related_company_id': fields.related(
+            'company_id', type='many2one', obj='res.company'),
+        # a related field with a single field that is also a related field!
+        'related_related_company_id': fields.related(
+            'single_related_company_id', type='many2one', obj='res.company'),
+    }
+
+
+from openerp import Model, Integer, Float, Char, Text, Date, Selection, \
+    Reference, Many2one, One2many, Many2many, constrains, onchange, depends, \
+    model, one, _
+
+
+class Category(Model):
+    _name = 'test_new_api.category'
+
+    name = Char(required=True)
+    parent = Many2one('test_new_api.category')
+    display_name = Char(store=False, readonly=True,
+        compute='_compute_display_name', inverse='_inverse_display_name')
+
+    @one
+    @depends('name', 'parent.display_name')     # this definition is recursive
+    def _compute_display_name(self):
+        if self.parent:
+            self.display_name = self.parent.display_name + ' / ' + self.name
+        else:
+            self.display_name = self.name
+
+    @one
+    def _inverse_display_name(self):
+        names = self.display_name.split('/')
+        # determine sequence of categories
+        categories = []
+        for name in names[:-1]:
+            category = self.search([('name', 'ilike', name.strip())])
+            categories.append(category[0])
+        categories.append(self)
+        # assign parents following sequence
+        for parent, child in zip(categories, categories[1:]):
+            if parent and child:
+                child.parent = parent
+        # assign name of last category, and reassign display_name (to normalize it)
+        self.name = names[-1].strip()
+
+
+class Discussion(Model):
+    _name = 'test_new_api.discussion'
+
+    name = Char(string='Title', required=True,
+        help="General description of what this discussion is about.")
+    moderator = Many2one('res.users')
+    categories = Many2many('test_new_api.category',
+        'test_new_api_discussion_category', 'discussion', 'category')
+    participants = Many2many('res.users')
+    messages = One2many('test_new_api.message', 'discussion')
+
+    @onchange('moderator')
+    def _onchange_moderator(self):
+        self.participants |= self.moderator
+
+
+class Message(Model):
+    _name = 'test_new_api.message'
+
+    discussion = Many2one('test_new_api.discussion', ondelete='cascade')
+    body = Text()
+    author = Many2one('res.users', default=lambda self: self.env.user)
+    name = Char(string='Title', store=True, readonly=True,
+        compute='_compute_name')
+    display_name = Char(string='Abstract', store=False, readonly=True,
+        compute='_compute_display_name')
+    size = Integer(store=False, readonly=True,
+        compute='_compute_size', search='_search_size')
+    double_size = Integer(store=False, readonly=True,
+        compute='_compute_double_size')
+    discussion_name = Char(related='discussion.name', store=False, readonly=True)
+
+    @one
+    @constrains('author', 'discussion')
+    def _check_author(self):
+        if self.discussion and self.author not in self.discussion.participants:
+            raise ValueError(_("Author must be among the discussion participants."))
+
+    @one
+    @depends('author.name', 'discussion.name')
+    def _compute_name(self):
+        self.name = "[%s] %s" % (self.discussion.name or '', self.author.name)
+
+    @one
+    @depends('author.name', 'discussion.name', 'body')
+    def _compute_display_name(self):
+        stuff = "[%s] %s: %s" % (self.author.name, self.discussion.name or '', self.body or '')
+        self.display_name = stuff[:80]
+
+    @one
+    @depends('body')
+    def _compute_size(self):
+        self.size = len(self.body or '')
+
+    def _search_size(self, operator, value):
+        if operator not in ('=', '!=', '<', '<=', '>', '>=', 'in', 'not in'):
+            return []
+        # retrieve all the messages that match with a specific SQL query
+        query = """SELECT id FROM "%s" WHERE char_length("body") %s %%s""" % \
+                (self._table, operator)
+        self.env.cr.execute(query, (value,))
+        ids = [t[0] for t in self.env.cr.fetchall()]
+        return [('id', 'in', ids)]
+
+    @one
+    @depends('size')
+    def _compute_double_size(self):
+        # This illustrates a subtle situation: self.double_size depends on
+        # self.size. When size is computed, self.size is assigned, which should
+        # normally invalidate self.double_size. However, this may not happen
+        # while self.double_size is being computed: the last statement below
+        # would fail, because self.double_size would be undefined.
+        self.double_size = 0
+        size = self.size
+        self.double_size = self.double_size + size
+
+
+class Talk(Model):
+    _name = 'test_new_api.talk'
+
+    parent = Many2one('test_new_api.discussion', delegate=True)
+
+
+class MixedModel(Model):
+    _name = 'test_new_api.mixed'
+
+    number = Float(digits=(10, 2), default=3.14)
+    date = Date()
+    lang = Selection(string='Language', selection='_get_lang')
+    reference = Reference(string='Related Document',
+        selection='_reference_models')
+
+    @model
+    def _get_lang(self):
+        langs = self.env['res.lang'].search([])
+        return [(lang.code, lang.name) for lang in langs]
+
+    @model
+    def _reference_models(self):
+        models = self.env['ir.model'].search([('state', '!=', 'manual')])
+        return [(model.model, model.name)
+                for model in models
+                if not model.model.startswith('ir.')]

=== added directory 'openerp/addons/test_new_api/tests'
=== added file 'openerp/addons/test_new_api/tests/__init__.py'
--- openerp/addons/test_new_api/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/tests/__init__.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from . import test_related
+from . import test_new_fields
+from . import test_onchange
+from . import test_field_conversions
+from . import test_attributes
+
+fast_suite = [
+]
+
+checks = [
+    test_related,
+    test_new_fields,
+    test_onchange,
+    test_field_conversions,
+    test_attributes,
+]

=== added file 'openerp/addons/test_new_api/tests/test_attributes.py'
--- openerp/addons/test_new_api/tests/test_attributes.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/tests/test_attributes.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from openerp.tests import common
+
+ANSWER_TO_ULTIMATE_QUESTION = 42
+
+class TestAttributes(common.TransactionCase):
+
+    def test_we_can_add_attributes(self):
+        Model = self.env['test_new_api.category']
+        instance = Model.create({'name': 'Foo'})
+
+        # assign an unknown attribute
+        instance.unknown = ANSWER_TO_ULTIMATE_QUESTION
+
+        # Does the attribute exist in the instance of the model ?
+        self.assertTrue(hasattr(instance, 'unknown'))
+
+        # Is it the right type ?
+        self.assertIsInstance(instance.unknown, (int, long))
+
+        # Is it the right value, in case of, we don't know ;-)
+        self.assertEqual(instance.unknown, ANSWER_TO_ULTIMATE_QUESTION)
+
+        # We are paranoiac !
+        self.assertEqual(getattr(instance, 'unknown'), ANSWER_TO_ULTIMATE_QUESTION)

=== added file 'openerp/addons/test_new_api/tests/test_field_conversions.py'
--- openerp/addons/test_new_api/tests/test_field_conversions.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/tests/test_field_conversions.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+import unittest2
+from openerp.osv import fields, fields2
+
+class TestFieldToColumn(unittest2.TestCase):
+    def test_char(self):
+        field = fields2.Char(string="test string", required=True)
+        column = field.to_column()
+
+        self.assertEqual(column.string, "test string")
+        self.assertTrue(column.required)

=== added file 'openerp/addons/test_new_api/tests/test_new_fields.py'
--- openerp/addons/test_new_api/tests/test_new_fields.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/tests/test_new_fields.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,346 @@
+#
+# test cases for new-style fields
+#
+from datetime import date, datetime
+from collections import defaultdict
+
+from openerp.tests import common
+
+
+class TestNewFields(common.TransactionCase):
+
+    def test_00_basics(self):
+        """ test accessing new fields """
+        # find a discussion
+        discussion = self.env.ref('test_new_api.discussion_0')
+
+        # read field as a record attribute or as a record item
+        self.assertIsInstance(discussion.name, basestring)
+        self.assertIsInstance(discussion['name'], basestring)
+        self.assertEqual(discussion['name'], discussion.name)
+
+        # read it with method read()
+        values = discussion.read(['name'])[0]
+        self.assertEqual(values['name'], discussion.name)
+
+    def test_10_non_stored(self):
+        """ test non-stored fields """
+        # find messages
+        for message in self.env['test_new_api.message'].search([]):
+            # check definition of field
+            self.assertEqual(message.size, len(message.body or ''))
+
+            # check recomputation after record is modified
+            size = message.size
+            message.write({'body': (message.body or '') + "!!!"})
+            self.assertEqual(message.size, size + 3)
+
+    def test_11_stored(self):
+        """ test stored fields """
+        # find the demo discussion
+        discussion = self.env.ref('test_new_api.discussion_0')
+        self.assertTrue(len(discussion.messages) > 0)
+
+        # check messages
+        name0 = discussion.name or ""
+        for message in discussion.messages:
+            self.assertEqual(message.name, "[%s] %s" % (name0, message.author.name))
+
+        # modify discussion name, and check again messages
+        discussion.name = name1 = 'Talking about stuff...'
+        for message in discussion.messages:
+            self.assertEqual(message.name, "[%s] %s" % (name1, message.author.name))
+
+        # switch message from discussion, and check again
+        name2 = 'Another discussion'
+        discussion2 = discussion.copy({'name': name2})
+        message2 = discussion.messages[0]
+        message2.discussion = discussion2
+        for message in discussion2.messages:
+            self.assertEqual(message.name, "[%s] %s" % (name2, message.author.name))
+
+    def test_12_recursive(self):
+        """ test recursively dependent fields """
+        Category = self.env['test_new_api.category']
+        abel = Category.create({'name': 'Abel'})
+        beth = Category.create({'name': 'Bethany'})
+        cath = Category.create({'name': 'Catherine'})
+        dean = Category.create({'name': 'Dean'})
+        ewan = Category.create({'name': 'Ewan'})
+        finn = Category.create({'name': 'Finnley'})
+        gabe = Category.create({'name': 'Gabriel'})
+
+        cath.parent = finn.parent = gabe
+        abel.parent = beth.parent = cath
+        dean.parent = ewan.parent = finn
+
+        self.assertEqual(abel.display_name, "Gabriel / Catherine / Abel")
+        self.assertEqual(beth.display_name, "Gabriel / Catherine / Bethany")
+        self.assertEqual(cath.display_name, "Gabriel / Catherine")
+        self.assertEqual(dean.display_name, "Gabriel / Finnley / Dean")
+        self.assertEqual(ewan.display_name, "Gabriel / Finnley / Ewan")
+        self.assertEqual(finn.display_name, "Gabriel / Finnley")
+        self.assertEqual(gabe.display_name, "Gabriel")
+
+        ewan.parent = cath
+        self.assertEqual(ewan.display_name, "Gabriel / Catherine / Ewan")
+
+        cath.parent = finn
+        self.assertEqual(ewan.display_name, "Gabriel / Finnley / Catherine / Ewan")
+
+    def test_12_cascade(self):
+        """ test computed field depending on computed field """
+        message = self.env.ref('test_new_api.message_0_0')
+        message.invalidate_cache()
+        double_size = message.double_size
+        self.assertEqual(double_size, message.size)
+
+    def test_13_inverse(self):
+        """ test inverse computation of fields """
+        Category = self.env['test_new_api.category']
+        abel = Category.create({'name': 'Abel'})
+        beth = Category.create({'name': 'Bethany'})
+        cath = Category.create({'name': 'Catherine'})
+        dean = Category.create({'name': 'Dean'})
+        ewan = Category.create({'name': 'Ewan'})
+        finn = Category.create({'name': 'Finnley'})
+        gabe = Category.create({'name': 'Gabriel'})
+        self.assertEqual(ewan.display_name, "Ewan")
+
+        ewan.display_name = "Abel / Bethany / Catherine / Erwan"
+
+        self.assertEqual(beth.parent, abel)
+        self.assertEqual(cath.parent, beth)
+        self.assertEqual(ewan.parent, cath)
+        self.assertEqual(ewan.name, "Erwan")
+
+    def test_14_search(self):
+        """ test search on computed fields """
+        discussion = self.env.ref('test_new_api.discussion_0')
+
+        # determine message sizes
+        sizes = set(message.size for message in discussion.messages)
+
+        # search for messages based on their size
+        for size in sizes:
+            messages0 = self.env['test_new_api.message'].search(
+                [('discussion', '=', discussion.id), ('size', '<=', size)])
+
+            messages1 = self.env['test_new_api.message'].browse()
+            for message in discussion.messages:
+                if message.size <= size:
+                    messages1 += message
+
+            self.assertEqual(messages0, messages1)
+
+    def test_15_constraint(self):
+        """ test new-style Python constraints """
+        discussion = self.env.ref('test_new_api.discussion_0')
+
+        # remove oneself from discussion participants: we can no longer create
+        # messages in discussion
+        discussion.participants -= self.env.user
+        with self.assertRaises(Exception):
+            self.env['test_new_api.message'].create({'discussion': discussion.id, 'body': 'Whatever'})
+
+        # put back oneself into discussion participants: now we can create
+        # messages in discussion
+        discussion.participants += self.env.user
+        self.env['test_new_api.message'].create({'discussion': discussion.id, 'body': 'Whatever'})
+
+    def test_20_float(self):
+        """ test float fields """
+        record = self.env['test_new_api.mixed'].create({})
+
+        # assign value, and expect rounding
+        record.write({'number': 2.4999999999999996})
+        self.assertEqual(record.number, 2.50)
+
+        # same with field setter
+        record.number = 2.4999999999999996
+        self.assertEqual(record.number, 2.50)
+
+    def test_21_date(self):
+        """ test date fields """
+        record = self.env['test_new_api.mixed'].create({})
+
+        # one may assign False or None
+        record.date = None
+        self.assertFalse(record.date)
+
+        # one may assign date and datetime objects
+        record.date = date(2012, 05, 01)
+        self.assertEqual(record.date, '2012-05-01')
+
+        record.date = datetime(2012, 05, 01, 10, 45, 00)
+        self.assertEqual(record.date, '2012-05-01')
+
+        # one may assign dates in the default format, and it must be checked
+        record.date = '2012-05-01'
+        self.assertEqual(record.date, '2012-05-01')
+
+        with self.assertRaises(ValueError):
+            record.date = '12-5-1'
+
+    def test_22_selection(self):
+        """ test selection fields """
+        record = self.env['test_new_api.mixed'].create({})
+
+        # one may assign False or None
+        record.lang = None
+        self.assertFalse(record.lang)
+
+        # one may assign a value, and it must be checked
+        for language in self.env['res.lang'].search([]):
+            record.lang = language.code
+        with self.assertRaises(ValueError):
+            record.lang = 'zz_ZZ'
+
+    def test_23_relation(self):
+        """ test relation fields """
+        demo = self.env.ref('base.user_demo')
+        message = self.env.ref('test_new_api.message_0_0')
+
+        # check environment of record and related records
+        self.assertEqual(message.env, self.env)
+        self.assertEqual(message.discussion.env, self.env)
+
+        demo_env = self.env(user=demo)
+        self.assertNotEqual(demo_env, self.env)
+
+        # check environment of record and related records
+        self.assertEqual(message.env, self.env)
+        self.assertEqual(message.discussion.env, self.env)
+
+        # "migrate" message into demo_env, and check again
+        demo_message = message.sudo(user=demo)
+        self.assertEqual(demo_message.env, demo_env)
+        self.assertEqual(demo_message.discussion.env, demo_env)
+
+        # assign record's parent to a record in demo_env
+        message.discussion = message.discussion.copy({'name': 'Copy'})
+
+        # both message and its parent field must be in self.env
+        self.assertEqual(message.env, self.env)
+        self.assertEqual(message.discussion.env, self.env)
+
+    def test_24_reference(self):
+        """ test reference fields. """
+        record = self.env['test_new_api.mixed'].create({})
+
+        # one may assign False or None
+        record.reference = None
+        self.assertFalse(record.reference)
+
+        # one may assign a user or a partner...
+        record.reference = self.env.user
+        self.assertEqual(record.reference, self.env.user)
+        record.reference = self.env.user.partner_id
+        self.assertEqual(record.reference, self.env.user.partner_id)
+        # ... but no record from a model that starts with 'ir.'
+        with self.assertRaises(ValueError):
+            record.reference = self.env['ir.model'].search([], limit=1)
+
+    def test_25_related(self):
+        """ test related fields. """
+        message = self.env.ref('test_new_api.message_0_0')
+        discussion = message.discussion
+
+        # check value of related field
+        self.assertEqual(message.discussion_name, discussion.name)
+
+        # change discussion name, and check result
+        discussion.name = 'Foo'
+        self.assertEqual(message.discussion_name, 'Foo')
+
+        # change discussion name via related field, and check result
+        message.discussion_name = 'Bar'
+        self.assertEqual(discussion.name, 'Bar')
+        self.assertEqual(message.discussion_name, 'Bar')
+
+        # search on related field, and check result
+        search_on_related = self.env['test_new_api.message'].search([('discussion_name', '=', 'Bar')])
+        search_on_regular = self.env['test_new_api.message'].search([('discussion.name', '=', 'Bar')])
+        self.assertEqual(search_on_related, search_on_regular)
+
+        # check that field attributes are copied
+        message_field = message.fields_get(['discussion_name'])['discussion_name']
+        discussion_field = discussion.fields_get(['name'])['name']
+        self.assertEqual(message_field['help'], discussion_field['help'])
+
+    def test_26_inherited(self):
+        """ test inherited fields. """
+        # a bunch of fields are inherited from res_partner
+        for user in self.env['res.users'].search([]):
+            partner = user.partner_id
+            for field in ('is_company', 'name', 'email', 'country_id'):
+                self.assertEqual(getattr(user, field), getattr(partner, field))
+                self.assertEqual(user[field], partner[field])
+
+    def test_30_read(self):
+        """ test computed fields as returned by read(). """
+        discussion = self.env.ref('test_new_api.discussion_0')
+
+        for message in discussion.messages:
+            display_name = message.display_name
+            size = message.size
+
+            data = message.read(['display_name', 'size'])[0]
+            self.assertEqual(data['display_name'], display_name)
+            self.assertEqual(data['size'], size)
+
+    def test_40_new(self):
+        """ test new records. """
+        discussion = self.env.ref('test_new_api.discussion_0')
+
+        # create a new message
+        message = self.env['test_new_api.message'].new()
+        self.assertFalse(message.id)
+
+        # assign some fields; should have no side effect
+        message.discussion = discussion
+        message.body = BODY = "May the Force be with you."
+        self.assertEqual(message.discussion, discussion)
+        self.assertEqual(message.body, BODY)
+
+        self.assertNotIn(message, discussion.messages)
+
+        # check computed values of fields
+        user = self.env.user
+        self.assertEqual(message.author, user)
+        self.assertEqual(message.name, "[%s] %s" % (discussion.name, user.name))
+        self.assertEqual(message.size, len(BODY))
+
+    def test_41_defaults(self):
+        """ test default values. """
+        fields = ['discussion', 'body', 'author', 'size']
+        defaults = self.env['test_new_api.message'].default_get(fields)
+        self.assertEqual(defaults, {'author': self.env.uid, 'size': 0})
+
+        defaults = self.env['test_new_api.mixed'].default_get(['number'])
+        self.assertEqual(defaults, {'number': 3.14})
+
+
+class TestMagicFields(common.TransactionCase):
+
+    def test_write_date(self):
+        record = self.env['test_new_api.discussion'].create({'name': 'Booba'})
+        self.assertEqual(record.create_uid, self.env.user)
+        self.assertEqual(record.write_uid, self.env.user)
+
+
+class TestInherits(common.TransactionCase):
+
+    def test_inherits(self):
+        """ Check that a many2one field with delegate=True adds an entry in _inherits """
+        Talk = self.env['test_new_api.talk']
+        self.assertEqual(Talk._inherits, {'test_new_api.discussion': 'parent'})
+        self.assertIn('name', Talk._fields)
+        self.assertEqual(Talk._fields['name'].related, ('parent', 'name'))
+
+        talk = Talk.create({'name': 'Foo'})
+        discussion = talk.parent
+        self.assertTrue(discussion)
+        self.assertEqual(talk._name, 'test_new_api.talk')
+        self.assertEqual(discussion._name, 'test_new_api.discussion')
+        self.assertEqual(talk.name, discussion.name)

=== added file 'openerp/addons/test_new_api/tests/test_onchange.py'
--- openerp/addons/test_new_api/tests/test_onchange.py	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/tests/test_onchange.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+
+from openerp.tests import common
+
+class TestOnChange(common.TransactionCase):
+
+    def setUp(self):
+        super(TestOnChange, self).setUp()
+        self.Discussion = self.env['test_new_api.discussion']
+        self.Message = self.env['test_new_api.message']
+
+    def test_default_get(self):
+        """ checking values returned by default_get() """
+        fields = ['name', 'categories', 'participants', 'messages']
+        values = self.Discussion.default_get(fields)
+        self.assertEqual(values, {})
+
+    def test_get_field(self):
+        """ checking that accessing an unknown attribute does nothing special """
+        with self.assertRaises(AttributeError):
+            self.Discussion.not_really_a_method()
+
+    def test_new_onchange(self):
+        """ test the effect of onchange() """
+        discussion = self.env.ref('test_new_api.discussion_0')
+        BODY = "What a beautiful day!"
+        USER = self.env.user
+
+        self.env.invalidate_all()
+        result = self.Message.onchange({
+            'discussion': discussion.id,
+            'name': "[%s] %s" % ('', USER.name),
+            'body': False,
+            'author': USER.id,
+            'size': 0,
+        }, 'discussion')
+        self.assertEqual(result['value'], {
+            'name': "[%s] %s" % (discussion.name, USER.name),
+        })
+
+        self.env.invalidate_all()
+        result = self.Message.onchange({
+            'discussion': discussion.id,
+            'name': "[%s] %s" % (discussion.name, USER.name),
+            'body': BODY,
+            'author': USER.id,
+            'size': 0,
+        }, 'body')
+        self.assertEqual(result['value'], {
+            'size': len(BODY),
+        })
+
+    def test_new_onchange_one2many(self):
+        """ test the effect of onchange() on one2many fields """
+        tocheck = ['messages.name', 'messages.body', 'messages.author', 'messages.size']
+        BODY = "What a beautiful day!"
+        USER = self.env.user
+
+        # create an independent message
+        message = self.Message.create({'body': BODY})
+        self.assertEqual(message.name, "[%s] %s" % ('', USER.name))
+
+        # modify messages
+        self.env.invalidate_all()
+        result = self.Discussion.onchange({
+            'name': "Foo",
+            'categories': [],
+            'moderator': False,
+            'participants': [],
+            'messages': [
+                (0, 0, {
+                    'name': "[%s] %s" % ('', USER.name),
+                    'body': BODY,
+                    'author': USER.id,
+                    'size': len(BODY),
+                }),
+                (1, message.id, {
+                    'name': "[%s] %s" % ('', USER.name),
+                    'body': BODY,
+                    'author': USER.id,
+                    'size': len(BODY),
+                }),
+            ],
+        }, 'messages', tocheck)
+        self.assertItemsEqual(list(result['value']), ['messages'])
+        self.assertItemsEqual(result['value']['messages'], [
+            (0, 0, {
+                'name': "[%s] %s" % ("Foo", USER.name),
+                'body': BODY,
+                'author': USER.id,
+                'size': len(BODY),
+            }),
+            (1, message.id, {
+                'name': "[%s] %s" % ("Foo", USER.name),
+                'body': BODY,
+                'author': USER.id,
+                'size': len(BODY),
+            }),
+        ])
+
+        # modify discussion name
+        self.env.invalidate_all()
+        result = self.Discussion.onchange({
+            'name': "Foo",
+            'categories': [],
+            'moderator': False,
+            'participants': [],
+            'messages': [
+                (0, 0, {
+                    'name': "[%s] %s" % ('', USER.name),
+                    'body': BODY,
+                    'author': USER.id,
+                    'size': len(BODY),
+                }),
+                (4, message.id),
+            ],
+        }, 'name', tocheck)
+        self.assertItemsEqual(list(result['value']), ['messages'])
+        self.assertItemsEqual(result['value']['messages'], [
+            (0, 0, {
+                'name': "[%s] %s" % ("Foo", USER.name),
+                'body': BODY,
+                'author': USER.id,
+                'size': len(BODY),
+            }),
+            (1, message.id, {
+                'name': "[%s] %s" % ("Foo", USER.name),
+                'body': BODY,
+                'author': USER.id,
+                'size': len(BODY),
+            }),
+        ])
+
+    def test_new_onchange_specific(self):
+        """ test the effect of field-specific onchange method """
+        discussion = self.env.ref('test_new_api.discussion_0')
+        demo = self.env.ref('base.user_demo')
+
+        # first remove demo user from participants
+        discussion.participants -= demo
+        self.assertNotIn(demo, discussion.participants)
+
+        # check that demo_user is added to participants when set as moderator
+        name = discussion.name
+        categories = [(4, cat.id) for cat in discussion.categories]
+        participants = [(4, usr.id) for usr in discussion.participants]
+        messages = [(4, msg.id) for msg in discussion.messages]
+
+        self.env.invalidate_all()
+        result = discussion.onchange({
+            'name': name,
+            'categories': categories,
+            'moderator': demo.id,
+            'participants': participants,
+            'messages': messages,
+        }, 'moderator')
+
+        self.assertItemsEqual(list(result['value']), ['participants'])
+        self.assertItemsEqual(result['value']['participants'], participants + [(4, demo.id)])

=== renamed file 'openerp/addons/base/tests/test_fields.py' => 'openerp/addons/test_new_api/tests/test_related.py'
--- openerp/addons/base/tests/test_fields.py	2014-03-11 13:38:50 +0000
+++ openerp/addons/test_new_api/tests/test_related.py	2014-05-19 13:53:27 +0000
@@ -1,6 +1,8 @@
 #
-# test cases for fields access, etc.
+# test cases for related fields, etc.
 #
+import unittest
+
 from openerp.osv import fields
 from openerp.tests import common
 
@@ -13,13 +15,6 @@
 
     def test_0_related(self):
         """ test an usual related field """
-        # add a related field test_related_company_id on res.partner
-        old_columns = self.partner._columns
-        self.partner._columns = dict(old_columns)
-        self.partner._columns.update({
-            'related_company_partner_id': fields.related('company_id', 'partner_id', type='many2one', obj='res.partner'),
-        })
-
         # find a company with a non-null partner_id
         ids = self.company.search(self.cr, self.uid, [('partner_id', '!=', False)], limit=1)
         id = ids[0]
@@ -30,9 +25,6 @@
         partner_ids2 = self.partner.search(self.cr, self.uid, [('related_company_partner_id', '=', id)])
         self.assertEqual(partner_ids1, partner_ids2)
 
-        # restore res.partner fields
-        self.partner._columns = old_columns
-
     def do_test_company_field(self, field):
         # get a partner with a non-null company_id
         ids = self.partner.search(self.cr, self.uid, [('company_id', '!=', False)], limit=1)
@@ -48,57 +40,14 @@
 
     def test_1_single_related(self):
         """ test a related field with a single indirection like fields.related('foo') """
-        # add a related field test_related_company_id on res.partner
-        # and simulate a _inherits_reload() to populate _all_columns.
-        old_columns = self.partner._columns
-        old_all_columns = self.partner._all_columns
-        self.partner._columns = dict(old_columns)
-        self.partner._all_columns = dict(old_all_columns)
-        self.partner._columns.update({
-            'single_related_company_id': fields.related('company_id', type='many2one', obj='res.company'),
-        })
-        self.partner._all_columns.update({
-            'single_related_company_id': fields.column_info('single_related_company_id', self.partner._columns['single_related_company_id'], None, None, None)
-        })
-
         self.do_test_company_field('single_related_company_id')
 
-        # restore res.partner fields
-        self.partner._columns = old_columns
-        self.partner._all_columns = old_all_columns
-
     def test_2_related_related(self):
         """ test a related field referring to a related field """
-        # add a related field on a related field on res.partner
-        # and simulate a _inherits_reload() to populate _all_columns.
-        old_columns = self.partner._columns
-        old_all_columns = self.partner._all_columns
-        self.partner._columns = dict(old_columns)
-        self.partner._all_columns = dict(old_all_columns)
-        self.partner._columns.update({
-            'single_related_company_id': fields.related('company_id', type='many2one', obj='res.company'),
-            'related_related_company_id': fields.related('single_related_company_id', type='many2one', obj='res.company'),
-        })
-        self.partner._all_columns.update({
-            'single_related_company_id': fields.column_info('single_related_company_id', self.partner._columns['single_related_company_id'], None, None, None),
-            'related_related_company_id': fields.column_info('related_related_company_id', self.partner._columns['related_related_company_id'], None, None, None)
-        })
-
         self.do_test_company_field('related_related_company_id')
 
-        # restore res.partner fields
-        self.partner._columns = old_columns
-        self.partner._all_columns = old_all_columns
-
     def test_3_read_write(self):
         """ write on a related field """
-        # add a related field test_related_company_id on res.partner
-        old_columns = self.partner._columns
-        self.partner._columns = dict(old_columns)
-        self.partner._columns.update({
-            'related_company_partner_id': fields.related('company_id', 'partner_id', type='many2one', obj='res.partner'),
-        })
-
         # find a company with a non-null partner_id
         company_ids = self.company.search(self.cr, self.uid, [('partner_id', '!=', False)], limit=1)
         company = self.company.browse(self.cr, self.uid, company_ids[0])
@@ -117,9 +66,6 @@
         partner = self.partner.browse(self.cr, self.uid, partner_ids[0])
         self.assertEqual(partner.related_company_partner_id.id, new_partner_id)
 
-        # restore res.partner fields
-        self.partner._columns = old_columns
-
 
 class TestPropertyField(common.TransactionCase):
 
@@ -132,6 +78,7 @@
         self.property = self.registry('ir.property')
         self.imd = self.registry('ir.model.data')
 
+    @unittest.skip("invalid monkey-patching")
     def test_1_property_multicompany(self):
         cr, uid = self.cr, self.uid
 

=== added file 'openerp/addons/test_new_api/views.xml'
--- openerp/addons/test_new_api/views.xml	1970-01-01 00:00:00 +0000
+++ openerp/addons/test_new_api/views.xml	2014-05-19 13:53:27 +0000
@@ -0,0 +1,127 @@
+<openerp>
+    <data>
+        <menuitem id="menu_main" name="Discussions" sequence="20"/>
+
+        <menuitem id="menu_sub" name="Discussions" parent="menu_main" sequence="10"/>
+
+        <record id="action_discussions" model="ir.actions.act_window">
+            <field name="name">Discussions</field>
+            <field name="res_model">test_new_api.discussion</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_discussions" action="action_discussions" parent="menu_sub" sequence="10"/>
+
+        <record id="action_messages" model="ir.actions.act_window">
+            <field name="name">Messages</field>
+            <field name="res_model">test_new_api.message</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_messages" action="action_messages" parent="menu_sub" sequence="20"/>
+
+        <menuitem id="menu_config" name="Configuration" parent="menu_main" sequence="20"/>
+
+        <record id="action_categories" model="ir.actions.act_window">
+            <field name="name">Categories</field>
+            <field name="res_model">test_new_api.category</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem id="menu_categories" action="action_categories" parent="menu_config"/>
+
+        <!-- Discussion form view -->
+        <record id="discussion_form" model="ir.ui.view">
+            <field name="name">discussion form view</field>
+            <field name="model">test_new_api.discussion</field>
+            <field name="arch" type="xml">
+                <form string="Discussion" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="categories" widget="many2many_tags"/>
+                            <field name="moderator"/>
+                        </group>
+                        <notebook>
+                            <page string="Messages">
+                                <field name="messages">
+                                    <tree name="Messages">
+                                        <field name="name"/>
+                                        <field name="body"/>
+                                    </tree>
+                                    <form string="Message" version="7.0">
+                                        <group>
+                                            <field name="name"/>
+                                            <field name="author"/>
+                                            <field name="size"/>
+                                        </group>
+                                        <label for="body"/>
+                                        <field name="body"/>
+                                    </form>
+                                </field>
+                            </page>
+                            <page string="Participants">
+                                <field name="participants"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Message tree view -->
+        <record id="message_tree" model="ir.ui.view">
+            <field name="name">message tree view</field>
+            <field name="model">test_new_api.message</field>
+            <field name="arch" type="xml">
+                <tree string="Messages">
+                    <field name="display_name"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Message form view -->
+        <record id="message_form" model="ir.ui.view">
+            <field name="name">message form view</field>
+            <field name="model">test_new_api.message</field>
+            <field name="arch" type="xml">
+                <form string="Message" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="discussion"/>
+                            <field name="name"/>
+                            <field name="author"/>
+                            <field name="size"/>
+                        </group>
+                        <label for="body"/>
+                        <field name="body"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- Category tree view -->
+        <record id="category_tree" model="ir.ui.view">
+            <field name="name">category tree view</field>
+            <field name="model">test_new_api.category</field>
+            <field name="arch" type="xml">
+                <tree string="Categories">
+                    <field name="display_name"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- Category form view -->
+        <record id="category_form" model="ir.ui.view">
+            <field name="name">category form view</field>
+            <field name="model">test_new_api.category</field>
+            <field name="arch" type="xml">
+                <form string="Category" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="parent"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'openerp/addons/test_workflow/models.py'
--- openerp/addons/test_workflow/models.py	2013-07-26 10:36:00 +0000
+++ openerp/addons/test_workflow/models.py	2014-05-19 13:53:27 +0000
@@ -56,12 +56,13 @@
     _inherit = 'test.workflow.model.a'
 
 for name in 'bcdefghijkl':
-    type(
-        name,
-        (openerp.osv.orm.Model,),
-        {
-            '_name': 'test.workflow.model.%s' % name,
-            '_inherit': 'test.workflow.model.a',
-        })
+    #
+    # Do not use type() to create the class here, but use the class construct.
+    # This is because the __module__ of the new class would be the one of the
+    # metaclass that provides method __new__!
+    #
+    class NewModel(openerp.osv.orm.Model):
+        _name = 'test.workflow.model.%s' % name
+        _inherit = 'test.workflow.model.a'
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'openerp/addons/test_workflow/tests/test_workflow.py'
--- openerp/addons/test_workflow/tests/test_workflow.py	2013-07-26 10:36:00 +0000
+++ openerp/addons/test_workflow/tests/test_workflow.py	2014-05-19 13:53:27 +0000
@@ -53,7 +53,7 @@
 
         # b -> c is a trigger (which is False),
         # so we remain in the b activity.
-        model.trigger(self.cr, SUPERUSER_ID, [i])
+        model.trigger(self.cr, SUPERUSER_ID)
         self.check_activities(model._name, i, ['b'])
 
         # b -> c is a trigger (which is set to True).

=== modified file 'openerp/exceptions.py'
--- openerp/exceptions.py	2013-02-15 14:35:03 +0000
+++ openerp/exceptions.py	2014-05-19 13:53:27 +0000
@@ -28,6 +28,13 @@
 If you consider introducing new exceptions, check out the test_exceptions addon.
 """
 
+# kept for backward compatibility
+class except_orm(Exception):
+    def __init__(self, name, value):
+        self.name = name
+        self.value = value
+        self.args = (name, value)
+
 class Warning(Exception):
     pass
 
@@ -47,8 +54,15 @@
         super(AccessDenied, self).__init__('Access denied.')
         self.traceback = ('', '', '')
 
-class AccessError(Exception):
+class AccessError(except_orm):
     """ Access rights error. """
+    def __init__(self, msg):
+        super(AccessError, self).__init__('AccessError', msg)
+
+class MissingError(except_orm):
+    """ Missing record(s). """
+    def __init__(self, msg):
+        super(MissingError, self).__init__('MissingError', msg)
 
 class DeferredException(Exception):
     """ Exception object holding a traceback for asynchronous reporting.

=== modified file 'openerp/http.py'
--- openerp/http.py	2014-05-08 08:39:21 +0000
+++ openerp/http.py	2014-05-19 13:53:27 +0000
@@ -35,6 +35,7 @@
 import werkzeug.wsgi
 
 import openerp
+from openerp import SUPERUSER_ID
 from openerp.service import security, model as service_model
 from openerp.tools.func import lazy_property
 

=== modified file 'openerp/modules/loading.py'
--- openerp/modules/loading.py	2014-04-18 14:15:50 +0000
+++ openerp/modules/loading.py	2014-05-19 13:53:27 +0000
@@ -178,6 +178,7 @@
                 status['progress'] = (index + 0.75) / len(graph)
                 _load_data(cr, module_name, idref, mode, kind='demo')
                 cr.execute('update ir_module_module set demo=%s where id=%s', (True, module_id))
+                modobj.invalidate_cache(cr, SUPERUSER_ID, ['demo'], [module_id])
 
             migrations.migrate_module(package, 'post')
 
@@ -315,6 +316,7 @@
                     modobj.button_upgrade(cr, SUPERUSER_ID, ids)
 
             cr.execute("update ir_module_module set state=%s where name=%s", ('installed', 'base'))
+            modobj.invalidate_cache(cr, SUPERUSER_ID, ['state'])
 
 
         # STEP 3: Load marked modules (skipping base which was done in STEP 1)

=== modified file 'openerp/modules/module.py'
--- openerp/modules/module.py	2014-05-05 12:18:40 +0000
+++ openerp/modules/module.py	2014-05-19 13:53:27 +0000
@@ -243,7 +243,7 @@
     for obj in obj_list:
         obj._auto_end(cr, {'module': module_name})
         cr.commit()
-    todo.sort()
+    todo.sort(key=lambda x: x[0])
     for t in todo:
         t[1](cr, *t[2])
     cr.commit()

=== modified file 'openerp/modules/registry.py'
--- openerp/modules/registry.py	2014-04-14 07:59:06 +0000
+++ openerp/modules/registry.py	2014-05-19 13:53:27 +0000
@@ -27,12 +27,9 @@
 import logging
 import threading
 
-import openerp.sql_db
-import openerp.osv.orm
-import openerp.tools
-import openerp.modules.db
-import openerp.tools.config
-from openerp.tools import assertion_report
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.tools import assertion_report, lazy_property
 
 _logger = logging.getLogger(__name__)
 
@@ -49,6 +46,7 @@
         self.models = {}    # model name/model instance mapping
         self._sql_error = {}
         self._store_function = {}
+        self._pure_function_fields = {}         # {model: [field, ...], ...}
         self._init = True
         self._init_parent = {}
         self._assertion_report = assertion_report.assertion_report()
@@ -97,10 +95,6 @@
         """ Return an iterator over all model names. """
         return iter(self.models)
 
-    def __contains__(self, model_name):
-        """ Test whether the model with the given name exists. """
-        return model_name in self.models
-
     def __getitem__(self, model_name):
         """ Return the model with the given name or raise KeyError if it doesn't exist."""
         return self.models[model_name]
@@ -109,6 +103,16 @@
         """ Same as ``self[model_name]``. """
         return self.models[model_name]
 
+    @lazy_property
+    def pure_function_fields(self):
+        """ Return the list of pure function fields (field objects) """
+        fields = []
+        for mname, fnames in self._pure_function_fields.iteritems():
+            model_fields = self[mname]._fields
+            for fname in fnames:
+                fields.append(model_fields[fname])
+        return fields
+
     def do_parent_store(self, cr):
         for o in self._init_parent:
             self.get(o)._parent_store_compute(cr)
@@ -132,14 +136,25 @@
 
         """
         models_to_load = [] # need to preserve loading order
+        lazy_property.reset_all(self)
+
+        # call hook before adding stuff in the registry
+        for model in self.models.itervalues():
+            model._before_registry_update(cr, SUPERUSER_ID)
+
         # Instantiate registered classes (via the MetaModel automatic discovery
         # or via explicit constructor call), and add them to the pool.
         for cls in openerp.osv.orm.MetaModel.module_to_models.get(module.name, []):
             # models register themselves in self.models
-            model = cls.create_instance(self, cr)
+            model = cls._build_model(self, cr)
             if model._name not in models_to_load:
                 # avoid double-loading models whose declaration is split
                 models_to_load.append(model._name)
+
+        # call hook after models have been instantiated
+        for model in self.models.itervalues():
+            model._after_registry_update(cr, SUPERUSER_ID)
+
         return [self.models[m] for m in models_to_load]
 
     def clear_caches(self):
@@ -151,7 +166,7 @@
             model.clear_caches()
         # Special case for ir_ui_menu which does not use openerp.tools.ormcache.
         ir_ui_menu = self.models.get('ir.ui.menu')
-        if ir_ui_menu:
+        if ir_ui_menu is not None:
             ir_ui_menu.clear_cache()
 
 
@@ -282,36 +297,37 @@
         """
         import openerp.modules
         with cls.lock():
-            registry = Registry(db_name)
-
-            # Initializing a registry will call general code which will in turn
-            # call registries.get (this object) to obtain the registry being
-            # initialized. Make it available in the registries dictionary then
-            # remove it if an exception is raised.
-            cls.delete(db_name)
-            cls.registries[db_name] = registry
-            try:
-                with registry.cursor() as cr:
-                    seq_registry, seq_cache = Registry.setup_multi_process_signaling(cr)
-                    registry.base_registry_signaling_sequence = seq_registry
-                    registry.base_cache_signaling_sequence = seq_cache
-                # This should be a method on Registry
-                openerp.modules.load_modules(registry._db, force_demo, status, update_module)
-            except Exception:
-                del cls.registries[db_name]
-                raise
-
-            # load_modules() above can replace the registry by calling
-            # indirectly new() again (when modules have to be uninstalled).
-            # Yeah, crazy.
-            registry = cls.registries[db_name]
-
-            cr = registry.cursor()
-            try:
-                registry.do_parent_store(cr)
-                cr.commit()
-            finally:
-                cr.close()
+            with openerp.Environment.manage():
+                registry = Registry(db_name)
+
+                # Initializing a registry will call general code which will in
+                # turn call registries.get (this object) to obtain the registry
+                # being initialized. Make it available in the registries
+                # dictionary then remove it if an exception is raised.
+                cls.delete(db_name)
+                cls.registries[db_name] = registry
+                try:
+                    with registry.cursor() as cr:
+                        seq_registry, seq_cache = Registry.setup_multi_process_signaling(cr)
+                        registry.base_registry_signaling_sequence = seq_registry
+                        registry.base_cache_signaling_sequence = seq_cache
+                    # This should be a method on Registry
+                    openerp.modules.load_modules(registry._db, force_demo, status, update_module)
+                except Exception:
+                    del cls.registries[db_name]
+                    raise
+
+                # load_modules() above can replace the registry by calling
+                # indirectly new() again (when modules have to be uninstalled).
+                # Yeah, crazy.
+                registry = cls.registries[db_name]
+
+                cr = registry.cursor()
+                try:
+                    registry.do_parent_store(cr)
+                    cr.commit()
+                finally:
+                    cr.close()
 
         registry.ready = True
 

=== modified file 'openerp/osv/__init__.py'
--- openerp/osv/__init__.py	2013-02-12 14:24:10 +0000
+++ openerp/osv/__init__.py	2014-05-19 13:53:27 +0000
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
+import api
 import osv
+import env
 import fields
-
+import fields2
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

=== added file 'openerp/osv/api.py'
--- openerp/osv/api.py	1970-01-01 00:00:00 +0000
+++ openerp/osv/api.py	2014-05-19 13:53:27 +0000
@@ -0,0 +1,624 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2013 OpenERP (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+""" This module provides the elements for managing two different API styles,
+    namely the "traditional" and "record" styles.
+
+    In the "traditional" style, parameters like the database cursor, user id,
+    context dictionary and record ids (usually denoted as ``cr``, ``uid``,
+    ``context``, ``ids``) are passed explicitly to all methods. In the "record"
+    style, those parameters are hidden into model instances, which gives it a
+    more object-oriented feel.
+
+    For instance, the statements::
+
+        model = self.pool.get(MODEL)
+        ids = model.search(cr, uid, DOMAIN, context=context)
+        for rec in model.browse(cr, uid, ids, context=context):
+            print rec.name
+        model.write(cr, uid, ids, VALUES, context=context)
+
+    may also be written as::
+
+        env = Env(cr, uid, context)         # cr, uid, context wrapped in env
+        recs = env[MODEL]                   # retrieve an instance of MODEL
+        recs = recs.search(DOMAIN)          # search returns a recordset
+        for rec in recs:                    # iterate over the records
+            print rec.name
+        recs.write(VALUES)                  # update all records in recs
+
+    Methods written in the "traditional" style are automatically decorated,
+    following some heuristics based on parameter names.
+"""
+
+__all__ = [
+    'Meta', 'guess', 'noguess',
+    'model', 'multi', 'one',
+    'cr', 'cr_context', 'cr_uid', 'cr_uid_context',
+    'cr_uid_id', 'cr_uid_id_context', 'cr_uid_ids', 'cr_uid_ids_context',
+    'constrains', 'depends', 'onchange', 'returns', 'propagate_returns',
+]
+
+from inspect import getargspec
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+#
+# The following attributes are used, and reflected on wrapping methods:
+#  - method._api: decorator function, used for re-applying decorator
+#  - method._constrains: set by @constrains, specifies constraint dependencies
+#  - method._depends: set by @depends, specifies compute dependencies
+#  - method._returns: set by @returns, specifies return model
+#  - method.clear_cache: set by @ormcache, used to clear the cache
+#
+# On wrapping method only:
+#  - method._orig: original method
+#
+
+_WRAPPED_ATTRS = ('__module__', '__name__', '__doc__',
+    '_api', '_constrains', '_depends', '_returns', 'clear_cache')
+
+
+class Meta(type):
+    """ Metaclass that automatically decorates traditional-style methods by
+        guessing their API. It also implements the inheritance of the
+        :func:`returns` decorators.
+    """
+
+    def __new__(meta, name, bases, attrs):
+        # dummy parent class to catch overridden methods decorated with 'returns'
+        parent = type.__new__(meta, name, bases, {})
+
+        for key, value in attrs.items():
+            if not key.startswith('__') and callable(value):
+                # make the method inherit from @returns decorators
+                if not get_returns(value):
+                    value = propagate_returns(getattr(parent, key, None), value)
+
+                # guess calling convention if none is given
+                if not hasattr(value, '_api'):
+                    try:
+                        value = guess(value)
+                    except TypeError:
+                        pass
+
+                attrs[key] = value
+
+        return type.__new__(meta, name, bases, attrs)
+
+
+def constrains(*args):
+    """ Return a decorator that specifies the field dependencies of a method
+        implementing a constraint checker. Each argument must be a field name.
+    """
+    def decorate(method):
+        method._constrains = args
+        return method
+
+    return decorate
+
+
+def onchange(*args):
+    """ Return a decorator to decorate an onchange method for given fields.
+        Each argument must be a field name.
+    """
+    def decorate(method):
+        method._onchange = args
+        return method
+
+    return decorate
+
+
+def depends(*args):
+    """ Return a decorator that specifies the field dependencies of a "compute"
+        method (for new-style function fields). Each argument must be a string
+        that consists in a dot-separated sequence of field names.
+
+        One may also pass a single function as argument. In that case, the
+        dependencies are given by calling the function with the field's model.
+    """
+    if args and callable(args[0]):
+        args = args[0]
+
+    def decorate(method):
+        method._depends = args
+        return method
+
+    return decorate
+
+
+def returns(model, downgrade=None):
+    """ Return a decorator for methods that return instances of `model`.
+
+        :param model: a model name, or ``'self'`` for the current model
+
+        :param downgrade: a function `downgrade(value)` to convert the
+            record-style `value` to a traditional-style output
+
+        The decorator adapts the method output to the api style: `id`, `ids` or
+        ``False`` for the traditional style, and recordset for the record style::
+
+            @model
+            @returns('res.partner')
+            def find_partner(self, arg):
+                ...     # return some record
+
+            # output depends on call style: traditional vs record style
+            partner_id = model.find_partner(cr, uid, arg, context=context)
+
+            # recs = model.browse(cr, uid, ids, context)
+            partner_record = recs.find_partner(arg)
+
+        Note that the decorated method must satisfy that convention.
+
+        Those decorators are automatically *inherited*: a method that overrides
+        a decorated existing method will be decorated with the same
+        ``@returns(model)``.
+    """
+    def decorate(method):
+        if hasattr(method, '_orig'):
+            # decorate the original method, and re-apply the api decorator
+            origin = method._orig
+            origin._returns = model, downgrade
+            return origin._api(origin)
+        else:
+            method._returns = model, downgrade
+            return method
+
+    return decorate
+
+
+def get_returns(method):
+    return getattr(method, '_returns', None)
+
+
+def propagate_returns(from_method, to_method):
+    spec = get_returns(from_method)
+    if spec:
+        _logger.debug("Method %s.%s inherited @returns%r",
+                      to_method.__module__, to_method.__name__, spec)
+        return returns(*spec)(to_method)
+    else:
+        return to_method
+
+
+def make_wrapper(method, old_api, new_api):
+    """ Return a wrapper method for `method`. """
+    def wrapper(self, *args, **kwargs):
+        # avoid hasattr(self, '_ids') because __getattr__() is overridden
+        if '_ids' in self.__dict__:
+            return new_api(self, *args, **kwargs)
+        else:
+            return old_api(self, *args, **kwargs)
+
+    # propagate specific openerp attributes to wrapper
+    for attr in _WRAPPED_ATTRS:
+        if hasattr(method, attr):
+            setattr(wrapper, attr, getattr(method, attr))
+    wrapper._orig = method
+
+    return wrapper
+
+
+def get_downgrade(method):
+    """ Return a function `downgrade(value)` that adapts `value` from
+        record-style to traditional-style, following the convention of `method`.
+    """
+    spec = get_returns(method)
+    if spec:
+        model, downgrade = spec
+        return downgrade or (lambda value: value.ids)
+    else:
+        return lambda value: value
+
+
+def get_upgrade(method):
+    """ Return a function `upgrade(self, value)` that adapts `value` from
+        traditional-style to record-style, following the convention of `method`.
+    """
+    spec = get_returns(method)
+    if spec:
+        model, downgrade = spec
+        if model == 'self':
+            return lambda self, value: self.browse(value)
+        else:
+            return lambda self, value: self.env[model].browse(value)
+    else:
+        return lambda self, value: value
+
+
+def get_aggregate(method):
+    """ Return a function `aggregate(self, value)` that aggregates record-style
+        `value` for a method decorated with ``@one``.
+    """
+    spec = get_returns(method)
+    if spec:
+        # value is a list of instances, concatenate them
+        model, downgrade = spec
+        if model == 'self':
+            return lambda self, value: sum(value, self.browse())
+        else:
+            return lambda self, value: sum(value, self.env[model].browse())
+    else:
+        return lambda self, value: value
+
+
+def get_context_split(method):
+    """ Return a function `split` that extracts the context from a pair of
+        positional and keyword arguments::
+
+            context, args, kwargs = split(args, kwargs)
+    """
+    pos = len(getargspec(method).args) - 1
+
+    def split(args, kwargs):
+        if pos < len(args):
+            return args[pos], args[:pos], kwargs
+        else:
+            return kwargs.pop('context', None), args, kwargs
+
+    return split
+
+
+def model(method):
+    """ Decorate a record-style method where `self` is a recordset. Such a
+        method::
+
+            @api.model
+            def method(self, args):
+                ...
+
+        may be called in both record and traditional styles, like::
+
+            # recs = model.browse(cr, uid, ids, context)
+            recs.method(args)
+
+            model.method(cr, uid, args, context=context)
+    """
+    method._api = model
+    split = get_context_split(method)
+    downgrade = get_downgrade(method)
+