~openerp-dev/openobject-server/trunk-staging-mat

« back to all changes in this revision

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

  • Committer: Martin Trigaux
  • Date: 2014-05-12 08:05:23 UTC
  • mfrom: (5189.1.22 saas-4)
  • Revision ID: mat@openerp.com-20140512080523-t1ugjl53jfgohfde
Forward-port of latest saas-4, up to revision 5211 (revid fme@openerp.com-20140509164408-rtml4brrhpiv4zz9)

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),