-
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 99705b07a39..070079a4b80 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,7 +13,7 @@
product_id: product.product_product_consultant
journal_id: hr_timesheet.analytic_journal
-
- I create my current timesheet for employee "Quentin Paolinon".
+ I create a timesheet for employee "Quentin Paolinon".
-
!record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
date_current: !eval time.strftime('%Y-%m-%d')
@@ -23,13 +23,17 @@
user_id: base.user_demo
employee_id: 'hr.employee_qdp'
-
- Now, at the time of login, I create Attendances and perform "Sign In" action.
+ Quentin "Sign In" at around 9am.
-
- !python {model: hr_timesheet_sheet.sheet}: |
- self.attendance_action_change(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
- task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0]
- task_ids = self.browse(cr, uid, task_work, context)
- assert task_ids.state == "draft", "I State In Timesheet"
+ !record {model: hr.attendance, id: hr_attendance_1}:
+ action: sign_in
+ employee_id: 'hr.employee_qdp'
+ name: !eval datetime.now().strftime('%Y-%m-%d 09:%M:%S')
+-
+ I test that Quentin in signed in
+-
+ !assert {model: hr.employee, id: hr.employee_qdp}:
+ - state == 'present'
-
I want to check attendance and work of yesterday. I click on <- button.
-
@@ -57,10 +61,10 @@
-
At the time of logout, I create attendance and perform "Sign Out".
-
- !record {model: hr.attendance, id: hr_attendance_1}:
+ !record {model: hr.attendance, id: hr_attendance_2}:
action: sign_out
employee_id: 'hr.employee_qdp'
- name: !eval (datetime.now() + timedelta(minutes=1)).strftime('%Y-%m-%d %H:%M:%S')
+ name: !eval datetime.now().strftime('%Y-%m-%d 17:30:00')
-
I create Timesheet Entry for time spend on today work.
-
@@ -103,10 +107,10 @@
general_account_id: account.a_expense
journal_id: hr_timesheet.analytic_journal
-
- I set an allowed difference of 25 hours
+ I set an allowed difference of 1 hour
-
!record {model: res.company, id: base.main_company}:
- timesheet_max_difference: 25.00
+ timesheet_max_difference: 1.00
-
I tried again to confirm the timesheet after modification.
-
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index bd1448b802c..f27b76a5bca 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -27,7 +27,7 @@ This is the base module to manage the accounting chart for Ecuador in OpenERP.
Accounting chart and localization for Ecuador.
""",
- 'author': 'OpenERP SA',
+ 'author': 'Gnuthink Co.Ltd.',
'depends': [
'account',
'base_vat',
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index da517ee17ad..b384613d174 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -25,6 +25,7 @@ import mail_message
import mail_mail
import mail_thread
import mail_group
+import mail_vote
import res_partner
import res_users
import report
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 53720926a5c..11d0ee7d04b 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -7,7 +7,7 @@
+ When you sell this product, OpenERP will trigger a manufacturing + order using the bill of materials assigned to this product. + The delivery order will be ready once the production is done. +
+