openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01967
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
mtr(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#600547 Invoice totals not updated when a line is moved (store={...} bug?)
https://bugs.launchpad.net/bugs/600547
#690895 copy account.move crash
https://bugs.launchpad.net/bugs/690895
#694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
https://bugs.launchpad.net/bugs/694144
#695632 [RC1]Two same fields creating problem in web-client
https://bugs.launchpad.net/bugs/695632
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/45328
Hello sir,
Improved yml,changed static date of 2010 to current date in the account*,auction,base_calendar,crm*,hr*,delivery,event,idea,lunch module.
Thanks
mtr
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/45328
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'account/test/account_bank_statement.yml'
--- account/test/account_bank_statement.yml 2010-12-30 09:58:09 +0000
+++ account/test/account_bank_statement.yml 2011-01-06 06:38:56 +0000
@@ -6,14 +6,14 @@
!record {model: account.bank.statement, id: account_bank_statement_0}:
balance_end_real: 0.0
balance_start: 0.0
- date: '2010-10-14'
+ date: !eval time.strftime('%Y-%m-%d')
journal_id: account.bank_journal
name: /
period_id: account.period_10
line_ids:
- account_id: account.a_recv
amount: 1000.0
- date: '2010-10-14'
+ date: !eval time.strftime('%Y-%m-%d')
name: a
partner_id: base.res_partner_4
sequence: 0.0
=== modified file 'account/test/account_cash_statement.yml'
--- account/test/account_cash_statement.yml 2010-12-30 09:58:09 +0000
+++ account/test/account_cash_statement.yml 2011-01-06 06:38:56 +0000
@@ -2,7 +2,7 @@
In order to test Cash statement I create a Cash statement and confirm it and check it's move created
-
!record {model: account.bank.statement, id: account_bank_statement_1}:
- date: '2010-10-16'
+ date: !eval time.strftime('%Y-%m-%d')
journal_id: account.cash_journal
name: /
period_id: account.period_10
@@ -41,7 +41,7 @@
line_ids:
- account_id: account.a_recv
amount: 1000.0
- date: '2010-10-16'
+ date: !eval time.strftime('%Y-%m-%d')
name: test
partner_id: base.res_partner_4
sequence: 0.0
=== modified file 'account/test/account_customer_invoice.yml'
--- account/test/account_customer_invoice.yml 2010-12-30 09:58:09 +0000
+++ account/test/account_customer_invoice.yml 2011-01-06 06:38:56 +0000
@@ -7,7 +7,7 @@
address_invoice_id: base.res_partner_address_zen
company_id: base.main_company
currency_id: base.EUR
- date_invoice: '2010-05-26'
+ date_invoice: !eval time.strftime('%Y-%m-%d')
invoice_line:
- account_id: account.a_sale
name: '[PC3] Medium PC'
=== modified file 'account/test/account_period_close.yml'
--- account/test/account_period_close.yml 2010-12-30 09:58:09 +0000
+++ account/test/account_period_close.yml 2011-01-06 06:38:56 +0000
@@ -4,10 +4,10 @@
-
!record {model: account.period, id: account_period_jan0}:
company_id: base.main_company
- date_start: '2010-01-01'
- date_stop: '2010-01-31'
+ date_start: !eval "'%s-01-01' %(datetime.now().year)"
+ date_stop: !eval "'%s-01-31' %(datetime.now().year)"
fiscalyear_id: account.data_fiscalyear
- name: Jan-2010
+ name: !eval "'Jan-%s' %(datetime.now().year)"
special: 1
-
@@ -16,7 +16,7 @@
!assert {model: account.period, id: account_period_jan0, string: Period is in Draft state}:
- state == 'draft'
-
- I use "Close a Period" wizard to close period Jan-2010
+ I use "Close a Period" wizard to close period
-
!record {model: account.period.close, id: account_period_close_0}:
sure: 1
=== modified file 'account/test/account_validate_account_move.yml'
--- account/test/account_validate_account_move.yml 2010-12-30 09:58:09 +0000
+++ account/test/account_validate_account_move.yml 2011-01-06 06:38:56 +0000
@@ -8,36 +8,36 @@
In order to test the 'Post Journal Entries' wizard in OpenERP, I created an account move
-
!record {model: account.move, id: account_move_0}:
- date: '2010-06-07'
+ date: !eval time.strftime('%Y-%m-%d')
journal_id: account.bank_journal
line_id:
- account_id: account.cash
amount_currency: 0.0
credit: 2000.0
- date: '2010-06-07'
+ date: !eval time.strftime('%Y-%m-%d')
debit: 0.0
journal_id: account.bank_journal
name: Basic Computer
partner_id: base.res_partner_desertic_hispafuentes
period_id: account.period_6
- ref: '2010010'
+ ref: '2011010'
tax_amount: 0.0
- journal_id: account.bank_journal
period_id: account.period_6
- ref: '2010010'
+ ref: '2011010'
tax_code_id: account_tax_code_0
tax_amount: 0.0
account_id: account.a_recv
amount_currency: 0.0
credit: 0.0
- date: '2010-06-07'
+ date: !eval time.strftime('%Y-%m-%d')
debit: 2000.0
name: Basic Computer
partner_id: base.res_partner_desertic_hispafuentes
quantity: 0.0
name: /
period_id: account.period_6
- ref: '2010010'
+ ref: '2011010'
state: draft
-
=== modified file 'account/test/chart_of_account.yml'
--- account/test/chart_of_account.yml 2010-12-30 09:58:09 +0000
+++ account/test/chart_of_account.yml 2011-01-06 06:38:56 +0000
@@ -43,8 +43,8 @@
-
!record {model: account.analytic.chart, id: account_analytic_chart_0}:
- from_date: '2010-01-01'
- to_date: '2010-06-30'
+ from_date: !eval "'%s-01-01' %(datetime.now().year)"
+ to_date: !eval "'%s-06-30' %(datetime.now().year)"
-
I clicked on Open chart Button to open the charts
=== modified file 'account_budget/test/account_budget.yml'
--- account_budget/test/account_budget.yml 2010-12-30 09:58:09 +0000
+++ account_budget/test/account_budget.yml 2011-01-06 06:38:56 +0000
@@ -5,9 +5,9 @@
-
!record {model: crossovered.budget, id: crossovered_budget_budget0}:
code: B2011
- date_from: '2011-01-01'
- date_to: '2011-12-31'
- name: Budget 2011
+ date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
+ date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
+ name: !eval "'Budget %s' %(datetime.now().year+1)"
state: draft
-
I created two different budget lines
@@ -17,13 +17,13 @@
!record {model: crossovered.budget, id: crossovered_budget_budget0}:
crossovered_budget_line:
- analytic_account_id: account.analytic_consultancy
- date_from: '2011-01-01'
- date_to: '2011-12-31'
+ date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
+ date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
general_budget_id: account_budget.account_budget_post_purchase0
planned_amount: 10000.0
- analytic_account_id: account.analytic_super_product_trainings
- date_from: '2011-09-01'
- date_to: '2011-09-30'
+ date_from: !eval "'%s-09-01' %(datetime.now().year+1)"
+ date_to: !eval "'%s-09-30' %(datetime.now().year+1)"
general_budget_id: account_budget.account_budget_post_sales0
planned_amount: 400000.0
=== modified file 'account_followup/test/account_followup.yml'
--- account_followup/test/account_followup.yml 2010-12-30 09:58:09 +0000
+++ account_followup/test/account_followup.yml 2011-01-06 06:38:56 +0000
@@ -66,7 +66,7 @@
I create a send followup record
-
!record {model: account.followup.print, id: account_followup_print_0}:
- date: '2010-06-08'
+ 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": "2010-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"),
})
=== modified file 'account_payment/test/account_payment.yml'
--- account_payment/test/account_payment.yml 2010-12-30 09:58:09 +0000
+++ account_payment/test/account_payment.yml 2011-01-06 06:38:56 +0000
@@ -60,7 +60,7 @@
!record {model: payment.order, id: payment_order_0}:
date_prefered: due
mode: payment_mode_m0
- reference: 2010/006
+ reference: !eval "'%s/006' %(datetime.now().year)"
user_id: base.user_root
@@ -68,7 +68,7 @@
Creating a payment.order.create record
-
!record {model: payment.order.create, id: payment_order_create_0}:
- duedate: '2010-06-04'
+ duedate: !eval time.strftime('%Y-%m-%d')
-
I searched the entries using "Payment Create Order" wizard
=== modified file 'auction/test/auction.yml'
--- auction/test/auction.yml 2010-12-30 09:58:09 +0000
+++ auction/test/auction.yml 2011-01-06 06:38:56 +0000
@@ -122,10 +122,10 @@
acc_expense: account.a_pay
acc_income: account.a_recv
account_analytic_id: account.analytic_root
- auction1: '2010-08-01'
- auction2: '2010-08-31'
- expo1: '2010-08-01'
- expo2: '2010-08-31'
+ auction1: !eval "'%s-08-01' %(datetime.now().year)"
+ auction2: !eval "'%s-08-31' %(datetime.now().year)"
+ expo1: !eval "'%s-08-01' %(datetime.now().year)"
+ expo2: !eval "'%s-08-31' %(datetime.now().year)"
journal_id: account.expenses_journal
journal_seller_id: account.sales_journal
name: Antique furniture exhibition
@@ -137,7 +137,7 @@
An object is being deposited for an auction,I create a seller's deposit record with deposit cost.
-
!record {model: auction.deposit, id: auction_deposit_ad0}:
- date_dep: '2010-08-01'
+ date_dep: !eval "'%s-08-01' %(datetime.now().year)"
method: keep
name: AD/006
partner_id: res_partner_mrpinakin0
@@ -251,7 +251,7 @@
!record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
amount: 3090.0
buyer_id: res_partner_mrkjohnson0
- number: 2010/003
+ number: !eval "'%s/003' %(datetime.now().year)"
objects: 1
-
I click on the "Create Invoices" button.
=== modified file 'auction/test/auction_wizard.yml'
--- auction/test/auction_wizard.yml 2010-12-30 09:58:09 +0000
+++ auction/test/auction_wizard.yml 2011-01-06 06:38:56 +0000
@@ -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.
=== modified file 'base_calendar/test/base_calendar_test.yml'
--- base_calendar/test/base_calendar_test.yml 2010-12-30 09:58:09 +0000
+++ base_calendar/test/base_calendar_test.yml 2011-01-06 06:38:56 +0000
@@ -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
=== modified file 'crm/test/test_crm_meeting.yml'
--- crm/test/test_crm_meeting.yml 2010-12-30 09:58:09 +0000
+++ crm/test/test_crm_meeting.yml 2011-01-06 06:38:56 +0000
@@ -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@xxxxxxxxxxxx
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
- |
=== modified file 'crm/test/test_crm_opportunity.yml'
--- crm/test/test_crm_opportunity.yml 2011-01-03 09:08:25 +0000
+++ crm/test/test_crm_opportunity.yml 2011-01-06 06:38:56 +0000
@@ -36,8 +36,8 @@
I fill proper data for that meeting and save it
-
!record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
- date: '2010-04-16 00:00:00'
- date_deadline: '2010-04-16 08:00:00'
+ date: !eval time.strftime('%Y-%m-%d 00:00:00')
+ date_deadline: !eval time.strftime('%Y-%m-%d 08:00:00')
duration: 8.0
email_from: info@xxxxxxxxxxxx
name: 'ABC FUEL CO 829264 - 10002 units'
@@ -51,7 +51,7 @@
I click on "schedule call" button and select planned date for the call.
-
!record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
- date: '2010-04-17 11:15:00'
+ date: !eval "'%s-%s-%s 11:15:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
name: 'ABC FUEL CO 829264 - 10002 units'
section_id: crm.section_sales_department
user_id: base.user_demo
@@ -72,7 +72,7 @@
I can see phonecall record after click on "Schedule call" wizard.
-
!record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
- date: '2010-04-17 11:15:00'
+ date: !eval "'%s-%s-%s 11:15:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
duration: 3.0
name: 'ABC FUEL CO 829264 - 10002 units'
partner_address_id: base.res_partner_address_1
=== modified file 'crm/test/test_crm_phonecall.yml'
--- crm/test/test_crm_phonecall.yml 2011-01-03 09:08:25 +0000
+++ crm/test/test_crm_phonecall.yml 2011-01-06 06:38:56 +0000
@@ -2,8 +2,9 @@
I start by creating a new phonecall.
-
!record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
- date: '2010-04-21 18:59:00'
+ date: !eval time.strftime('%Y-%m-%d 08:00:00')
name: Interview call
+ duration: 2.0
section_id: crm.section_sales_department
-
Now , I select partner by click on "Create a Partner" button.
@@ -63,8 +64,8 @@
-
!record {model: crm.meeting, id: crm_meeting_interviewcall0}:
alarm_id: base_calendar.alarm3
- date: '2010-04-20 00:00:00'
- date_deadline: '2010-04-20 08:00:00'
+ date: !eval "'%s-%s-%s 09:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
+ date_deadline: !eval "'%s-%s-%s 17:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
duration: 8.0
email_from: info@xxxxxxxxxxxx
name: Interview call
@@ -80,7 +81,7 @@
phonecall.
-
!record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
- date: '2010-04-21 19:49:00'
+ date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
name: Interview call
section_id: crm.section_sales_department
user_id: base.user_root
=== modified file 'crm_claim/test/test_crm_claim.yml'
--- crm_claim/test/test_crm_claim.yml 2010-12-30 09:58:09 +0000
+++ crm_claim/test/test_crm_claim.yml 2011-01-06 06:38:56 +0000
@@ -7,7 +7,7 @@
-
!record {model: crm.claim, id: crm_claim_damagedproduct0}:
categ_id: crm_claim.categ_claim2
- date: '2010-04-21 20:13:00'
+ date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
email_from: info@xxxxxxxxxxxx
name: 'Damaged product '
partner_address_id: base.res_partner_address_1
=== modified file 'crm_helpdesk/test/test_crm_helpdesk.yml'
--- crm_helpdesk/test/test_crm_helpdesk.yml 2010-12-30 09:58:09 +0000
+++ crm_helpdesk/test/test_crm_helpdesk.yml 2011-01-06 06:38:56 +0000
@@ -4,7 +4,7 @@
I select Date at which helpdesk request is created.
-
!record {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}:
- date: '2010-04-22 10:17:00'
+ date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
email_from: info@xxxxxxxxxxxx
name: Some functional question.
partner_address_id: base.res_partner_address_1
=== modified file 'delivery/test/delivery_report.yml'
--- delivery/test/delivery_report.yml 2010-12-30 09:58:09 +0000
+++ delivery/test/delivery_report.yml 2011-01-06 06:38:56 +0000
@@ -8,18 +8,18 @@
origin: SO001
address_id: base.res_partner_address_4
company_id: base.main_company
- date: '2010-05-11 15:18:52'
+ date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
invoice_state: none
move_lines:
- company_id: base.main_company
- date: '2010-05-11 15:18:57'
+ date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
location_dest_id: stock.stock_location_customers
location_id: stock.stock_location_stock
name: HP CD writers
product_id: product.product_product_pc1
product_qty: 3.0
product_uom: product.product_uom_unit
- date: '2010-05-11 15:18:57'
+ date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
product_uos_qty: 3.0
move_type: direct
type: out
=== modified file 'event/test/test_event.yml'
--- event/test/test_event.yml 2010-12-30 09:58:09 +0000
+++ event/test/test_event.yml 2011-01-06 06:38:56 +0000
@@ -18,8 +18,8 @@
I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month.
-
!record {model: event.event, id: event_event_conference0}:
- date_begin: 2010-08-01
- date_end: 2010-08-10
+ date_begin: !eval time.strftime('%Y-%m-01')
+ date_end: !eval time.strftime('%Y-%m-10')
name: Conference on OpenERP Business.
product_id: 'product_product_ticketforconcert0'
type: 'event_type_conference0'
=== modified file 'hr_attendance/test/test_hr_attendance.yml'
--- hr_attendance/test/test_hr_attendance.yml 2010-12-30 09:58:09 +0000
+++ hr_attendance/test/test_hr_attendance.yml 2011-01-06 06:38:56 +0000
@@ -30,7 +30,7 @@
action: sign_in
action_desc: 'hr_action_reason_login0'
employee_id: 'hr_employee_employee0'
- name: '2010-05-18 19:08:08'
+ name: !eval "'%s-01-01 19:08:08' %(datetime.now().year)"
-
I check that Employee state is "Present".
-
@@ -43,7 +43,7 @@
!record {model: hr.attendance, id: hr_attendance_1}:
action: sign_out
employee_id: 'hr_employee_employee0'
- name: '2010-05-18 19:10:55'
+ name: !eval "'%s-01-01 19:10:55' %(datetime.now().year)"
-
I check that Employee state is Absent.
-
=== modified file 'hr_contract/test/test_hr_contract.yml'
--- hr_contract/test/test_hr_contract.yml 2010-12-30 09:58:09 +0000
+++ hr_contract/test/test_hr_contract.yml 2011-01-06 06:38:56 +0000
@@ -39,10 +39,10 @@
advantages_gross: 0.0
employee_id: 'hr_employee_employee0'
advantages_net: 0.0
- date_end: '2011-05-18'
- date_start: '2010-05-18'
- trial_date_end: '2010-03-01'
- trial_date_start: '2010-04-30'
+ date_end: !eval "'%s-05-18' %(datetime.now().year+1)"
+ date_start: !eval "'%s-05-18' %(datetime.now().year)"
+ trial_date_end: !eval "'%s-03-01' %(datetime.now().year)"
+ trial_date_start: !eval "'%s-04-30' %(datetime.now().year)"
name: contract1
wage: 1.0
wage_type_id: hr_contract_wage_type_monthlygrosswage0
=== modified file 'hr_evaluation/test/test_hr_evaluation.yml'
--- hr_evaluation/test/test_hr_evaluation.yml 2010-12-30 09:58:09 +0000
+++ hr_evaluation/test/test_hr_evaluation.yml 2011-01-06 06:38:56 +0000
@@ -101,7 +101,7 @@
I create an Evaluation for employee under "Manager Evaluation Plan".
-
!record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
- date: '2010-06-28'
+ date: !eval time.strftime('%Y-%m-%d')
employee_id: 'hr_employee_employee1'
plan_id: 'hr_evaluation_plan_managersplan0'
progress: 0.0
@@ -110,7 +110,7 @@
I create an Interview Request record
-
!record {model: hr.evaluation.interview, id: hr_evaluation_interview_0}:
- date_deadline: '2010-06-28'
+ date_deadline: !eval time.strftime('%Y-%m-%d')
evaluation_id: 'hr_evaluation_evaluation_0'
survey_id: hr_evaluation.survey_0
-
=== modified file 'hr_expense/test/test_hr_expense.yml'
--- hr_expense/test/test_hr_expense.yml 2010-12-30 09:58:09 +0000
+++ hr_expense/test/test_hr_expense.yml 2011-01-06 06:38:56 +0000
@@ -47,11 +47,11 @@
!record {model: hr.expense.expense, id: hr_expense_expense_september0}:
company_id: base.main_company
currency_id: base.EUR
- date: '2010-05-05'
+ date: !eval "'%s-05-05' %(datetime.now().year)"
employee_id: hr.employee1
name: September Expenses
line_ids:
- - date_value: '2010-05-27'
+ - date_value: !eval "'%s-05-27' %(datetime.now().year)"
name: Travel
product_id: 'product_product_travel0'
sequence: 0.0
=== modified file 'hr_holidays/test/test_hr_holiday.yml'
--- hr_holidays/test/test_hr_holiday.yml 2010-12-30 09:58:09 +0000
+++ hr_holidays/test/test_hr_holiday.yml 2011-01-06 06:38:56 +0000
@@ -46,8 +46,8 @@
holiday_status_id: hr_holidays_status_sick0
name: Sick Leaves for Phil Graves
number_of_days_temp: 12.0
- date_from: '2010-05-20 13:59:00'
- date_to: '2010-05-22 13:59:00'
+ date_from: !eval "'%s-05-20 13:59:00' %(datetime.now().year)"
+ date_to: !eval "'%s-05-22 13:59:00' %(datetime.now().year)"
type: add
-
I confirmed the allocation by clicking on "Confirm" button.
@@ -63,8 +63,8 @@
I connect as "test_holiday_user1", and create a new leave request for employee "Phil Graves".
-
!record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
- date_from: '2010-05-20 11:48:00'
- date_to: '2010-05-21 11:48:00'
+ date_from: !eval "'%s-05-20 11:48:00' %(datetime.now().year)"
+ date_to: !eval "'%s-05-21 11:48:00' %(datetime.now().year)"
employee_id: 'hr_employee_philgraves0'
holiday_status_id: 'hr_holidays_status_sick0'
name: Appointment with Doctor
=== modified file 'hr_payroll/test/payment_advice.yml'
--- hr_payroll/test/payment_advice.yml 2010-12-30 09:58:09 +0000
+++ hr_payroll/test/payment_advice.yml 2011-01-06 06:38:56 +0000
@@ -11,8 +11,8 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: '2011-07-01'
- date_start: '2010-07-01'
+ date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
=== modified file 'hr_payroll/test/payroll_register.yml'
--- hr_payroll/test/payroll_register.yml 2010-12-30 09:58:09 +0000
+++ hr_payroll/test/payroll_register.yml 2011-01-06 06:38:56 +0000
@@ -10,8 +10,8 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: '2011-07-01'
- date_start: '2010-07-01'
+ date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
@@ -26,7 +26,7 @@
I create a payroll register record.
-
!record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
- date: '2010-07-02'
+ date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
line_ids:
- employee_id: hr_payroll.hr_employee_keith0
name: payroll1
=== modified file 'hr_payroll/test/payslip.yml'
--- hr_payroll/test/payslip.yml 2010-12-30 09:58:09 +0000
+++ hr_payroll/test/payslip.yml 2011-01-06 06:38:56 +0000
@@ -21,8 +21,8 @@
contract_ids:
- advantages_gross: 0.0
advantages_net: 0.0
- date_end: '2011-07-01'
- date_start: '2010-07-01'
+ date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
+ date_start: !eval time.strftime('%Y-%m-%d')
name: reference
wage: 5000.0
wage_type_id: hr_contract.hr_contract_monthly_gross
=== modified file 'hr_recruitment/test/test_hr_recruitment.yml'
--- hr_recruitment/test/test_hr_recruitment.yml 2010-12-30 09:58:09 +0000
+++ hr_recruitment/test/test_hr_recruitment.yml 2011-01-06 06:38:56 +0000
@@ -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
=== modified file 'hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml'
--- hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml 2010-12-30 09:58:09 +0000
+++ hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml 2011-01-06 06:38:56 +0000
@@ -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
=== modified file 'hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml'
--- hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml 2010-12-30 09:58:09 +0000
+++ hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml 2011-01-06 06:38:56 +0000
@@ -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
=== modified file 'idea/test/test_idea.yml'
--- idea/test/test_idea.yml 2010-12-30 09:58:09 +0000
+++ idea/test/test_idea.yml 2011-01-06 06:38:56 +0000
@@ -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
=== modified file 'lunch/test/test_lunch.yml'
--- lunch/test/test_lunch.yml 2010-12-30 09:58:09 +0000
+++ lunch/test/test_lunch.yml 2011-01-06 06:38:56 +0000
@@ -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
Follow ups
