From 2c9f8e26960a6f1c37e285ac571562a64b9f3260 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Wed, 1 Sep 2010 19:22:31 +0530 Subject: [PATCH 1/3] [FIX] project_retro_planning: When testing project_long_term, a datetime value is passed down to bzr revid: hmo@tinyerp.com-20100901135231-f3w61kmqfey2rwzr --- addons/project_retro_planning/project_retro_planning.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py index fd50fe64e50..d5667145c3d 100644 --- a/addons/project_retro_planning/project_retro_planning.py +++ b/addons/project_retro_planning/project_retro_planning.py @@ -33,7 +33,12 @@ class project_project(osv.osv): if vals.get('date', False): data_project = self.browse(cr, uid, ids) for prj in data_project: - new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3]) + if isinstance(vals['date'], datetime): + new_end_date = vals['date'].date() + elif isinstance(vals['date'], date): + new_end_date = vals['date'] + else: + new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3]) if prj.date: old_end_date = date(*time.strptime(prj.date,'%Y-%m-%d')[:3]) for task in prj.tasks: From cba7507437ef1aabda06e2e6199a55361437d90d Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Wed, 1 Sep 2010 20:01:13 +0530 Subject: [PATCH 2/3] [FIX] project_scrum: project_timesheet demands that a product is attached to employees, but the order of module loading may break scrum's demo data. Use the context bzr revid: hmo@tinyerp.com-20100901143113-dk4gnmhi5s98vg07 --- addons/project_scrum/project_scrum_demo.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml index bc79209b2e0..2c627c89b09 100644 --- a/addons/project_scrum/project_scrum_demo.xml +++ b/addons/project_scrum/project_scrum_demo.xml @@ -231,7 +231,7 @@ Demo :Bugfix - memory leak - + Learn how to migration @@ -239,7 +239,7 @@ Demo :Bugfix - memory leak - + Create a script for migration and testing @@ -247,7 +247,7 @@ Demo :Bugfix - memory leak - + Add on top or bottom and shortcuts From f8396e2c5640461d74f1507e2d720ad571cfc692 Mon Sep 17 00:00:00 2001 From: "Harry (OpenERP)" Date: Wed, 1 Sep 2010 20:37:22 +0530 Subject: [PATCH 3/3] [FIX] hr_expenses: improve check invoice test bzr revid: hmo@tinyerp.com-20100901150722-zl4ij8vaaxeneupd --- addons/hr_expense/test/test_hr_expense.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml index 5fa0175eba1..0ddbf50f053 100644 --- a/addons/hr_expense/test/test_hr_expense.yml +++ b/addons/hr_expense/test/test_hr_expense.yml @@ -93,15 +93,4 @@ - !python {model: hr.expense.expense}: | exp = self.browse(cr, uid, [ref('hr_expense_expense_september0')])[0] - invoice_obj = self.pool.get('account.invoice') - invoice_ids = invoice_obj.search(cr, uid, [('partner_id', '=', exp.employee_id.address_id.partner_id.id)]) - invoice_id = invoice_obj.browse(cr, uid, invoice_ids)[0] - - for invoice in invoice_id.invoice_line: - product = invoice.product_id.id - - for line in exp.line_ids: - product_exp = line.product_id.id - assert product == product_exp - assert exp.id == invoice_id.id - + assert exp.invoice_id, "Invoice should be created"