diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py index 72afeadf6c0..ffda270ae19 100644 --- a/addons/profile_service/__terp__.py +++ b/addons/profile_service/__terp__.py @@ -3,7 +3,15 @@ "version":"1.0", "author":"Tiny", "category":"Profile", - "depends":["base", "hr", "hr_timesheet", "hr_timesheet_invoice", "hr_timesheet_project", "crm", "project"], + "depends":[ + "hr", + "hr_timesheet", + "hr_timesheet_invoice", + "hr_timesheet_project", + "crm", + "project", + "board_project", + "board_account"], "demo_xml":[], "update_xml":[], "active":False, diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml index 50228a96140..1eae3f67d25 100644 --- a/addons/project/project_demo.xml +++ b/addons/project/project_demo.xml @@ -63,6 +63,7 @@ Internal testing + Software Install + 2007-06-06 17 @@ -158,6 +159,7 @@ In house trainings + 2007-06-06 50 diff --git a/addons/report_analytic_line/report_account_analytic.planning.csv b/addons/report_analytic_line/report_account_analytic.planning.csv new file mode 100644 index 00000000000..7c6b26f4939 --- /dev/null +++ b/addons/report_analytic_line/report_account_analytic.planning.csv @@ -0,0 +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, diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py index d6598cb602f..1216726dbe3 100644 --- a/addons/report_timesheet/report_timesheet.py +++ b/addons/report_timesheet/report_timesheet.py @@ -93,13 +93,13 @@ class report_timesheet_invoice(osv.osv): _auto = False _columns = { 'user_id':fields.many2one('res.users', 'User', readonly=True, relate=True), - 'project_id':fields.many2one('res.users', 'User', readonly=True, relate=True), - 'manager_id':fields.many2one('res.users', 'User', readonly=True, relate=True), + 'project_id':fields.many2one('res.users', 'Project', readonly=True, relate=True), + 'manager_id':fields.many2one('res.users', 'Manager', readonly=True, relate=True), 'quantity': fields.float('Quantity', readonly=True), 'amount_invoice': fields.float('To invoice', readonly=True) } _rec_name = 'user_id' - _order = 'name desc,user_id desc' + _order = 'user_id desc' def init(self, cr): cr.execute(""" create or replace view report_timesheet_invoice as (