~openerp-dev/openobject-server/saas-3-bug_1291322-ptr

« back to all changes in this revision

Viewing changes to openerp/addons/base/ir/ir_model.py

  • Committer: Denis Ledoux
  • Date: 2014-05-06 12:16:27 UTC
  • mfrom: (4743.1.551 7.0)
  • Revision ID: dle@openerp.com-20140506121627-4oyw4zl4o6azy73w
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5294 revid:odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u

Show diffs side-by-side

added added

removed removed

Lines of Context:
384
384
 
385
385
        # static table of properties
386
386
        model_props = [ # (our-name, fields.prop, set_fn)
387
 
            ('field_description', 'string', str),
 
387
            ('field_description', 'string', tools.ustr),
388
388
            ('required', 'required', bool),
389
389
            ('readonly', 'readonly', bool),
390
390
            ('domain', '_domain', eval),