← Back to branch summary

~savoirfairelinux-openerp/openerp-mgmtsystem/openupgrade70

« back to all changes in this revision

Viewing changes to mgmtsystem_nonconformity/mgmtsystem_nonconformity.py

  • Committer: Virgil Dupras
  • Date: 2013-01-31 14:21:30 UTC
  • mfrom: (10.2.3 migrate-7.0)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: virgil.dupras@savoirfairelinux.com-20130131142130-grxopntdhgea04u5
[MRG] Merged nc-extend with migrate-7.0

I resolved basic conficts, but there are still problems with modules that we have to fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mgmtsystem_nonconformity/mgmtsystem_nonconformity.py
156
156
        'manager_user_id': fields.many2one('res.users','Manager', required=True),
157
157
        'author_user_id': fields.many2one('res.users','Filled in by', required=True),
158
158
        'origin_ids': fields.many2many('mgmtsystem.nonconformity.origin','mgmtsystem_nonconformity_origin_rel', 'nonconformity_id', 'origin_id', 'Origin', required=True),
159
 
        'procedure_ids': fields.many2many('wiki.wiki','mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
 
159
        'procedure_ids': fields.many2many('document.page','mgmtsystem_nonconformity_procedure_rel', 'nonconformity_id', 'procedure_id', 'Procedure'),
160
160
        'description': fields.text('Description', required=True),
161
161
        'state': fields.selection(_STATES, 'State', readonly=True),
162
162
        'state_name': fields.function(_state_name, string='State Description', type='char', size=40),