diff options
| author | gpa <gpa@tinyerp.com> | 2010-09-29 20:41:04 +0530 |
|---|---|---|
| committer | gpa <gpa@tinyerp.com> | 2010-09-29 20:41:04 +0530 |
| commit | fc8a440eeebc950a7575a0fb91ccd2f7eabdd671 (patch) | |
| tree | 838d7aacc3a50b38ed54a5c1e2f68526736d1714 /addons/project | |
| parent | 7f728b9e802834694b15b6c65235d2f6e108b57d (diff) | |
| parent | c97280933d63cd91fc6e739f6f00eeca3cb44440 (diff) | |
merge
bzr revid: gpa@tinyerp.com-20100929151104-ery4s39emg1vmepl
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/board_project_manager_view.xml | 6 | ||||
| -rw-r--r-- | addons/project/project.py | 1 | ||||
| -rw-r--r-- | addons/project/project_view.xml | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml index 76c40324d31..12559b0629b 100644 --- a/addons/project/board_project_manager_view.xml +++ b/addons/project/board_project_manager_view.xml @@ -9,7 +9,11 @@ <!-- Board for project managers --> - <act_window domain="[('manager', '=', uid)]" id="act_my_project" name="My projects" res_model="project.project" view_mode="tree,form" view_type="form"/> + <act_window + domain="[('manager', '=', uid)]" + id="act_my_project" name="My projects" + res_model="project.project" view_mode="tree,form" + view_type="form"/> <act_window domain="[('user_id','=',uid),('state','<>','close')]" id="act_my_account" name="My accounts to invoice" res_model="account.analytic.account" view_id="view_account_analytic_simplified" view_mode="tree,form" view_type="form"/> diff --git a/addons/project/project.py b/addons/project/project.py index f4574e90d37..a6a7f837efe 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -389,6 +389,7 @@ class task(osv.osv): if not default.get('remaining_hours', False): default['remaining_hours'] = float(self.read(cr, uid, id, ['planned_hours'])['planned_hours']) default['active'] = True + default['type_id'] = False if not default.get('name', False): default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)') return super(task, self).copy_data(cr, uid, id, default, context) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d91a52f5af1..656c5c724a8 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -107,11 +107,12 @@ <group col='15' colspan='4'> <filter icon="terp-check" string="Current" name="Current" domain="[('state', 'in',('open','pending'))]" help="Open and Pending Projects" default="1"/> <separator orientation="vertical"/> - <filter icon="terp-personal" string="Manager" name="Manager" domain="[('user_id', '=', uid)]" help="Projects in which I am a manager."/> <filter icon="terp-personal+" string="Member" domain="['|',('user_id', '=', uid),('members', '=', uid)]" help="Projects in which I am a member." default="1"/> <separator orientation="vertical"/> <field name="name" string="Project Name"/> - <field name="user_id" string="Project Manager" default="1"/> + <field name="user_id" string="Project Manager" default="1"> + <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/> + </field> <field name="partner_id" string="Partner"/> </group> <newline /> |