From d8f15342d2fecd88b6a8feb4620d4045909d1569 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Thu, 21 Jan 2010 14:33:54 +0530 Subject: [PATCH] document_change: add the field in view and object bzr revid: sbh@tinyerp.com-20100121090354-joj8fk6bdbh1niy7 --- addons/document_change/__terp__.py | 2 +- addons/document_change/document_change.py | 18 +++++++++++------- .../document_change/document_change_view.xml | 18 +++++++++--------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/addons/document_change/__terp__.py b/addons/document_change/__terp__.py index de237ca11c4..4913c8ed33a 100644 --- a/addons/document_change/__terp__.py +++ b/addons/document_change/__terp__.py @@ -32,7 +32,7 @@ 'website': 'http://www.openerp.com', 'depends': ['base', 'document_ftp','mail_gateway'], 'init_xml': [], - 'update_xml': [ + 'update_xml': ['document_change_view.xml' ], 'demo_xml': [ ], diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py index 6e1b95c33f7..f2dd9cd6a31 100644 --- a/addons/document_change/document_change.py +++ b/addons/document_change/document_change.py @@ -25,14 +25,17 @@ import pooler import netsvc from tools.translate import _ +class doucment_change_process_phase_type(osv.osv): + _name = "document.change.process.phase.type" +doucment_change_process_phase_type() class document_change_type(osv.osv): _name = "document.change.type" _description = "Document Change Type" _columns = { 'name': fields.char("Document Change Type", size=64), - 'phase_type_ids': many2many('document.change.process.phase.type'), - 'template_document_id': many2one('ir.attachement','Document') + 'phase_type_ids': fields.many2many('document.change.process.phase.type','document_process__rel','type_id','change_id','Phase Type'), + 'template_document_id':fields.many2one('ir.attachment','Document') } document_change_type() @@ -42,7 +45,7 @@ class doucment_change_process_phase_type(osv.osv): _columns = { 'name': fields.char("Document Changed Process Type", size=64), 'sequence': fields.integer('Sequence'), - 'document_type_ids': many2many('document.type','Document'), + 'document_type_ids': fields.many2many('document.change.type','Document','document_phase_process__rel','phase_id','document_id','Phase Type'), } doucment_change_process_phase_type() @@ -55,9 +58,10 @@ class doucment_change_process_phase(osv.osv): 'sequence': fields.integer('Sequence'), 'update_document': fields.selection([('at_endPhase', 'At EndPhase'),('at_endprocess', 'At EndPorcess')], 'Update Document', required=True), 'type': fields.selection([('required', 'Control Required'),('no_control', 'Control')], 'Type', required=True), - 'date': fields.date('Date', select=True), - 'document_type_ids': many2many('document.type','Document'), + 'date_control': fields.date('Control Date', select=True), + 'phase_ids':fields.many2many('document.change.process.phase','phase_process__rel','process_id','phase_id','Phase Type'), 'state': fields.selection([('draft', 'Draft'),('started', 'Started'),('validate', 'To Validate'), ('end', 'End')], 'Status', readonly=True), + 'phase_document_ids':fields.many2many('ir.attachment','Document','phase_document_rel','phase_id','document_id','Phase Type'), } doucment_change_process_phase() @@ -67,7 +71,7 @@ class document_change_process_model(osv.osv): _columns = { 'name': fields.char("Changed Process Model", size=64,required=True), 'sequence': fields.integer('Sequence'), - 'phase_type_ids':many2many('document.change.process.phase.type','Process Type', required=True), + 'phase_type_ids':fields.many2many('document.change.process.phase.type','phase_type_rel','phase_id','phase_model_id','Process Type', required=True), } document_change_process_model() @@ -76,7 +80,7 @@ document_change_process_model() class document_file(osv.osv): _inherit = 'ir.attachment' _columns = { - 'type_id': many2one('document.change.type'), + 'type_id':fields.many2one('document.change.type','Document Type'), 'state': fields.selection([('change_request', 'Change Request'),('change_proposed', 'Change Proposed'), ('in_production', 'In Production'), ('to_update', 'To Update'), ('validate', 'To Validate'), ('cancel', 'Cancel')], 'Status', readonly=True), 'target_document_id': fields.many2one('document.directory', 'Target Document'), 'target':fields.binary('Target'), diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml index b8450c4270b..b98e95f8896 100644 --- a/addons/document_change/document_change_view.xml +++ b/addons/document_change/document_change_view.xml @@ -224,14 +224,14 @@
- + - - - - + + + + - + @@ -258,9 +258,9 @@ - + document.change.process.form document.change.process @@ -330,6 +330,6 @@ form tree,form,calendar,graph - + --> \ No newline at end of file