Merge lp:~sandi-dirntis/openerpsl/20140717_1 into lp:openerpsl/7.0

[Aleksander Dirntiš]

[MOD] Added field active to project task type

Unmerged revisions

437. By Aleksander Dirntiš on 2014-07-30

[MOD] Added field active to project task type

=== modified file 'project_work_planning/project_work_planning.py'
--- project_work_planning/project_work_planning.py	2013-05-16 07:51:44 +0000
+++ project_work_planning/project_work_planning.py	2014-07-30 11:37:07 +0000
@@ -153,6 +153,7 @@
     _inherit = 'project.task.type'
     _columns = {
         'stage_type': fields.selection([('default','Default'),('on_hold','Working - on hold'),('in_progress','Working - in progress')], 'Stage type', required=True),
+        'active': fields.boolean('Active', help="If the active field is set to False, you will be able to hide task type without removing it."),
     }
 
     _defaults = {
@@ -172,7 +173,7 @@
         return True
 
     _constraints = [
-        (_check_stage_type, '\n\nStage type "Working - on hold" and "Working - in progress" can be assigned only ones!', ['stage_type'])
+        (_check_stage_type, '\n\nStage type "Working - on hold" and "Working - in progress" can be assigned only once!', ['stage_type'])
     ]
 
 project_task_type()
 
=== modified file 'project_work_planning/project_work_planning_view.xml'
--- project_work_planning/project_work_planning_view.xml	2013-05-16 07:51:44 +0000
+++ project_work_planning/project_work_planning_view.xml	2014-07-30 11:37:07 +0000
@@ -58,6 +58,7 @@
 			<field name="arch" type="xml">
 				<field name="case_default" position="after">
 					<field name="stage_type"/>
+                    <field name="active"/>
 				</field>
 			</field>
 		</record>