diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index e58c7e7e4d1..d23b64e1e9d 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -68,7 +68,7 @@ class doucment_change_process_phase(osv.osv):
'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'), ('done', 'Done')], 'Status',readonly=True),
+ 'state': fields.selection([('draft', 'Draft'),('in_process', 'Started'),('validate', 'To Validate'),('pending', 'Pending'), ('done', 'Done')], 'Status',readonly=True),
'phase_document_ids':fields.many2many('ir.attachment','phase_document_rel','phase_id','document_id','Document'),
}
_defaults = {
@@ -79,14 +79,15 @@ class doucment_change_process_phase(osv.osv):
def state_draft_set(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state':'draft'})
return True
-
def state_validate_set(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state':'validate'})
return True
def state_started_set(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state':'started'})
+ self.write(cr, uid, ids, {'state':'in_process'})
return True
-
+ def state_pending_set(self, cr, uid, ids, *args):
+ self.write(cr, uid, ids, {'state':'pending'})
+ return True
def state_done_set(self, cr, uid, ids, *args):
self.write(cr, uid, ids, {'state':'done'})
return True
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 90bcf2b5024..cba8e6c7122 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -344,7 +344,9 @@
-
+
+
+
diff --git a/addons/document_change/document_process_workflow.xml b/addons/document_change/document_process_workflow.xml
index 26cb6574d89..7d2e781a2c6 100644
--- a/addons/document_change/document_process_workflow.xml
+++ b/addons/document_change/document_process_workflow.xml
@@ -16,7 +16,7 @@
in_progress
- button_in_progress()
+ state_started_set()
function
@@ -27,14 +27,14 @@
- to_validate
- state_done_set()
+ validate
+ state_validate_set()
function
done
- button_end()
+ state_done_set()
function
@@ -42,27 +42,27 @@
- in_progress
+ button_start
- pending
+ button_pending
- in_progress
+ button_progress
- validate
+ button_validate
- done
+ button_done
\ No newline at end of file