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

[FIX] hr: employee data and demo data

Browse Source 
addendum to commit da6b9d1be443999028f021ff81b4cf128a4eaaa2
- better employee name and image for default employee in data (xml-id: hr.employee_root)
- in demo data hr.employee_fp renamed to hr.employee_root to not have 2 employees linked to the root user
- renamed all occurences of employee_fp to employee_root
This commit is contained in:
Denis Vermylen (dve)
2016-07-04 17:19:23 +02:00
parent 91a2881ca1
commit 0ea478652a
9 changed files with 44 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/data/hr_data.xml
+3 -3
View File
@@ -21,12 +21,12 @@ Leave Management (keep track of employee leaves), Expense Management (manage emp
<field name="name">Sales</field>
</record>
<record id="employee_fp" model="hr.employee">
<field name="name">Pieter Parker</field>
<record id="employee_root" model="hr.employee">
<field name="name" eval="obj(ref('base.partner_root')).name" model="res.partner"/>
<field name="user_id" ref="base.user_root"/>
<field name="address_id" ref="base.partner_root"/>
<field name="address_home_id" ref="base.partner_root"/>
<field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
<field name="image" eval="obj(ref('base.partner_root')).image" model="res.partner"/>
</record>
</data>
addons/hr/data/hr_demo.xml
+7 -5
View File
@@ -135,7 +135,8 @@ If you have development competencies, we can propose you specific traineeships</
<!--Employees-->
<record id="employee_fp" model="hr.employee">
<record id="employee_root" model="hr.employee">
<field name="name">Pieter Parker</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="work_location">Building 1, Second Floor</field>
<field name="work_phone">+3281813700</field>
@@ -143,6 +144,7 @@ If you have development competencies, we can propose you specific traineeships</
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_3')])]"/>
<field name="job_id" ref="hr.job_ceo"/>
<field name="department_id" ref="dep_management"/>
<field name="image" type="base64" file="hr/static/img/employee_fp-image.jpg"/>
</record>
<record id="employee_al" model="hr.employee">
@@ -233,7 +235,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_fpi" model="hr.employee">
<field name="name">Martin Lawrence</field>
<field name="department_id" ref="dep_ps"/>
<field name="parent_id" ref="employee_fp"/>
<field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_consultant"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -245,7 +247,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_jth" model="hr.employee">
<field name="name">Jimmy Kosikin</field>
<field name="department_id" ref="dep_ps"/>
<field name="parent_id" ref="employee_fp"/>
<field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_consultant"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_5')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -257,7 +259,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_ngh" model="hr.employee">
<field name="name">Famke Jenssens</field>
<field name="department_id" ref="dep_sales"/>
<field name="parent_id" ref="employee_fp"/>
<field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_marketing"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4'), ref('employee_category_2')])]"/>
<field name="work_location">Building 1, Second Floor</field>
@@ -269,7 +271,7 @@ If you have development competencies, we can propose you specific traineeships</
<record id="employee_vad" model="hr.employee">
<field name="name">Ashley Presley</field>
<field name="department_id" ref="dep_administration"/>
<field name="parent_id" ref="employee_fp"/>
<field name="parent_id" ref="employee_root"/>
<field name="job_id" ref="hr.job_hrm"/>
<field name="category_ids" eval="[(6, 0, [ref('employee_category_4')])]"/>
<field name="work_location">Building 1, Second Floor</field>
addons/hr_attendance/hr_attendance_demo.xml
+20 -20
View File
@@ -5,121 +5,121 @@
<record id="attendance1" model="hr.attendance">
<field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance2" model="hr.attendance">
<field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance3" model="hr.attendance">
<field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance4" model="hr.attendance">
<field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance5" model="hr.attendance">
<field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance6" model="hr.attendance">
<field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance7" model="hr.attendance">
<field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance8" model="hr.attendance">
<field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance9" model="hr.attendance">
<field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance10" model="hr.attendance">
<field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance11" model="hr.attendance">
<field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance12" model="hr.attendance">
<field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance13" model="hr.attendance">
<field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance14" model="hr.attendance">
<field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance15" model="hr.attendance">
<field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance16" model="hr.attendance">
<field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance17" model="hr.attendance">
<field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance18" model="hr.attendance">
<field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance19" model="hr.attendance">
<field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="attendance20" model="hr.attendance">
<field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
</data>
addons/hr_attendance/test/hr_attendance_report.yml
+1 -1
View File
@@ -4,6 +4,6 @@
!python {model: hr.employee}: |
import time
from openerp.tools import test_reports
ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee_fp')]}
ctx = {'model': 'hr.employee','active_ids': [ref('hr.employee_root')]}
data_dict = {'init_date': time.strftime('%Y-01-01')}
test_reports.try_report_action(cr, uid, 'action_hr_attendance_error',wiz_data=data_dict, context=ctx, our_module='hr_attendance')
addons/hr_expense/data/hr_expense_demo.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<field name="country_id" ref="base.be"/>
</record>
<record id="hr.employee_fp" model="hr.employee">
<record id="hr.employee_root" model="hr.employee">
<field name="address_home_id" ref="base.res_partner_address_fp"/>
</record>
addons/hr_holidays/data/hr_holidays_demo.xml
+5 -5
View File
@@ -7,7 +7,7 @@
<field name="holiday_status_id" ref="holiday_status_cl"/>
<field name="type">add</field>
<field name="number_of_days_temp">20</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="hr_holidays_employee1_int_tour" model="hr.holidays">
@@ -17,7 +17,7 @@
<field eval="time.strftime('%Y-%m-28')" name="date_to"/>
<field name="type">add</field>
<field name="number_of_days_temp">7</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="hr_holidays_employee1_vc" model="hr.holidays">
@@ -28,7 +28,7 @@
<field name="type">add</field>
<field name="state">draft</field>
<field name="number_of_days_temp">7</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
@@ -41,7 +41,7 @@
<field eval="time.strftime('%Y-%m-03')" name="date_to"/>
<field name="type">remove</field>
<field name="number_of_days_temp">3</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<record id="hr_holidays_employee1_sl" model="hr.holidays">
@@ -52,7 +52,7 @@
<field name="type">remove</field>
<field name="state">draft</field>
<field name="number_of_days_temp">3</field>
<field name="employee_id" ref="hr.employee_fp"/>
<field name="employee_id" ref="hr.employee_root"/>
</record>
<workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
addons/hr_holidays/tests/test_holidays_flow.py
+5 -5
View File
@@ -184,8 +184,8 @@ class TestHolidaysFlow(TestHrHolidaysBase):
with self.assertRaises(ValidationError):
hol2_manager_group.signal_workflow('confirm')
employee_id = self.ref('hr.employee_fp')
# cl can be of maximum 20 days for employee_fp
employee_id = self.ref('hr.employee_root')
# cl can be of maximum 20 days for employee_root
hol3_status = self.env.ref('hr_holidays.holiday_status_cl').with_context(employee_id=employee_id)
# I assign the dates in the holiday request for 1 day
hol3 = Holidays.create({
@@ -215,7 +215,7 @@ class TestHolidaysFlow(TestHrHolidaysBase):
# Print the HR Holidays(Summary Department) Report through the wizard
ctx = {
'model': 'hr.department',
'active_ids': [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')]
'active_ids': [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')]
}
data_dict = {
'date_from': datetime.today().strftime('%Y-%m-01'),
@@ -227,11 +227,11 @@ class TestHolidaysFlow(TestHrHolidaysBase):
# Print the HR Holidays(Summary Employee) Report through the wizard
ctx = {
'model': 'hr.employee',
'active_ids': [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')]
'active_ids': [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')]
}
data_dict = {
'date_from': datetime.today().strftime('%Y-%m-01'),
'emp': [(6, 0, [self.ref('hr.employee_fp'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')])],
'emp': [(6, 0, [self.ref('hr.employee_root'), self.ref('hr.employee_qdp'), self.ref('hr.employee_al')])],
'holiday_type': 'Approved'
}
test_reports.try_report_action(self.env.cr, self.env.uid, 'action_hr_holidays_summary_employee', wiz_data=data_dict, context=ctx, our_module='hr_holidays')
addons/l10n_in_hr_payroll/test/payment_advice.yml
+1 -1
View File
@@ -7,7 +7,7 @@
name: 'NEFT Advice'
bank_id: base.res_bank_1
line_ids:
- employee_id: hr.employee_fp
- employee_id: hr.employee_root
name: '90125452552'
ifsc_code: 'abn45215145'
bysal: 25000.00
addons/website_hr/data/hr_employee_demo.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<field name="public_info">Designer, UI Expert</field>
</record>
<record id="hr.employee_fp" model="hr.employee">
<record id="hr.employee_root" model="hr.employee">
<field name="website_published" eval="True"/>
<field name="public_info">Lean Management Expert</field>
</record>