diff --git a/addons/account/wizard/wizard_journal_select.py b/addons/account/wizard/wizard_journal_select.py index 9c7f7962f96..1a9b7cf1fd6 100644 --- a/addons/account/wizard/wizard_journal_select.py +++ b/addons/account/wizard/wizard_journal_select.py @@ -35,7 +35,7 @@ def _action_open_window(self, cr, uid, data, context): journal_id,period_id = cr.fetchone() return { 'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id,period_id), - 'name': 'Saisie Standard', + #'name': 'Saisie Standard', 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.move.line', diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml index 70c8ac14582..8158a9315af 100644 --- a/addons/crm/crm_demo.xml +++ b/addons/crm/crm_demo.xml @@ -190,7 +190,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + pending @@ -263,7 +263,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + done @@ -318,7 +318,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + done @@ -445,7 +445,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + done @@ -537,7 +537,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + cancel @@ -610,7 +610,7 @@ Send them a price. 2005-04-05 2005-05-07 - open + done diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml index 81e55261eda..d6b69fd277f 100644 --- a/addons/hr/hr_demo.xml +++ b/addons/hr/hr_demo.xml @@ -148,102 +148,102 @@ - 2005-05-04 08:21 + sign_in - 2005-05-04 11:51 + sign_out - 2005-05-04 12:47 + sign_in - 2005-05-04 19:53 + sign_out - 2005-05-05 07:32 + sign_in - 2005-05-05 12:32 + sign_out - 2005-05-05 14:01 + sign_in - 2005-05-05 17:21 + sign_out - 2005-05-06 09:10 + sign_in - 2005-05-06 12:42 + sign_out - 2005-05-06 13:10 + sign_in - 2005-05-06 18:34 + sign_out - 2005-05-07 08:21 + sign_in - 2005-05-07 18:21 + sign_out - 2005-05-08 08:21 + sign_in - 2005-05-08 12:54 + sign_out - 2005-05-08 13:32 + sign_in - 2005-05-08 19:31 + sign_out - 2005-05-26 07:10 + sign_in - 2005-05-26 12:34 + sign_out diff --git a/addons/hr_timesheet/hr_timesheet_demo.xml b/addons/hr_timesheet/hr_timesheet_demo.xml index 1dfecf2f4b0..34f6b7c74a6 100644 --- a/addons/hr_timesheet/hr_timesheet_demo.xml +++ b/addons/hr_timesheet/hr_timesheet_demo.xml @@ -34,7 +34,7 @@ -240.0 - 2005-05-04 + Letters 8.0 @@ -46,7 +46,7 @@ -120.0 - 2005-05-05 + Support by phone 4.0 @@ -58,7 +58,7 @@ -120.0 - 2005-05-05 + Support 4.0 @@ -70,7 +70,7 @@ -240.0 - 2005-05-06 + Repport on this 8.0 @@ -82,7 +82,7 @@ -240.0 - 2005-05-06 + Repport on that 8.0 @@ -94,7 +94,7 @@ -240.0 - 2005-05-07 + Phone support 8.0 @@ -106,8 +106,8 @@ -210.0 - 2005-05-08 Phone support on reporting engine + 7.0 @@ -118,7 +118,7 @@ -210.0 - 2005-05-09 + Quotation 234 done 8.0 @@ -130,7 +130,7 @@ -210.0 - 2005-05-10 + Quotation 356 8.0 diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index fcd32438f0e..7e8be8af06f 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -234,7 +234,7 @@ class hr_timesheet_sheet(osv.osv): } def _default_date_from(self,cr, uid, context={}): user = self.pool.get('res.users').browse(cr, uid, uid, context) - r = user.company_id.timesheet_range + r = user.company_id and user.company_id.timesheet_range or 'month' if r=='month': return time.strftime('%Y-%m-01') elif r=='week': @@ -244,7 +244,7 @@ class hr_timesheet_sheet(osv.osv): return time.strftime('%Y-%m-%d') def _default_date_to(self,cr, uid, context={}): user = self.pool.get('res.users').browse(cr, uid, uid, context) - r = user.company_id.timesheet_range + r = user.company_id and user.company_id.timesheet_range or 'month' if r=='month': return (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d') elif r=='week': diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml index f91d5914a5d..3bd5deae025 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml @@ -4,9 +4,11 @@ Sheet 1 + + diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py index 0e30a39f70f..6cf26e1678c 100644 --- a/addons/profile_service/__terp__.py +++ b/addons/profile_service/__terp__.py @@ -9,7 +9,9 @@ "hr_timesheet_invoice", "hr_timesheet_project", "crm", - "project"], + "project", + "board_project" + ], #"board_project", #"board_account"], "demo_xml":[], diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 1eae3f67d25..642e7c83640 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -17,18 +17,21 @@ 10 Study + Prototype + 264.0 20 Specific Developements + 104.0 30 Install, data import, configuration + @@ -98,10 +101,12 @@ 29 - 48.0 + 24.0 MRP; functionnal layer + done + 30 diff --git a/addons/report_analytic_line/report_account_analytic.planning.csv b/addons/report_analytic_line/report_account_analytic.planning.csv index 7c6b26f4939..b9fe7f56cd6 100644 --- a/addons/report_analytic_line/report_account_analytic.planning.csv +++ b/addons/report_analytic_line/report_account_analytic.planning.csv @@ -1,10 +1,10 @@ -name,date_from,date_to,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id -Planning 2007,2007-01-01,2007-01-31,5.0,Day,admin,Seagate P1,admin -,,,7.0,Day,admin,Seagate P2, -,,,2.0,Day,admin,Sednacom, -,,,3.0,Day,admin,Administratif, -,,,4.0,Day,admin,Commercial & Marketing, -,,,6.0,Day,demo,Seagate P1, -,,,7.0,Day,demo,Seagate P2, -,,,1.0,Day,demo,Camp To Camp, -,,,7.0,Day,demo,Agrolait, +name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id +Planning 2007,5.0,Day,admin,Seagate P1,admin +,7.0,Day,admin,Seagate P2, +,2.0,Day,admin,Sednacom, +,3.0,Day,admin,Administratif, +,4.0,Day,admin,Commercial & Marketing, +,6.0,Day,demo,Seagate P1, +,7.0,Day,demo,Seagate P2, +,1.0,Day,demo,Camp To Camp, +,7.0,Day,demo,Agrolait, diff --git a/addons/report_analytic_line/report_analytic_line_view.xml b/addons/report_analytic_line/report_analytic_line_view.xml index 7fa1cfd1cd2..0c3eb68d333 100644 --- a/addons/report_analytic_line/report_analytic_line_view.xml +++ b/addons/report_analytic_line/report_analytic_line_view.xml @@ -43,7 +43,7 @@ graph - + diff --git a/addons/report_analytic_line/report_analytic_planning.py b/addons/report_analytic_line/report_analytic_planning.py index a0d82784d23..12b76c1206a 100644 --- a/addons/report_analytic_line/report_analytic_planning.py +++ b/addons/report_analytic_line/report_analytic_planning.py @@ -133,8 +133,8 @@ class report_account_analytic_planning_stat(osv.osv): 'manager_id': fields.many2one('res.users', 'Manager'), 'account_id': fields.many2one('account.analytic.account', 'Account', required=True), 'sum_amount': fields.float('Planned Work', required=True), - 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Work made'), - 'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks made'), + 'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'), + 'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'), } _order = 'planning_id,user_id' def init(self, cr): diff --git a/addons/report_analytic_line/report_analytic_planning_view.xml b/addons/report_analytic_line/report_analytic_planning_view.xml index 902601e42e9..0ba5f81c877 100644 --- a/addons/report_analytic_line/report_analytic_planning_view.xml +++ b/addons/report_analytic_line/report_analytic_planning_view.xml @@ -149,7 +149,7 @@ graph - + diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml index 0617ede0891..39008071bf0 100644 --- a/addons/report_crm/report_crm_view.xml +++ b/addons/report_crm/report_crm_view.xml @@ -45,9 +45,10 @@ report.crm.case.user graph - - + + + diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py index e05b4b09dbd..e607dfd3f18 100644 --- a/addons/report_timesheet/report_timesheet.py +++ b/addons/report_timesheet/report_timesheet.py @@ -103,14 +103,14 @@ class report_timesheet_account_date(osv.osv): create or replace view report_timesheet_account_date as ( select min(id) as id, - create_date as name, + date as name, user_id, account_id, sum(unit_amount) as quantity from account_analytic_line group by - create_date, user_id, account_id + date, user_id, account_id ) """) report_timesheet_account_date() diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml index 7e83aca5b0c..5a0d1f1c28d 100644 --- a/addons/report_timesheet/report_timesheet_view.xml +++ b/addons/report_timesheet/report_timesheet_view.xml @@ -12,8 +12,9 @@ graph - + + @@ -58,11 +59,27 @@ action="action_timesheet_user_stat" id="menu_report_timesheet_user"/> + + report_timesheet.account.date.graph + report_timesheet.account.date + graph + + + + + + + + + + + My timesheet of the month - report_timesheet.user + report_timesheet.account.date form graph,tree + [('name','>=',time.strftime('%Y-%m-01')), ('user_id','=',uid)] graph - + @@ -171,15 +188,15 @@ report_timesheet.account.date graph - - + + + - report_timesheet.timesheet.account.date.form report_timesheet.account.date @@ -239,8 +256,9 @@ graph - + +