pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20100901151029-ic277wewop2emqsv
This commit is contained in:
Fabien Pinckaers
2010-09-01 17:10:29 +02:00
parent a24ee7bc78 f8396e2c56
commit 2c15f39167
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_expense/test/test_hr_expense.yml
+1 -12
View File
@@ -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"
addons/project_retro_planning/project_retro_planning.py
+6 -1
View File
@@ -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:
addons/project_scrum/project_scrum_demo.xml
+3 -3
View File
@@ -231,7 +231,7 @@ Demo :Bugfix - memory leak
<field name="sprint_id" ref="scrum_sprint_0"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
</record>
<record id="project_task_work_scrum_task1" model="project.task.work">
<record id="project_task_work_scrum_task1" model="project.task.work" context="{'withoutemployee': True }">
<field name="user_id" ref="base.user_root"/>
<field name="name">Learn how to migration</field>
<field name="task_id" ref="scrum_task_6"/>
@@ -239,7 +239,7 @@ Demo :Bugfix - memory leak
<field eval="1.0" name="hours"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
</record>
<record id="project_task_work_scrum_task2" model="project.task.work">
<record id="project_task_work_scrum_task2" model="project.task.work" context="{'withoutemployee': True }">
<field name="user_id" ref="base.user_root"/>
<field name="name">Create a script for migration and testing</field>
<field name="task_id" ref="scrum_task_6"/>
@@ -247,7 +247,7 @@ Demo :Bugfix - memory leak
<field eval="5.0" name="hours"/>
<field eval="time.strftime('%Y-%m-%d')" name="date"/>
</record>
<record id="project_task_work_scrum_task3" model="project.task.work">
<record id="project_task_work_scrum_task3" model="project.task.work" context="{'withoutemployee': True }">
<field name="user_id" ref="base.user_root"/>
<field name="name">Add on top or bottom and shortcuts</field>
<field name="task_id" ref="scrum_task_17"/>