From 3d7e6eb788e6f20b4f87c243b2f56bbf22011af9 Mon Sep 17 00:00:00 2001 From: mtr Date: Thu, 6 Jan 2011 11:06:08 +0530 Subject: [PATCH] [IMP] account_followup,auction,base_calendar,crm,hr*,idea,lunch:changed static date of 2010 to current date bzr revid: mtr@mtr-20110106053608-whpiu8tu9xkoo1ix --- .../account_followup/test/account_followup.yml | 5 +++-- addons/auction/test/auction_wizard.yml | 16 ++++++++-------- addons/base_calendar/test/base_calendar_test.yml | 12 ++++++------ addons/crm/test/test_crm_meeting.yml | 8 +++++--- .../hr_recruitment/test/test_hr_recruitment.yml | 6 +++--- .../test/test_hr_timesheet_invoice.yml | 2 +- .../test/test_hr_timesheet_sheet.yml | 16 ++++++++-------- addons/idea/test/test_idea.yml | 2 +- addons/lunch/test/test_lunch.yml | 4 ++-- 9 files changed, 37 insertions(+), 34 deletions(-) diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml index 29b5ae70e81..c69fdb112c6 100755 --- a/addons/account_followup/test/account_followup.yml +++ b/addons/account_followup/test/account_followup.yml @@ -66,7 +66,7 @@ I create a send followup record - !record {model: account.followup.print, id: account_followup_print_0}: - date: !eval "'%s-06-08' %(datetime.now().year)" + date: !eval time.strftime('%Y-%m-%d') followup_id: account_followup_followup_testfollowups0 @@ -97,7 +97,8 @@ I clicked on Print Follow Ups to print Followups reports - !python {model: account.followup.print.all}: | + import time self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")], - "tz": False, "date": "2011-06-08", "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"), + "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"), }) diff --git a/addons/auction/test/auction_wizard.yml b/addons/auction/test/auction_wizard.yml index bfe4f353ed5..35ed5766025 100755 --- a/addons/auction/test/auction_wizard.yml +++ b/addons/auction/test/auction_wizard.yml @@ -31,10 +31,10 @@ acc_expense: account.a_pay acc_income: account.a_recv account_analytic_id: account.analytic_root - auction1: '2010-05-24' - auction2: '2010-05-25' - expo1: '2010-05-21' - expo2: '2010-05-22' + auction1: !eval "'%s-05-24' %(datetime.now().year)" + auction2: !eval "'%s-05-25' %(datetime.now().year)" + expo1: !eval "'%s-05-21' %(datetime.now().year)" + expo2: !eval "'%s-05-22' %(datetime.now().year)" journal_id: account.expenses_journal journal_seller_id: account.sales_journal name: Picasso's painting exhibition @@ -42,7 +42,7 @@ An object is being deposited for an auction,I create a seller's deposit record. - !record {model: auction.deposit, id: auction_deposit_ad1}: - date_dep: '2010-05-18' + date_dep: !eval "'%s-05-18' %(datetime.now().year)" method: keep name: AD/007 partner_id: base.res_partner_9 @@ -95,7 +95,7 @@ - !record {model: account.bank.statement, id: account_bank_statement_st0}: balance_end_real: 0.0 - date: '2010-05-19' + date: !eval "'%s-05-19' %(datetime.now().year)" journal_id: account.bank_journal name: St. 05/19 period_id: account.period_5 @@ -132,7 +132,7 @@ - !record {model: auction.lots.make.invoice, id: auction_lots_make_invoice_0}: amount: 3500.0 - number: 2010/002 + number: !eval "'%s/002' %(datetime.now().year)" objects: 1 - I click on the "Create Invoices" button. @@ -154,7 +154,7 @@ !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}: amount: 3500.0 buyer_id: base.res_partner_3 - number: 2010/003 + number: !eval "'%s/003' %(datetime.now().year)" objects: 1 - I click on the "Create Invoices" button. diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index 52888e02688..766d46e0257 100755 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/base_calendar/test/base_calendar_test.yml @@ -3,8 +3,8 @@ - !record {model: calendar.event, id: calendar_event_technicalpresentation0}: class: private - date: '2010-04-30 16:00:00' - date_deadline: '2010-04-30 18:30:00' + date: !eval "'%s-04-30 16:00:00' %(datetime.now().year)" + date_deadline: !eval "'%s-04-30 18:30:00' %(datetime.now().year)" description: The Technical Presentation will cover following topics:\n* Creating OpenERP class\n* Views\n* Wizards\n* Workflows duration: 2.5 @@ -27,16 +27,16 @@ I will search for one of the recurrent event and count the number of events - !python {model: calendar.event}: | - ids = self.search(cr, uid, [('date', '>=', '2010-04-30 16:00:00'), ('date', '<=', '2010-05-31 00:00:00')] ) - assert len(ids) == 10 + ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')] ) + assert len(ids) == 9 - | Now I will make All day event and test it - !record {model: calendar.event, id: calendar_event_alldaytestevent0}: allday: 1 class: confidential - date: '2010-04-30 00:00:00' - date_deadline: '2010-04-30 00:00:00' + date: !eval "'%s-04-30 00:00:00' %(datetime.now().year)" + date_deadline: !eval "'%s-04-30 00:00:00' %(datetime.now().year)" description: 'All day technical test ' location: School name: All day test event diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml index c4fd46c568c..d7c8a4691d6 100755 --- a/addons/crm/test/test_crm_meeting.yml +++ b/addons/crm/test/test_crm_meeting.yml @@ -6,8 +6,8 @@ - !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}: categ_id: crm.categ_meet2 - date: '2010-04-21 16:04:00' - date_deadline: '2010-04-22 00:04:00' + date: !eval time.strftime('%Y-%m-%d 16:04:00') + date_deadline: !eval "'%s-%s-%s 00:04:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)" duration: 8.0 email_from: info@balmerinc.be location: Ahmedabad @@ -55,7 +55,9 @@ I will search for one of the recurrent event and count the number of meeting. - !python {model: crm.meeting}: | - ids = self.search(cr, uid, [('date', '>=', '2010-04-21 00:00:00'), ('date', '<=', '2010-05-21 00:00:00')] ) + import time + from datetime import datetime, date, timedelta + ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')] ) assert len(ids) == 10 - | diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml index 32f49ca4ad5..ae322475a62 100755 --- a/addons/hr_recruitment/test/test_hr_recruitment.yml +++ b/addons/hr_recruitment/test/test_hr_recruitment.yml @@ -63,7 +63,7 @@ - !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}: user_id: base.user_root - deadline: '2010-05-28 11:51:00' + deadline: !eval time.strftime('%Y-%m-%d 11:51:00') note: 'For interview.' category_id: 'crm_case_categ_employee0' @@ -84,8 +84,8 @@ !record {model: crm.meeting, id: crm_meeting_fresher0}: alarm_id: base_calendar.alarm1 count: 0.0 - date: '2010-05-27 00:00:00' - date_deadline: '2010-05-27 08:00:00' + 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)" day: 0.0 duration: 8.0 name: Fresher diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml index 8dee90094ad..d48d045cbeb 100755 --- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml +++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml @@ -7,7 +7,7 @@ account_id: account.analytic_sednacom amount: -1.0 company_id: base.main_company - date: '2010-05-30' + date: !eval time.strftime('%Y-%m-%d') general_account_id: account.a_expense journal_id: hr_timesheet.analytic_journal name: develop yaml for hr module diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index 808045eb677..edab4b2d840 100755 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml @@ -64,10 +64,10 @@ I create my current timesheet for "Mark Johnson". - !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: - date_current: '2010-05-26' - date_from: '2010-05-01' - date_to: '2010-05-31' - name: Week-22(2010) + date_current: !eval "'%s-05-26' %(datetime.now().year)" + date_from: !eval "'%s-05-01' %(datetime.now().year)" + date_to: !eval "'%s-05-31' %(datetime.now().year)" + name: !eval "'Week-22(%s)' %(datetime.now().year)" state: new user_id: base.user_root employee_id: 'hr_employee_employee0' @@ -77,7 +77,7 @@ !record {model: hr.attendance, id: hr_attendance_0}: action: sign_in employee_id: 'hr_employee_employee0' - name: '2010-05-26 10:08:08' + name: !eval "'%s-05-26 10:08:08' %(datetime.now().year)" - At the time of logout, I create attendance and perform "Sign Out". @@ -85,7 +85,7 @@ !record {model: hr.attendance, id: hr_attendance_1}: action: sign_out employee_id: 'hr_employee_employee0' - name: '2010-05-26 15:10:55' + name: !eval "'%s-05-26 15:10:55' %(datetime.now().year)" - I create Timesheet Entry for time spend on today work. @@ -94,7 +94,7 @@ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: timesheet_ids: - account_id: account.analytic_sednacom - date: '2010-05-26' + date: !eval "'%s-05-26' %(datetime.now().year)" name: 'Develop yaml for hr module' unit_amount: 3.00 amount: -90.00 @@ -125,7 +125,7 @@ !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: timesheet_ids: - account_id: account.analytic_sednacom - date: '2010-05-26' + date: !eval "'%s-05-26' %(datetime.now().year)" name: 'Develop yaml for hr module' unit_amount: 2.0 amount: -90.00 diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml index 4f6ea4bd568..402f93f4817 100755 --- a/addons/idea/test/test_idea.yml +++ b/addons/idea/test/test_idea.yml @@ -11,7 +11,7 @@ - !record {model: idea.idea, id: idea_idea_0}: category_id: idea_category_technical0 - created_date: '2010-05-13 19:16:26' + created_date: !eval time.strftime('%Y-%m-%d %H:%M:%S') description: I want that Technical presentation are arranged for 1 hours in every day.\nso, on that presentation, we can know all things what improvement and development are done in our company.\n\n\n\n\n diff --git a/addons/lunch/test/test_lunch.yml b/addons/lunch/test/test_lunch.yml index 3183764d927..0b5e756f8b3 100755 --- a/addons/lunch/test/test_lunch.yml +++ b/addons/lunch/test/test_lunch.yml @@ -27,7 +27,7 @@ When I select the product "club1", the price of 2.75 is automatically proposed - !record {model: lunch.order, id: lunch_order_0}: - date: '2010-04-19' + date: !eval time.strftime('%Y-%m-%d') product: 'lunch_product_club1' price: 2.75 user_id: base.user_root @@ -66,7 +66,7 @@ I create a new lunch order "LU002" for the "Club1" product, at another date. - !record {model: lunch.order, id: lunch_order_1}: - date: '2010-04-22' + date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+2)" product: 'lunch_product_club1' price: 2.75 user_id: base.user_root