summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Vora (OpenERP) <jvo@tinyerp.com>2011-05-31 13:28:17 +0530
committerJay Vora (OpenERP) <jvo@tinyerp.com>2011-05-31 13:28:17 +0530
commitb73b2925d13bbab1ca016e4e7b2563dff5b8640c (patch)
treedf57d993a5a5853ea766f75a13787d9bce362c6c
parent24d42c023e020fb4951050d5dfca637cc988ec8a (diff)
[FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot
bzr revid: jvo@tinyerp.com-20110531075817-prizxe0ieeejtlpa
-rw-r--r--addons/hr_payroll/test/payment_advice.yml2
-rw-r--r--addons/hr_payroll/test/payroll_register.yml4
-rw-r--r--addons/hr_payroll/test/payslip.yml2
-rw-r--r--addons/hr_recruitment/test/test_hr_recruitment.yml4
-rw-r--r--addons/membership/test/test_membership.yml4
-rw-r--r--addons/point_of_sale/test/point_of_sale_report.yml2
-rw-r--r--addons/point_of_sale/test/point_of_sale_test.yml2
-rw-r--r--addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml6
8 files changed, 13 insertions, 13 deletions
diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml
index ef600670a48..31b314da5d1 100644
--- a/addons/hr_payroll/test/payment_advice.yml
+++ b/addons/hr_payroll/test/payment_advice.yml
@@ -11,7 +11,7 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_end: !eval "(datetime.now()+timedelta(365)).strftime('%Y-%m-%d')"
date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml
index 4a16dafe6ed..607545ef157 100644
--- a/addons/hr_payroll/test/payroll_register.yml
+++ b/addons/hr_payroll/test/payroll_register.yml
@@ -10,7 +10,7 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_end: !eval "(datetime.now()+timedelta(365)).strftime('%Y-%m-%d')"
date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
@@ -26,7 +26,7 @@
I create a payroll register record.
-
!record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
- date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
+ date: !eval "(datetime.now()+timedelta(1)).strftime('%Y-%m-%d')"
line_ids:
- employee_id: hr_payroll.hr_employee_keith0
name: payroll1
diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml
index 56387ee0a98..95e770d8221 100644
--- a/addons/hr_payroll/test/payslip.yml
+++ b/addons/hr_payroll/test/payslip.yml
@@ -21,7 +21,7 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_end: !eval "(datetime.now()+timedelta(365)).strftime('%Y-%m-%d')"
date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml
index ae322475a62..d1a06e245d9 100644
--- a/addons/hr_recruitment/test/test_hr_recruitment.yml
+++ b/addons/hr_recruitment/test/test_hr_recruitment.yml
@@ -84,8 +84,8 @@
!record {model: crm.meeting, id: crm_meeting_fresher0}:
alarm_id: base_calendar.alarm1
count: 0.0
- date: !eval "'%s-%s-%s 00:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
- date_deadline: !eval "'%s-%s-%s 08:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
+ date: !eval "(datetime.now()+timedelta(1)).strftime('%Y-%m-%d 00:00:00')"
+ date_deadline: !eval "(datetime.now()+timedelta(1)).strftime('%Y-%m-%d 08:00:00')"
day: 0.0
duration: 8.0
name: Fresher
diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml
index 195fbd15b01..a37b6d46c3b 100644
--- a/addons/membership/test/test_membership.yml
+++ b/addons/membership/test/test_membership.yml
@@ -7,7 +7,7 @@
categ_id: product.cat1
membership: 1
membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
- membership_date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)"
+ membership_date_to: !eval "(datetime.now()+timedelta(180)).strftime('%Y-%m-%d')"
name: Golden Membership
type: service
list_price: 80.00
@@ -103,7 +103,7 @@
categ_id: product.cat1
membership: 1
membership_date_from: !eval datetime.today().strftime("%Y-%m-%d")
- membership_date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)"
+ membership_date_to: !eval "(datetime.now()+timedelta(180)).strftime('%Y-%m-%d')"
name: Silver Membership
type: service
list_price: 50.00
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index 323d227f7d2..d543726d843 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -93,7 +93,7 @@
journal_id: account_journal_cash0
line_ids:
- name: statement
- date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+5,datetime.now().day)"
+ date: !eval "(datetime.now()+timedelta(5*365/12)).strftime('%Y-%m-%d')"
type: customer
account_id: account_pos_account_sales
amount: 100
diff --git a/addons/point_of_sale/test/point_of_sale_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml
index c8ed72e386f..09eb1b901df 100644
--- a/addons/point_of_sale/test/point_of_sale_test.yml
+++ b/addons/point_of_sale/test/point_of_sale_test.yml
@@ -290,7 +290,7 @@
!record {model: pos.order, id: pos_order_pos0}:
company_id: base.main_company
date_order: !eval time.strftime('%Y-%m-%d %H:%M:%S')
- date_validity: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)"
+ date_validity: !eval "(datetime.now()+timedelta(180)).strftime('%Y-%m-%d')"
lines:
- company_id: base.main_company
name: Order Line/01
diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 4cf790c4e2b..711ec498d27 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -50,7 +50,7 @@
Create a timesheet sheet for HR manager
-
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
- date_current: !eval time.strftime('%Y-06-%d')
+ date_current: !eval time.strftime('%Y-06-15')
date_from: !eval "'%s-06-01' %(datetime.now().year)"
date_to: !eval "'%s-06-30' %(datetime.now().year)"
name: Sheet for hr manager
@@ -70,7 +70,7 @@
Create a task 'Get all timesheet records'
-
!record {model: project.task, id: project_task_getalltimesheetrecords0}:
- date_start: !eval time.strftime('%Y-06-%d %H:%M:%S')
+ date_start: !eval time.strftime('%Y-06-15 %H:%M:%S')
name: Get all timesheet records
planned_hours: 20.0
project_id: project_project_timesheetmanagement0
@@ -92,7 +92,7 @@
-
!record {model: project.task, id: project_task_getalltimesheetrecords0}:
work_ids:
- - date: !eval time.strftime('%Y-06-%d %H:%M:%S')
+ - date: !eval time.strftime('%Y-06-15 %H:%M:%S')
hours: 10.0
name: Get work calendar of all employees
user_id: res_users_hrmanager0