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"
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:
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