diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 9d1ba1c9f05..acf65186795 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -93,18 +93,18 @@ class hr_job(osv.osv): _description = "Job Description" _columns = { 'name': fields.char('Job Name', size=128, required=True, select=True), - 'expected_employees': fields.function(_no_of_employee, string='Expected Employees', help='Required number of employees in total for that job.', + 'expected_employees': fields.function(_no_of_employee, string='Total Employees', help='Expected number of employees in total for this job position after new recruitment.', store = { 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10), 'hr.employee': (_get_job_position, ['job_id'], 10), }, multi='no_of_employee'), - 'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees with that job.', + 'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees currently having this job position.', store = { 'hr.employee': (_get_job_position, ['job_id'], 10), }, multi='no_of_employee'), - 'no_of_recruitment': fields.float('Expected in Recruitment'), + 'no_of_recruitment': fields.float('Expected in Recruitment', help='Number of new employees you expect to recruit.'), 'employee_ids': fields.one2many('hr.employee', 'job_id', 'Employees'), 'description': fields.text('Job Description'), 'requirements': fields.text('Requirements'), diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 461ba8fd71a..31dbd37b699 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -8,9 +8,8 @@ groups="base.group_hr_manager,base.group_hr_user,base.group_user"/> - + - diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index 103c9f62722..6dd4bc25a1c 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -285,7 +285,7 @@ Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager. - diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index 2cf5a930b4d..753b33fa706 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -100,7 +100,6 @@ - diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index c007f2c2509..e6b51958e1c 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -118,7 +118,6 @@ - diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index ce11812b479..dba1319790d 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -76,7 +76,7 @@ class hr_holidays_status(osv.osv): 'name': fields.char('Leave Type', size=64, required=True, translate=True), 'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'), 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'), - 'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'), + 'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system will allow the employees to take more leaves than the available ones for this type.'), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), 'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'), diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml index b312d79c03d..c5045d7b318 100644 --- a/addons/hr_holidays/hr_holidays_data.xml +++ b/addons/hr_holidays/hr_holidays_data.xml @@ -20,7 +20,7 @@ Compensatory Days True - brown + lavender diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 76cbd507c0e..5a09b75649c 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -767,8 +767,8 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,limit:0 msgid "" -"If you tick this checkbox, the system will allow, for this section, the " -"employees to take more leaves than the available ones." +"If you select this checkbox, the system will allow the " +"employees to take more leaves than the available ones for this type. " msgstr "" #. module: hr_holidays diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl index a65425dd0b3..771cb75210b 100644 --- a/addons/hr_holidays/report/holidays_summary.xsl +++ b/addons/hr_holidays/report/holidays_summary.xsl @@ -149,7 +149,7 @@ - Off-Days' Summary + Leaves/Holidays Summary Analyze from to of the holidays. diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index d756dfe6dfd..c656859c54d 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -106,6 +106,10 @@ class report_custom(report_rml): eom = som+datetime.timedelta(59) day_diff=eom-som + name = '' + if data['form'].has_key('emp') and len(data['form']['emp']) == 1: + name = 'of'+' '+obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name'] + if data['form']['holiday_type']!='both': type=data['form']['holiday_type'] if data['form']['holiday_type']=='Confirmed': @@ -118,6 +122,7 @@ class report_custom(report_rml): date_xml.append('%s\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True)))) date_xml.append('%s\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True)))) date_xml.append('%s'%(type)) + date_xml.append('%s'%(name)) # date_xml=[] for l in range(0,len(legend)): 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 ba8b180ff9a..e54f24de15e 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -32,11 +32,9 @@ new - - diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index f2626670523..77b75e1c828 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -3,7 +3,7 @@ - + @@ -483,6 +483,7 @@ action="action_hr_salary_rule_category" parent="payroll_configure" sequence="11" + groups="base.group_no_one" /> Salary Rule Categories Hierarchy @@ -497,6 +498,7 @@ parent="payroll_configure" sequence="12" icon="STOCK_INDENT" + groups="base.group_no_one" /> - + Hr Applicants kanban hr.applicant kanban @@ -252,93 +257,70 @@ - - -
- Phone: -
-
- Mobile: -
- - - oe_kanban_color_red -
-
- - - - - -
- - - - -
-
-
- - + + + + + + + oe_kanban_color_green +
+ B +