diff --git a/addons/account/project/account.analytic.account.csv b/addons/account/project/account.analytic.account.csv index e69de29bb2d..b74d3556590 100644 --- a/addons/account/project/account.analytic.account.csv +++ b/addons/account/project/account.analytic.account.csv @@ -0,0 +1,40 @@ +name,code,date_start,date,quantity_max,parent_id +Absences,001,,,, +Internal,002,,,, +Our Super Product,100,,,, +Project 1,101,,,, +Project 2,102,,,, +Trainings,004,,,,Internal +In House,001,,,,Trainings +Online,002,,,,Trainings +Support,Support,,,,Our Super Product +Partners,Partners,,,,Support +Customers,Customers,,,,Support +Internal,003,,,,Support +Integration,Integration,,,,Our Super Product +Consultancy,004,,,,Our Super Product +Trainings,005,,,,Our Super Product +Seagate P1,001,,,,Integration +Seagate P2,002,,,,Integration +Magasin BML 1,003,,,,Integration +Camp To Camp,007,2006-08-07,2007-12-31,,Integration +Agrolait,003,,,,Customers +Asustek,004,,,,Customers +DistriPC,007,,,,Customers +Sednacom,002,2005-05-09,2006-05-08,,Partners +Thymbra,003,2006-01-02,2006-07-02,,Partners +Leclerc,010,2006-04-24,2007-04-24,,Partners +Desertic - Hispafuentes,012,2006-02-01,2007-02-01,,Partners +Tiny AT Work,015,,,,Partners +Camp to Camp,021,2006-08-08,2007-08-08,,Partners +Support,001,,,,Project 2 +Development,002,,,,Project 2 +Trainings,001,,,,Project 1 +Development,002,,,,Project 1 +Administratif,001,,,,Internal +Commercial & Marketing,002,,,,Internal +Our Super Product Development,003,,,,Internal +Stable,001,,,,Our Super Product Development +Trunk,002,,,,Our Super Product Development +Paid,001,,,,Absences +Unpaid,002,,,,Absences diff --git a/addons/account/project/project.py b/addons/account/project/project.py index f5eb08b0653..929e40145ee 100644 --- a/addons/account/project/project.py +++ b/addons/account/project/project.py @@ -151,10 +151,10 @@ class account_analytic_account(osv.osv): account = self.search(cr, uid, [('code', '=', name)]+args) if not account: account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args) - newacc = account - while newacc: - newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args) - account+=newacc + newacc = account + while newacc: + newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args) + account+=newacc return self.name_get(cr, uid, account, context=context) account_analytic_account() diff --git a/addons/board/board.py b/addons/board/board.py index 038b5f3e05c..eda4a9228c5 100644 --- a/addons/board/board.py +++ b/addons/board/board.py @@ -62,7 +62,6 @@ class board_note(osv.osv): 'note': fields.text('Note'), 'user_id': fields.many2one('res.users', 'Author', size=64), 'date': fields.date('Date', size=64, required=True), - 'type': fields.char('Note type', size=64), 'type': fields.selection(_type_get, 'Note type', size=64), } _defaults = { diff --git a/addons/board_project/board_project_demo.xml b/addons/board_project/board_project_demo.xml index 411e8d7ee28..3c7dc860bc9 100644 --- a/addons/board_project/board_project_demo.xml +++ b/addons/board_project/board_project_demo.xml @@ -8,7 +8,7 @@ // Demo user startup menu // - Project dashboard + project dashboard ir.ui.menu 3 @@ -18,5 +18,11 @@ + + Don't forget the new development policies. + + Project + + diff --git a/addons/hr_timesheet/hr.analytic.timesheet.csv b/addons/hr_timesheet/hr.analytic.timesheet.csv index e69de29bb2d..33c9df12913 100644 --- a/addons/hr_timesheet/hr.analytic.timesheet.csv +++ b/addons/hr_timesheet/hr.analytic.timesheet.csv @@ -0,0 +1,10 @@ +amount,date,name,unit_amount,account_id,product_id,product_uom_id,user_id,journal_id,general_account_id +-240.0,2007-01-02,Letters,8.0,Administratif,DEV,Hour,admin,Timesheet Journal,% +-120.0,2007-01-03,Support by phone,4.0,Seagate P1,DEV,Hour,admin,Timesheet Journal,% +-120.0,2007-01-03,Support,4.0,Seagate P2,DEV,Hour,admin,Timesheet Journal,% +-240.0,2007-01-04,Repport on this,8.0,Seagate P1,DEV,Hour,admin,Timesheet Journal,% +-240.0,2007-01-05,Repport on that,8.0,Seagate P1,DEV,Hour,admin,Timesheet Journal,% +-240.0,2007-01-08,Phone support,8.0,Sednacom,DEV,Hour,admin,Timesheet Journal,% +-210.0,2007-01-09,Phone support on reporting engine,7.0,Camp To Camp,DEV,Hour,admin,Timesheet Journal,% +-240.0,2007-01-10,Quotation 234 done,8.0,Agrolait,DEV,Hour,demo,Timesheet Journal,% +-240.0,2007-01-11,Quotation 356,8.0,Agrolait,DEV,Hour,admin,Timesheet Journal,% diff --git a/addons/report_analytic/__terp__.py b/addons/report_analytic/__terp__.py index 81a95979544..416fe8a7376 100644 --- a/addons/report_analytic/__terp__.py +++ b/addons/report_analytic/__terp__.py @@ -3,7 +3,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com", - "depends" : ["account"], + "depends" : ["account","hr_timesheet_invoice"], "category" : "Generic Modules/Account", "description": "A module that adds new reports based on analytic accounts.", "init_xml" : [], diff --git a/addons/report_analytic_line/__terp__.py b/addons/report_analytic_line/__terp__.py index 9cce1319ed1..c8e37323bcb 100644 --- a/addons/report_analytic_line/__terp__.py +++ b/addons/report_analytic_line/__terp__.py @@ -7,7 +7,9 @@ "category" : "Generic Modules/Accounting", "description": "A report on analytic lines, costs by products, months and accounts.", "init_xml" : [], - "demo_xml" : [], + "demo_xml" : [ + "report_account_analytic.planning.csv" + ], "update_xml" : [ "report_analytic_line_view.xml", "report_analytic_planning_view.xml",