diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9d7ec10cc28..b1192701dfb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
_name = "hr.expense.expense"
+ _inherit = ['mail.thread']
_description = "Expense"
_order = "id desc"
_columns = {
'name': fields.char('Description', size=128, required=True),
'id': fields.integer('Sheet ID', readonly=True),
- 'ref': fields.char('Reference', size=32),
'date': fields.date('Date', select=True),
'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
'employee_id': fields.many2one('hr.employee', "Employee", required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 703060e792e..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
-
@@ -66,46 +65,52 @@
diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml
index bcb9649be4c..242fe6393c2 100644
--- a/addons/hr_expense/process/hr_expense_process.xml
+++ b/addons/hr_expense/process/hr_expense_process.xml
@@ -1,103 +1,103 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -113,7 +113,7 @@
-
+
@@ -146,36 +146,36 @@
+ Process Transition Action
+ -->
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index d0d73aa5ca4..bf456cfc4d6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -160,7 +160,7 @@
Date
|
- Reference
+ Description
|
Validated By
@@ -176,7 +176,7 @@
[[ formatLang(o.date,date=True) ]]
|
- [[ o.ref ]]
+ [[ o.name ]]
|
[[ o.user_valid.name ]]
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..7877edf4b3a 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -8,7 +8,6 @@
tree
-
@@ -105,7 +104,7 @@
-
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..6f9f61afabc 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -58,7 +58,6 @@ Note that:
'hr_holidays_workflow.xml',
'hr_holidays_view.xml',
'hr_holidays_data.xml',
- 'hr_holidays_wizard.xml',
'hr_holidays_report.xml',
'report/hr_holidays_report_view.xml',
'report/available_holidays_view.xml',
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index f5e8ba69e5d..a1ab0ae04f3 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -359,7 +359,7 @@ class hr_holidays(osv.osv):
# -----------------------------
def get_needaction_user_ids(self, cr, uid, ids, context=None):
- result = dict.fromkeys(ids, [])
+ result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context):
if obj.state == 'confirm' and obj.employee_id.parent_id:
result[obj.id] = [obj.employee_id.parent_id.user_id.id]
@@ -371,14 +371,16 @@ class hr_holidays(osv.osv):
hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0]
result[obj.id] = hr_manager_group['users']
return result
-
+
def message_get_subscribers(self, cr, uid, ids, context=None):
- sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
- # add the employee and its manager if specified to the subscribed users
+ """ Override to add employee and its manager. """
+ user_ids = super(hr_holidays, self).message_get_subscribers(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context):
- if obj.employee_id.parent_id:
- sub_ids.append(obj.employee_id.parent_id.user_id.id)
- return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
+ if obj.user_id and not obj.user_id.id in user_ids:
+ user_ids.append(obj.user_id.id)
+ if obj.employee_id.parent_id and not obj.employee_id.parent_id.user_id.id in user_ids:
+ user_ids.append(obj.employee_id.parent_id.user_id.id)
+ return user_ids
def create_notificate(self, cr, uid, ids, context=None):
for obj in self.browse(cr, uid, ids, context=context):
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7db5a41b7e8..1237cdb14f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,6 +1,43 @@
+
+
+ Mark unread
+ True
+ ir.actions.server
+
+ code
+ self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+
+
+ action_holidays_unread
+
+
+ action
+
+ hr.holidays
+ client_action_multi
+
+
+
+ Mark read
+ True
+ ir.actions.server
+
+ code
+ self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+
+
+ action_holidays_read
+
+
+ action
+
+ hr.holidays
+ client_action_multi
+
+
hr.holidays.filter
hr.holidays
@@ -10,6 +47,11 @@
+
+
@@ -60,43 +102,53 @@
@@ -109,39 +161,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -300,7 +355,7 @@
form
-
+
@@ -367,8 +422,7 @@
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 51ff25fea75..21e19897f22 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -1,8 +1,8 @@
-
+
-
+
hr.holidays.remaining.leaves.user.tree
hr.holidays.remaining.leaves.user
tree
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 72844a58ccb..c5e408a6748 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -9,8 +9,8 @@
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 03fd4762262..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
-
-
- hr.hr.employee.view.form2
- hr.employee
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
hr.contract.view.form.inherit
@@ -45,8 +15,7 @@
-
-
+
@@ -105,7 +74,7 @@
hr.payroll.structure
form
-
+
+
hr.payslip.form
@@ -257,21 +232,26 @@
+
@@ -360,14 +342,18 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -413,7 +399,27 @@
+
+
+
+ payroll.hr.employee.view.form
+ hr.employee
+
+
+
+
+
+
+
+
+
hr.salary.rule.category.form
@@ -508,8 +514,8 @@
tree
-
-
+
+
@@ -596,7 +602,7 @@
-
+
@@ -724,18 +730,26 @@
@@ -763,18 +777,18 @@
groups="base.group_hr_manager"/>
+ domain="[('slip_id', '=', active_id)]"
+ context="{'default_slip_id': active_id}"
+ res_model="hr.payslip.line"
+ src_model="hr.payslip"
+ id="act_payslip_lines"/>
+ domain="[('register_id', '=', active_id)]"
+ context="{'default_register_id': active_id, 'search_default_register_id': 1}"
+ res_model="hr.payslip.line"
+ src_model="hr.contribution.register"
+ id="act_contribution_reg_payslip_lines"/>
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
index e48a8f6470c..5e344e6553a 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
@@ -7,17 +7,15 @@
payslip.lines.contribution.register
form
-
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
index 60b25bbd95a..b29b80104df 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
@@ -7,19 +7,18 @@
hr.payslip.employees
form
-
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index e06a43588c4..9e3aab3ecb6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,8 +2,6 @@
-
-
hr.payslip.inherit.form
hr.payslip
@@ -27,10 +25,12 @@
-
-
-
-
+
+
+
+
+
+
@@ -44,14 +44,15 @@
form
-
-
-
-
+
+
+
+
+
-
+
@@ -85,12 +86,11 @@
form
-
-
+
-
+
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c893755c7c0..0fc5bc3b94b 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,7 +181,7 @@ class hr_applicant(base_stage, osv.Model):
return res
_columns = {
- 'name': fields.char('Name', size=128, required=True),
+ 'name': fields.char('Subject', size=128, required=True),
'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
'description': fields.text('Description'),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
@@ -200,7 +200,7 @@ class hr_applicant(base_stage, osv.Model):
If the case needs to be reviewed then the state is \
set to \'Pending\'.'),
'company_id': fields.many2one('res.company', 'Company'),
- 'user_id': fields.many2one('res.users', 'Responsible'),
+ 'user_id': fields.many2one('res.users', 'HR Manager'),
# Applicant Columns
'date_closed': fields.datetime('Closed', readonly=True, select=True),
'date_open': fields.datetime('Opened', readonly=True, select=True),
@@ -357,54 +357,53 @@ class hr_applicant(base_stage, osv.Model):
return value
def message_new(self, cr, uid, msg, custom_values=None, context=None):
- """Automatically called when new email message arrives"""
- res_id = super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
- subject = msg.get('subject') or _("No Subject")
- body = msg.get('body_text')
- msg_from = msg.get('from')
- priority = msg.get('priority')
- vals = {
- 'name': subject,
- 'email_from': msg_from,
+ """ Overrides mail_thread message_new that is called by the mailgateway
+ through message_process.
+ This override updates the document according to the email.
+ """
+ if custom_values is None: custom_values = {}
+ custom_values.update({
+ 'name': msg.get('subject') or _("No Subject"),
+ 'description': msg.get('body_text'),
+ 'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
- 'description': body,
'user_id': False,
- }
- if priority:
- vals['priority'] = priority
- vals.update(self.message_partner_by_email(cr, uid, msg.get('from', False)))
- self.write(cr, uid, [res_id], vals, context)
- return res_id
+ })
+ if msg.get('priority'):
+ custom_values['priority'] = msg.get('priority')
+ custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
+ return super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
- def message_update(self, cr, uid, ids, msg, vals=None, default_act='pending', context=None):
+ def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
+ """ Override mail_thread message_update that is called by the mailgateway
+ through message_process.
+ This method updates the document according to the email.
+ """
if isinstance(ids, (str, int, long)):
ids = [ids]
- if vals is None:
- vals = {}
- msg_from = msg['from']
- vals.update({
- 'description': msg['body_text']
+ if update_vals is None: vals = {}
+
+ update_vals.update({
+ 'description': msg.get('body'),
+ 'email_from': msg.get('from'),
+ 'email_cc': msg.get('cc'),
})
- if msg.get('priority', False):
- vals['priority'] = msg.get('priority')
+ if msg.get('priority'):
+ update_vals['priority'] = msg.get('priority')
maps = {
- 'cost':'planned_cost',
+ 'cost': 'planned_cost',
'revenue': 'planned_revenue',
- 'probability':'probability'
+ 'probability': 'probability',
}
- vls = { }
- for line in msg['body_text'].split('\n'):
+ for line in msg.get('body_text', '').split('\n'):
line = line.strip()
res = tools.misc.command_re.match(line)
if res and maps.get(res.group(1).lower(), False):
key = maps.get(res.group(1).lower())
- vls[key] = res.group(2).lower()
+ update_vals[key] = res.group(2).lower()
- vals.update(vls)
- res = self.write(cr, uid, ids, vals, context=context)
- self.message_append_dict(cr, uid, ids, msg, context=context)
- return res
+ return super(hr_applicant, self).message_update(cr, uids, ids, update_vals=update_vals, context=context)
def create(self, cr, uid, vals, context=None):
obj_id = super(hr_applicant, self).create(cr, uid, vals, context=context)
@@ -493,20 +492,14 @@ class hr_applicant(base_stage, osv.Model):
# -------------------------------------------------------
# OpenChatter methods and notifications
# -------------------------------------------------------
-
- def message_get_subscribers(self, cr, uid, ids, context=None):
- sub_ids = self.message_get_subscribers_ids(cr, uid, ids, context=context);
- for obj in self.browse(cr, uid, ids, context=context):
- if obj.user_id:
- sub_ids.append(obj.user_id.id)
- return self.pool.get('res.users').read(cr, uid, sub_ids, context=context)
- def get_needaction_user_ids(self, cr, uid, ids, context=None):
- result = dict.fromkeys(ids, [])
+ def message_get_subscribers(self, cr, uid, ids, context=None):
+ """ Override to add responsible user. """
+ user_ids = super(hr_applicant, self).message_get_subscribers(cr, uid, ids, context=context)
for obj in self.browse(cr, uid, ids, context=context):
- if obj.state == 'draft' and obj.user_id:
- result[obj.id] = [obj.user_id.id]
- return result
+ if obj.user_id and not obj.user_id.id in user_ids:
+ user_ids.append(obj.user_id.id)
+ return user_ids
def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
""" Override of the (void) default notification method. """
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 3a75b6df7c1..3f21ceacc38 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -52,8 +52,8 @@
name="Applications"
parent="base.menu_crm_case_job_req_main"
id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
-
-
+
+
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index f31778b7874..c8230787cfe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -45,6 +45,43 @@
# Jobs
# ------------------------------------------------------
+
+
+ Mark unread
+ True
+ ir.actions.server
+
+ code
+ self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)
+
+
+ action_project_unread
+
+
+ action
+
+ hr.applicant
+ client_action_multi
+
+
+
+ Mark read
+ True
+ ir.actions.server
+
+ code
+ self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)
+
+
+ action_project_read
+
+
+ action
+
+ hr.applicant
+ client_action_multi
+
+
Applicants
hr.applicant
@@ -82,15 +119,15 @@
@@ -192,6 +232,12 @@
search
+
+
+
-
@@ -265,68 +310,59 @@
-
-
-
- oe_kanban_color_green
-
-
- i
-
+
+
+
+
+
+
+
+
+
+ i
+
+
+
+
+
+
+ Mobile:
+
+
-
-
-
-
-
-
- Applied for
-
-
-
- on
-
-
-
-
-
- ![]()
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
# ------------------------------------------------------
# HR Job
@@ -338,15 +374,15 @@
form
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5ddbe5045ab..9d81d39f240 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -114,7 +114,7 @@
{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
index 15bede42e96..985f6b25eec 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job_view.xml
@@ -2,21 +2,19 @@
-
+
hr.recruitment.partner.create.form
hr.recruitment.partner.create
form
-
+
@@ -29,5 +27,5 @@
new
-
+
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
index 7a66d070291..0ea98657a61 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.xml
@@ -7,14 +7,15 @@
hired.employee
form
-
+
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
index 10329c6a856..8537186ac6f 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall_view.xml
@@ -2,13 +2,18 @@
-
+
hr.recruitment.job2phonecall.form
hr.recruitment.job2phonecall
form
-
@@ -36,5 +36,5 @@
new
-
-
\ No newline at end of file
+
+
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..487dcd592bd 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -1,11 +1,6 @@
-
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index a8a361ed633..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
hr.analytic.timesheet
form
-
@@ -112,10 +121,14 @@
hr.employee
-
+
-
-
+
+
+
+
+
+
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index 097bf764429..ae5b294aa16 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -7,7 +7,7 @@
ctx.update({'model': 'hr.employee','active_ids': []})
data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee_fp')}
from tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_hr_timesheet_my',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
+ test_reports.try_report_action(cr, uid, 'action_hr_timesheet_employee',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
-
Print the HR Timesheet By Employee report through the wizard
@@ -18,4 +18,4 @@
ctx.update({'model': 'hr.employee','active_ids': []})
data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee_fp'),ref('hr.employee_qdp'),ref('hr.employee_al')])]}
from tools import test_reports
- test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
\ No newline at end of file
+ test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 1eda6de05cb..d14646b0249 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,28 +2,28 @@
-
-
+
+
hr.analytical.timesheet.employee.form
hr.analytical.timesheet.employee
form
-
-
-
+
+
-
+
Employee Timesheet
hr.analytical.timesheet.employee
form
@@ -33,40 +33,9 @@
-
-
-
-
- hr.analytical.timesheet.my.form
- hr.analytical.timesheet.employee
- form
-
-
-
-
-
-
- My Timesheet
- hr.analytical.timesheet.employee
- form
- tree,form
-
- new
-
+ id="menu_hr_timesheet_employee"
+ parent="hr.menu_hr_reporting"
+ sequence="2" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 95b7bd3b93e..288a51e34cd 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -2,31 +2,34 @@
-
-
+
+
hr.analytical.timesheet.users.form
hr.analytical.timesheet.users
form
-
+
-
+
Employees Timesheet
hr.analytical.timesheet.users
form
@@ -36,10 +39,9 @@
-
+ id="menu_hr_timesheet_users"
+ parent="hr.menu_hr_reporting_timesheet"
+ groups="base.group_hr_manager" sequence="2" icon="STOCK_PRINT"/>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 7e8d7eea549..c7b7f320c37 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -6,14 +6,16 @@
hr.sign.in.project
form
-
@@ -23,7 +25,12 @@
hr.sign.in.project
form
-
@@ -56,7 +59,13 @@
hr.sign.out.project
form
-
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 64e0ef592b7..d07314498e1 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -19,9 +19,10 @@
-
-
-
+
+
+
+
@@ -52,7 +53,7 @@
-
+
@@ -76,7 +77,7 @@
-
+
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index 3462f6603c5..59b4ceb67a3 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -108,9 +108,9 @@
form
@@ -188,9 +188,9 @@
form
@@ -242,7 +242,7 @@
-
+
@@ -267,10 +267,10 @@
form
@@ -336,10 +336,10 @@
form
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 89d8fa1857e..c7d0c6b7c25 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -8,13 +8,13 @@
form
@@ -64,11 +64,11 @@
form
-
-
-
-
-
@@ -227,7 +231,7 @@
form
-
+
@@ -349,6 +353,17 @@
+
+
+ hr.timesheet.sheet.employee.extd_form
+ hr.employee
+
+
+
+
+
+
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8b102b19f72..fd5d6b0b6d1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -82,6 +82,6 @@
+ parent="hr.menu_hr_reporting" sequence="3"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index fe497b6f46c..613f92d3cf6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -110,6 +110,6 @@
+ parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index 18121813e7d..2c04f116b48 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -8,10 +8,13 @@
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 0aabaa42276..9cee10c3cbb 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -67,9 +67,9 @@
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
index dee0e608d45..5c538e5912f 100644
--- a/addons/import_google/__openerp__.py
+++ b/addons/import_google/__openerp__.py
@@ -37,7 +37,6 @@
'demo_xml': [],
'test': [
#'test/test_sync_google_contact_import_partner.yml',
- # 'test/test_sync_google_contact_import_address.yml',
#'test/test_sync_google_calendar.yml',
],
'installable': True,
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
index 8b51576edac..84f0176c5ec 100644
--- a/addons/import_google/sync_google_calendar_view.xml
+++ b/addons/import_google/sync_google_calendar_view.xml
@@ -2,31 +2,31 @@
- CRM - Meetings Form (Inherited)
- crm.meeting
- form
-
-
-
-
-
-
-
-
-
- CRM - Meetings Tree (Inherited)
- crm.meeting
- tree
-
-
-
+ CRM - Meetings Form (Inherited)
+ crm.meeting
+ form
+
+
+
-
-
+
+
+
+
+ CRM - Meetings Tree (Inherited)
+ crm.meeting
+ tree
+
+
+
+
+
+
+
diff --git a/addons/import_google/test/test_sync_google_contact_import_address.yml b/addons/import_google/test/test_sync_google_contact_import_address.yml
deleted file mode 100644
index b1a8f9a2e09..00000000000
--- a/addons/import_google/test/test_sync_google_contact_import_address.yml
+++ /dev/null
@@ -1,34 +0,0 @@
--
- In order to test Importing contacts from any google account into OpenERP,
- I use a gmail account and import the contact details and store them as Partner addresses.
-- |
- I create a record for the gmail account for which I want to import the contacts.
--
- !record {model: google.login, id: google_login_id0}:
- user: testmail.openerp@gmail.com
- password: openerptiny
-- |
- I login into that account.
--
- !python {model: google.login}: |
- self.login(cr, uid, [ref('google_login_id0')], context)
-- |
- Now I select from which group I want to get the contact details.
--
- !record {model: synchronize.google.import, id: synchronize_google_import_id0}:
- create_partner: create_address
- group_name: all
- calendar_name: all
-- |
- I import the contacts and I also check if the contact already exists in db and updates the address.
--
- !python {model: synchronize.google.import}: |
- self.import_google(cr, uid, [ref('synchronize_google_import_id0')], context={'contact':True})
-- |
- I check whether the Contacts are created in Partner address or not.
--
- !python {model: res.partner.address}: |
- addr_obj = self.pool.get('ir.model.data')
- data_ids = addr_obj.search(cr, uid, [('model','=','res.partner.address'),('module','=','synchronize_google')])
- assert data_ids, 'Addresses not created !'
-
\ No newline at end of file
diff --git a/addons/import_google/test/test_sync_google_contact_import_partner.yml b/addons/import_google/test/test_sync_google_contact_import_partner.yml
index 4eadbf0f100..08aa0f30718 100644
--- a/addons/import_google/test/test_sync_google_contact_import_partner.yml
+++ b/addons/import_google/test/test_sync_google_contact_import_partner.yml
@@ -16,7 +16,6 @@
Now I select from which group I want to get the contact details and I want to create partner for all contacts.
-
!record {model: synchronize.google.import, id: synchronize_google_import_id1}:
- create_partner: create_all
group_name: all
- |
I import the contacts.
@@ -26,11 +25,11 @@
- |
I check whether the Partners are created or not.
-
- !python {model: res.partner.address }: |
+ !python {model: res.partner }: |
addr_obj = self.pool.get('ir.model.data')
addr_ids = addr_obj.search(cr, uid, [])
- data_ids = addr_obj.search(cr, uid, [('model','=','res.partner.address'),('module','=','synchronize_google')])
+ data_ids = addr_obj.search(cr, uid, [('model','=','res.partner'),('module','=','synchronize_google')])
address_ids = map(lambda x: x.res_id, [child for child in addr_obj.browse(cr, uid, data_ids) if child.res_id])
- partner_ids = map(lambda x: x.partner_id.id, [addr for addr in self.browse(cr, uid, address_ids) if addr.partner_id])
+ partner_ids = map(lambda x: x.parent_id.id, [addr for addr in self.browse(cr, uid, address_ids) if addr.parent_id])
assert partner_ids, 'Partners not created !'
-
\ No newline at end of file
+
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
index 215de9ba59c..250239ea10c 100644
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ b/addons/import_google/wizard/google_import_message_view.xml
@@ -8,9 +8,6 @@
form
|