From 851e3d8d87f200b0263b0da8e30e11f20ea03519 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP)" Date: Fri, 20 Dec 2013 11:49:35 +0530 Subject: [PATCH 1/5] [ADD] Added timesheet accounts menu in hr configuration bzr revid: cod@tinyerp.com-20131220061935-p0dqxrer1mp3sll4 --- addons/hr_timesheet/hr_timesheet_view.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 0cd8a880a68..a997af54beb 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -125,7 +125,17 @@ + + + Timesheet Accounts + ir.actions.act_window + account.analytic.account + form + tree,form + + + Timesheet Activities ir.actions.act_window From f794a8c7af7bdf09bffe901f7ba47c0e25f08909 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP)" Date: Fri, 20 Dec 2013 16:40:22 +0530 Subject: [PATCH 2/5] [IMP]Improved code to set action bzr revid: cod@tinyerp.com-20131220111022-hnf8jfwr8h0h74hw --- addons/hr_timesheet/hr_timesheet_view.xml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index a997af54beb..e9f06db6919 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -125,16 +125,8 @@ - - - Timesheet Accounts - ir.actions.act_window - account.analytic.account - form - tree,form - - + Timesheet Activities From 03176d176bfaa740eef12a21f9092759653a83c1 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP)" Date: Mon, 23 Dec 2013 15:30:35 +0530 Subject: [PATCH 3/5] [IMP]Improved code to set use_timesheets default true and added action for menu Timesheets Accounts bzr revid: cod@tinyerp.com-20131223100035-us5sljbq2iyq9shs --- addons/hr_timesheet/hr_timesheet.py | 3 +++ addons/hr_timesheet/hr_timesheet_view.xml | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 5baf8ec262b..dabc5b5a125 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -206,6 +206,9 @@ class account_analytic_account(osv.osv): _columns = { 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), } + _defaults = { + 'use_timesheets': True + } def on_change_template(self, cr, uid, ids, template_id, context=None): res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index e9f06db6919..1a4ccf5953d 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -125,8 +125,17 @@ + + + Timesheet Accounts + ir.actions.act_window + account.analytic.account + form + tree,form + [('use_timesheets','=', True)] + - + Timesheet Activities From 7db3c7aaac260d7670f8a958ebc80a8c09c43ba6 Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP)" Date: Mon, 23 Dec 2013 17:26:19 +0530 Subject: [PATCH 4/5] [REM]Removed use_timesheets field from defaults bzr revid: cod@tinyerp.com-20131223115619-oimjlyrimgbaa7ie --- addons/hr_timesheet/hr_timesheet.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index dabc5b5a125..5baf8ec262b 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -206,9 +206,6 @@ class account_analytic_account(osv.osv): _columns = { 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), } - _defaults = { - 'use_timesheets': True - } def on_change_template(self, cr, uid, ids, template_id, context=None): res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) From 472ca8aad829f9e81fb59d95fe814174b269053c Mon Sep 17 00:00:00 2001 From: "Chirag Dodiya (OpenERP)" Date: Wed, 19 Mar 2014 17:45:48 +0530 Subject: [PATCH 5/5] [IMP]Set use_timesheets field default true and improved typo bzr revid: cod@tinyerp.com-20140319121548-qlsnp01v8mop5p92 --- addons/hr_timesheet/hr_timesheet_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 1a4ccf5953d..c9fab1105c7 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -133,9 +133,10 @@ form tree,form [('use_timesheets','=', True)] + {'default_use_timesheets':1} - + Timesheet Activities