Improved project management

bzr revid: hda@tinyerp.com-20100203134751-u184vhz74jrphlhq

4 files changed, 22 insertions, 16 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index e35c94d264f..fc351f3be6e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -521,18 +521,21 @@ class message(osv.osv):
     _name = "project.message"
     _description = "Message"
     _columns = {
-        'subject': fields.char('Subject', size=128),
-        'description': fields.char('Description', size =128),
+        'subject': fields.char('Subject', size=128, required="True"),
+        'description': fields.text('Description'),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
         'date': fields.date('Date'),
-        'user_id': fields.many2one('res.users', 'User'),
+        'user_id': fields.many2one('res.users', 'User', required="True"),
         }
     def _default_project(self, cr, uid, context={}):
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
-        return False    
+        return False
+
     _defaults = {
-              'project_id':_default_project}    
+        'user_id' : lambda self,cr,uid,ctx : uid,                 
+        'project_id':_default_project}    
+
 message()
 
 def _project_get(self, cr, uid, context={}):
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5c7e7fd953c..a289d5155bb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -463,7 +463,7 @@
                              <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                         </field>
                         <field name="user_id" select="1" widget="selection">
-                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute"/>
+                            <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="gtk-execute" default="1"/>
                             <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
                         </field>
                     </group>
@@ -628,14 +628,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Messages">
-                    <group colspan="6">
-                        <field name="subject" select="1"/>
-                        <field name="description"/>
-                        <field name="project_id" />
-                        <field name="date" select="2"/>
-                        <field name="user_id" select="1"/>
-                    </group>
-                </form>
+					<group colspan="6">
+                        <field name="subject" select="1" string="Title"/>
+                        <field name="project_id"/>
+						<field name="user_id" select="1"/>
+                      	<field name="date" select="2"/>
+					 </group>
+						<separator string="Description"  colspan="4"/>
+						<field name="description"  nolabel="1" colspan="4"/>
+				</form>
             </field>
        </record>
 
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
index 785dd9f599c..edb5c90a18a 100644
--- a/addons/project/project_wizard.xml
+++ b/addons/project/project_wizard.xml
@@ -5,11 +5,11 @@
         <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>
 
         <wizard id="wizard_compute_task" model="project.task" name="wizard.compute.tasks" string="Compute Task Scheduling"/>
-		<menuitem icon="terp-project" id="menu_main" name="Project Management"/>
+		<menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
 		<menuitem
             action="wizard_compute_task"
             id="menu_wizard_compute_task"
-            parent="menu_main"
+            parent="base.menu_pm_planning"
             type="wizard"
             sequence="1"/>
 
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 29d201c4c02..15f5609c88e 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_project_project_manager","project.project manager","model_project_project","project.group_project_manager",1,1,1,1
+"access_account_analytic_account_manager","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,1,1,1
 "access_project_project","project.project","model_project_project","project.group_project_user",1,0,0,0
+"access_account_analytic_account","account.analytic.account","account.model_account_analytic_account","project.group_project_user",1,0,0,0
 "access_project_task_type_user","project.task.type user","model_project_task_type","project.group_project_user",1,0,0,1
 "access_project_task_type","project.task.type","model_project_task_type","project.group_project_manager",1,1,1,1
 "access_project_task_manager","project.task manager","model_project_task","project.group_project_manager",1,1,1,1