pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: hmo@tinyerp.com-20100121141306-brgocmzk29nkt5rr
This commit is contained in:
Harry (Open ERP)
2010-01-21 19:43:06 +05:30
parent 031a2addd5 88d3592b11
commit a765021d5b
2 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/document_change/document_change.py
+10 -8
View File
@@ -34,7 +34,7 @@ class document_change_type(osv.osv):
_description = "Document Change Type"
_columns = {
'name': fields.char("Document Change Type", size=64),
'name': fields.char("Document Change Type", size=64,required=True),
'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')
}
@@ -61,18 +61,20 @@ class doucment_change_process_phase(osv.osv):
_description = "Document Change Process Phase"
_columns = {
'name': fields.char("Name", size=64),
'name': fields.char("Name", size=64, required=True),
'process_id':fields.many2one('document.change.process','Process Change'),
'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),
'update_document': fields.selection([('at_endPhase', 'End Phase'),('at_endprocess', 'End Process')], 'Update Document', required=True),
'type': fields.selection([('control_required', 'Control Required'),('no_control', 'No Control')], 'Type'),
'date_control': fields.date('Control Date', select=True),
'phase_ids':fields.many2one('document.change.process.phase','Phase Type'),
'state': fields.selection([('draft', 'Draft'),('started', 'Started'),('validate', 'To Validate'), ('end', 'End')], 'Status', readonly=True),
'state': fields.selection([('draft', 'Draft'),('started', 'Started'),('validate', 'To Validate'), ('end', 'End')], 'Status'),
'phase_document_ids':fields.many2many('ir.attachment','phase_document_rel','phase_id','document_id','Document'),
}
_defaults = {
'state': lambda *a: 'draft',
'update_document': lambda *a:'at_endPhase',
'type':lambda *a: 'no_control',
}
doucment_change_process_phase()
@@ -93,7 +95,7 @@ class document_file(osv.osv):
_columns = {
'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),
'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'),
'target_document_id': fields.many2one('document.directory', 'Target Document'),
'target':fields.binary('Target'),
}
@@ -142,7 +144,7 @@ class doucment_change_process(osv.osv):
'create_date':fields.datetime('Creation',readonly=True),
'latest_modified_date':fields.function(_latestmodification, method=True, type='date', string="Lastest Modification"), #TODO no year!
'date_expected':fields.datetime('Expected Production'),
'state':fields.selection([('draft', 'Draft'),('progress', 'Progress'),('confirmed', 'To Validate'), ('done', 'Done'),('done', 'Done'),('cancel','Cancelled')], 'Status', readonly=True),
'state':fields.selection([('draft', 'Draft'),('progress', 'Progress'),('confirmed', 'To Validate'), ('done', 'Done'),('done', 'Done'),('cancel','Cancelled')], 'Status'),
'process_phase_ids':fields.one2many('document.change.process.phase','process_id','Phase'),
'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
'pending_directory_id' :fields.many2one('document.directory','Pending Directory ID'),
@@ -153,4 +155,4 @@ class doucment_change_process(osv.osv):
'state': lambda *a: 'draft',
}
doucment_change_process()
doucment_change_process()
addons/document_change/document_change_view.xml
+34 -1
View File
@@ -143,6 +143,39 @@
<menuitem name="Process Changes" id="menu_process_changes_config" parent="menu_configuration"/>
<menuitem action="action_process_phase_type_form" id="menu_phase_type_form" parent="menu_process_changes_config"/>
<!-- Document Change Process Type -->
<record model="ir.ui.view" id="view_change_process_type_form">
<field name="name">document.change.process.type.form</field>
<field name="model">document.change.process.type</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Phase Types">
<field name="name" select="1" string="Phase Type"/>
</form>
</field>
</record>
<record model="ir.ui.view" id="view_change_processe_type_tree">
<field name="name">document.change.process.type.tree</field>
<field name="model">document.change.process.type</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Phase Types">
<field name="name" string="Phase Type"/>
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_change_process_type_form">
<field name="type">ir.actions.act_window</field>
<field name="res_model">document.change.process.type</field>
<field name="name">Process Type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_change_process_type_form" id="menu_change_process_type_form" parent="menu_process_changes_config"/>
<!--
Model of Changes
-->
@@ -296,7 +329,7 @@
<newline/>
<field name="update_document" string="Update documents"/>
<field name="type" string="Type"/>
<field name="date_control" string="Control date"/>
<field name="date_control" string="Control date" attrs="{'required':[('type','=','control_required')], 'invisible': [('type','!=','control_required')]}"/>
<field name="phase_ids" string="Phase Type"/>
</group>
<separator colspan="4" string="Documents"/>