diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 86ed827f817..e101c84bffd 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -100,6 +100,8 @@ class hr_contract(osv.osv):
'job_id': fields.many2one('hr.job', 'Job Title'),
'date_start': fields.date('Start Date', required=True),
'date_end': fields.date('End Date'),
+ 'trial_date_start': fields.date('Trial start Date'),
+ 'trial_date_end': fields.date('Trial end Date'),
'working_hours': fields.many2one('resource.calendar','Working Schedule'),
'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
'wage': fields.float('Wage', digits=(16,2), required=True),
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index f16abb025f9..cb486df91b1 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -185,7 +185,10 @@
-
+
+
+
+
diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml
index 084e45620a4..95ebae702ed 100644
--- a/addons/hr_contract/test/test_hr_contract.yml
+++ b/addons/hr_contract/test/test_hr_contract.yml
@@ -41,6 +41,8 @@
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'
name: contract1
wage: 1.0
wage_type_id: hr_contract_wage_type_monthlygrosswage0
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 9d502cf0119..9e349a34648 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,7 +77,7 @@ class account_analytic_line(osv.osv):
_inherit = 'account.analytic.line'
_columns = {
'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
- 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="You can Select the invoice type which you have to created"),
+ 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
}
def unlink(self, cursor, user, ids, context=None):
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index ef4bee1deb3..276c19d7043 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -21,7 +21,7 @@
-
+
hr.analytic.timesheet.form