diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index c82e0a7fd9a..4e042a77ca8 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -351,8 +351,8 @@ - - + + diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 5a8047b4d9b..8b91d3cf198 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -143,6 +143,30 @@ + + + stock.picking_withweight.in.form.view + form + stock.picking + + + + + + + + + + stock.picking_withweight.internal.form.view + form + stock.picking + + + + + + + delivery.stock.picking_withcarrier.delivery.form.view @@ -168,6 +192,102 @@ {'contact_display': 'partner'} + + + delivery.stock.picking_withcarrier.out.move.form.view + form + stock.picking + + + + + + + + + + stock.picking_withweight.in.move.form.view + form + stock.picking + + + + + + + + + stock.picking_withweight.internal.move.form.view + form + stock.picking + + + + + + + + + + delivery.stock.picking_withcarrier.delivery.move.form.view + form + stock.picking + + + + + + + + + + stock.move.tree.weight + tree + stock.move + + + + + + + + + + stock.move.form.weight + form + stock.move + + + + + + + + + + stock.move.reception.packing.tree.weight + tree + stock.move + + + + + + + + + + stock.move.reception.packing.form.weight + form + stock.move + + + + + + + + diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index 29a3003ff52..6d8d5a17bd1 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -34,15 +34,11 @@ class stock_picking(osv.osv): def _cal_weight(self, cr, uid, ids, name, args, context=None): res = {} - data_picking = self.browse(cr, uid, ids, context) - for picking in data_picking: + uom_obj = self.pool.get('product.uom') + for picking in self.browse(cr, uid, ids, context): total_weight = 0.00 - if picking.move_lines: - weight = 0.00 - for move in picking.move_lines: - if move.product_id.weight > 0.00: - weight = (move.product_uos_qty * move.product_id.weight) - total_weight += weight + for move in picking.move_lines: + total_weight += move.weight res[picking.id] = total_weight return res @@ -56,7 +52,7 @@ class stock_picking(osv.osv): _columns = { 'carrier_id':fields.many2one("delivery.carrier","Carrier"), 'volume': fields.float('Volume'), - 'weight': fields.function(_cal_weight, method=True, type='float', string='Weight',digits_compute= dp.get_precision('Stock Weight'), + 'weight': fields.function(_cal_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), store={ 'stock.picking': (lambda self, cr, uid, ids, c={}: ids, ['move_lines'], 20), 'stock.move': (_get_picking_line, ['product_id','product_uos_qty'], 20), @@ -127,5 +123,32 @@ class stock_picking(osv.osv): stock_picking() +class stock_move(osv.osv): + _inherit = 'stock.move' + + def _cal_move_weight(self, cr, uid, ids, name, args, context=None): + res = {} + uom_obj = self.pool.get('product.uom') + for move in self.browse(cr, uid, ids, context): + weight = 0.00 + if move.product_id.weight > 0.00: + converted_qty = move.product_qty + + if move.product_uom.id <> move.product_id.uom_id.id: + converted_qty = uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, move.product_id.uom_id.id) + + weight = (converted_qty * move.product_id.weight) + res[move.id] = weight + return res + + _columns = { + 'weight': fields.function(_cal_move_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), + store={ + 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 20), + }), + } + +stock_move() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 89dfbd12363..0c25e6eb34f 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -38,7 +38,6 @@ - @@ -52,7 +51,6 @@ - diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py index 0a664f50a88..978018a5e90 100644 --- a/addons/hr_evaluation/__terp__.py +++ b/addons/hr_evaluation/__terp__.py @@ -31,8 +31,7 @@ "demo_xml" : ["hr_evaluation_demo.xml"], "update_xml" : [ "security/ir.model.access.csv", - "hr_evaluation_view.xml", - "hr_evaluation_data.xml"], + "hr_evaluation_view.xml"], "active": False, "installable": True } diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml deleted file mode 100644 index 2064d18f121..00000000000 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ /dev/null @@ -1,1604 +0,0 @@ - - - - - Employee Evaluation - 20 - - - - - - - - Employee Opinion - 20 - - - - - - - - Employee Evaluation Form - - - - - - - Process - - - - - - - - Work Plan - - - - - - - Employee Performance In Key Areas - - - The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : - 1 - Significantly exceeds standards and expectations required of the position - 2 - Exceeds standards and expectations - 3 - Meet standards and expectations - 4 - Did not meet standards and expectations - 5 - Significantly below standards and expectations - - - - - - Professional Development And Performance Plan (optional) - - - Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. - - - - - - Employee Comments - - - - - - - - Survey - - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Employee Details - - multiple_textboxes_diff_type - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Employee Information - - multiple_textboxes_diff_type - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Engagement - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Subject - - matrix_of_choices_only_one_ans - Recommendations / Evaluations - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Leadership - - matrix_of_choices_only_one_ans - - - - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Supervisors only : - - matrix_of_choices_only_one_ans - Recommendations / Evaluations - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Work Plan - - table - The comment you entered is in an invalid format. - - - - Other - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Effectiveness - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Continuous Improvement - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Additional comments : - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Openness - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Overall Performance Summary Rating - - descriptive_text - The comment you entered is in an invalid format. - including the project evaluation form (if any) - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Overall Purpose Of Employee Appraisal - - descriptive_text - The comment you entered is in an invalid format. - * To initiate a clear and open communication of performance expectations - -* To assist employees in their professional growth, through the identification of strengths and opportunities for development - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Miscellaneous - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Additional comments : - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - At the outset of the appraisal time period - - descriptive_text - The comment you entered is in an invalid format. - * It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated. - -* Critical or key elements of performance and professional development needs (if any), should also be noted at this time - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - At the conclusion of the appraisal time period - - descriptive_text - The comment you entered is in an invalid format. - * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. -Once the form had been filled, the employee send it to his supervisor. - -* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager. - -* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields. - -* The employee may choose to offer comments or explanation regarding the completed review. - -* The supervisor send the form to the HR department in India and in Belgium. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - At the supervisor's appraisal date - - descriptive_text - The comment you entered is in an invalid format. - * His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ... - -* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor. -* The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : - - 1 - Significantly exceeds standards and expectations required of the position - 2 - Exceeds standards and expectations - 3 - Meet standards and expectations - 4 - Did not meet standards and expectations - 5 - Significantly below standards and expectations - - - - Other - - - - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Professional Development Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Personal Performance Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Project Objectives - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Use the following space to make any comments regarding the above performance evaluation. - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - 1 - 1 - 1 - - - - - - 1 - 1 - 2 - - - - - - 1 - 1 - 3 - - - - - - 1 - 1 - 4 - - - - - - 1 - 1 - 5 - - - - - - - 1 - Demonstrates genuine concern for me as a person. - - - - - - - Name - - char - - - - - - 1 - I'm efficient at work and my achievements are successful. - - - - - - - 1 - I am proud to tell others I work here. - - - - - - - 0 - Name of your direct supervisor - - char - - - - - - 1 - Actions by Executive management show genuine interest in the well-being of employees. - - - - - - - 1 - I know the company's values and live them. - - - - - - - 1 - My work contributes towards the continuous improvement of the company, our services or products. - - - - - - - 1 - I have enough work. - - - - - - - 0 - Date - - datetime - - - - - - Position Title - - char - - - - - - 1 - I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete - - - - - - - 1 - My job provides me with a sense of personal accomplishment. - - - - - - - 1 - What I did several months ago is still of use to the company, the services or the products today. - - - - - - - 1 - My best achievements have been communicated to the community, internally or to customers. - - - - - - - 1 - I have the same opportunity to succeed as others with similar experiences, performance and educational background. - - - - - - - 1 - Compared to similar jobs in other companies where I could work, my total compensation is: -(Scale: Well below others, Below othe - - - - - - - 1 - Overall, I believe the quality of products and/or services my workgroup delivers is improving. - - - - - - - 1 - I would prefer to remain with this company even if a comparable job were available in another company. - - - - - - - 1 - Listens and takes into account all ideas and do his best to put in place the best of these. - - - - - - - Appraisal for Period - - char - - - - - - 1 - I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe - - - - - - - 1 - Our workgroup identifies and reduces waste of time in our activities and processes. - - - - - - - 1 - Taking everything into account, how satisfied are you with your current job? - - - - - - - 1 - I understand the company strategy and how my workgroup supports it. - - - - - - - Date of Review - - datetime - - - - - - 1 - Time management : projects/tasks are completed on time - - - - - - - 1 - Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues - - - - - - - - - - 1 - Delegation : Ability to efficiently assign tasks to other people - - - - - - - - - Appraiser - - char - - - - - - 1 - Ability to cope with multidisciplinary of team - - - - - - - 1 - Enthusiasm & implication toward projects/assignments - - - - - - - 1 - Compliance to internal rules and processes (timesheets completion, etc.) - - - - - - - 1 - Team spirit : ability to work efficiently with peers, manage the conflicts with diplomacy - - - - - - - 1 - Leadership: create a challenging and motivating work environment aligned with the company's strategy - - - - - - - 1 - Leadership: sustain subordinates in their professional growth - - - - - - - 1 - Ability to manage planning resources, risks, budgets and deadlines - - - - - - - 1 - I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed. - - - - - - - 1 - I believe the information that I get from the person I report to. - - - - - - - - 1 - Initiative and self autonomy - - - - - - - 1 - Ability to follow and complete work as instructed - - - - - - - 1 - Decision making - - - - - - - 1 - At the conclusion of the appraisal time period: - - - - - - - 1 - At the outset of the appraisal time period: - - - - - - - 1 - Customer commitment - - - - - - - 1 - Communication skills ( written & verbally): clearness, concision, exactitude - - - - - - - 1 - Technical skills regarding to the job requirements - - - - - - - 1 - Analytical and synthetic mind - - - - - - - 1 - Promptness and attendance record - - - - - - - 1 - Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency - - - - - - - 1 - Creativity and forward looking aptitude - - - - - - - - Title - - char - - - - - - - 1 - 1 - Objectives - - - - - - 1 - 1 - Results - - - - - - 1 - 1 - Comments - - - - - - - - - - - - - - - - - - - Manager's Evaluation Plan - - - - - - - - Send to Subordinates - - - - bottom-up - - - - - - - - - - - Send to Managers - - - - top-down - - - - - - - - - - - Send to Employee - - - - self - - - - - - - - - - - Final Interview With Manager - - - - final - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml index 89c072e6eb3..2ad9629d61a 100644 --- a/addons/hr_evaluation/hr_evaluation_demo.xml +++ b/addons/hr_evaluation/hr_evaluation_demo.xml @@ -1,6 +1,1618 @@ - + - + + + Employee Evaluation + 20 + + + + + + + + Employee Opinion + 20 + + + + + + + + Employee Evaluation Form + + + + + + + Process + + + + + + + + Work Plan + + + + + + + Employee Performance In Key Areas + + + The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : + 1 - Significantly exceeds standards and expectations required of the position + 2 - Exceeds standards and expectations + 3 - Meet standards and expectations + 4 - Did not meet standards and expectations + 5 - Significantly below standards and expectations + + + + + + Professional Development And Performance Plan (optional) + + + Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. + + + + + + Employee Comments + + + + + + + + Survey + + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Employee Details + + multiple_textboxes_diff_type + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Employee Information + + multiple_textboxes_diff_type + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Engagement + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Subject + + matrix_of_choices_only_one_ans + Recommendations / Evaluations + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Leadership + + matrix_of_choices_only_one_ans + + + + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Supervisors only : + + matrix_of_choices_only_one_ans + Recommendations / Evaluations + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Work Plan + + table + The comment you entered is in an invalid format. + + + + Other + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Effectiveness + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Continuous Improvement + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Additional comments : + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Openness + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Overall Performance Summary Rating + + descriptive_text + The comment you entered is in an invalid format. + including the project evaluation form (if any) + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Overall Purpose Of Employee Appraisal + + descriptive_text + The comment you entered is in an invalid format. + * To initiate a clear and open communication of performance expectations + +* To assist employees in their professional growth, through the identification of strengths and opportunities for development + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Miscellaneous + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Additional comments : + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + At the outset of the appraisal time period + + descriptive_text + The comment you entered is in an invalid format. + * It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated. + +* Critical or key elements of performance and professional development needs (if any), should also be noted at this time + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + At the conclusion of the appraisal time period + + descriptive_text + The comment you entered is in an invalid format. + * The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-evaluation and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion. +Once the form had been filled, the employee send it to his supervisor. + +* It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with Tiny Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager. + +* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields. + +* The employee may choose to offer comments or explanation regarding the completed review. + +* The supervisor send the form to the HR department in India and in Belgium. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + At the supervisor's appraisal date + + descriptive_text + The comment you entered is in an invalid format. + * His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ... + +* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor. +* The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below : + + 1 - Significantly exceeds standards and expectations required of the position + 2 - Exceeds standards and expectations + 3 - Meet standards and expectations + 4 - Did not meet standards and expectations + 5 - Significantly below standards and expectations + + + + Other + + + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Professional Development Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Personal Performance Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Project Objectives + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Use the following space to make any comments regarding the above performance evaluation. + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + 1 + 1 + 1 + + + + + + 1 + 1 + 2 + + + + + + 1 + 1 + 3 + + + + + + 1 + 1 + 4 + + + + + + 1 + 1 + 5 + + + + + + + 1 + Demonstrates genuine concern for me as a person. + + + + + + + Name + + char + + + + + + 1 + I'm efficient at work and my achievements are successful. + + + + + + + 1 + I am proud to tell others I work here. + + + + + + + 0 + Name of your direct supervisor + + char + + + + + + 1 + Actions by Executive management show genuine interest in the well-being of employees. + + + + + + + 1 + I know the company's values and live them. + + + + + + + 1 + My work contributes towards the continuous improvement of the company, our services or products. + + + + + + + 1 + I have enough work. + + + + + + + 0 + Date + + datetime + + + + + + Position Title + + char + + + + + + 1 + I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete + + + + + + + 1 + My job provides me with a sense of personal accomplishment. + + + + + + + 1 + What I did several months ago is still of use to the company, the services or the products today. + + + + + + + 1 + My best achievements have been communicated to the community, internally or to customers. + + + + + + + 1 + I have the same opportunity to succeed as others with similar experiences, performance and educational background. + + + + + + + 1 + Compared to similar jobs in other companies where I could work, my total compensation is: +(Scale: Well below others, Below othe + + + + + + + 1 + Overall, I believe the quality of products and/or services my workgroup delivers is improving. + + + + + + + 1 + I would prefer to remain with this company even if a comparable job were available in another company. + + + + + + + 1 + Listens and takes into account all ideas and do his best to put in place the best of these. + + + + + + + Appraisal for Period + + char + + + + + + 1 + I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe + + + + + + + 1 + Our workgroup identifies and reduces waste of time in our activities and processes. + + + + + + + 1 + Taking everything into account, how satisfied are you with your current job? + + + + + + + 1 + I understand the company strategy and how my workgroup supports it. + + + + + + + Date of Review + + datetime + + + + + + 1 + Time management : projects/tasks are completed on time + + + + + + + 1 + Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues + + + + + + + + + + 1 + Delegation : Ability to efficiently assign tasks to other people + + + + + + + + + Appraiser + + char + + + + + + 1 + Ability to cope with multidisciplinary of team + + + + + + + 1 + Enthusiasm & implication toward projects/assignments + + + + + + + 1 + Compliance to internal rules and processes (timesheets completion, etc.) + + + + + + + 1 + Team spirit : ability to work efficiently with peers, manage the conflicts with diplomacy + + + + + + + 1 + Leadership: create a challenging and motivating work environment aligned with the company's strategy + + + + + + + 1 + Leadership: sustain subordinates in their professional growth + + + + + + + 1 + Ability to manage planning resources, risks, budgets and deadlines + + + + + + + 1 + I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed. + + + + + + + 1 + I believe the information that I get from the person I report to. + + + + + + + + 1 + Initiative and self autonomy + + + + + + + 1 + Ability to follow and complete work as instructed + + + + + + + 1 + Decision making + + + + + + + 1 + At the conclusion of the appraisal time period: + + + + + + + 1 + At the outset of the appraisal time period: + + + + + + + 1 + Customer commitment + + + + + + + 1 + Communication skills ( written & verbally): clearness, concision, exactitude + + + + + + + 1 + Technical skills regarding to the job requirements + + + + + + + 1 + Analytical and synthetic mind + + + + + + + 1 + Promptness and attendance record + + + + + + + 1 + Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency + + + + + + + 1 + Creativity and forward looking aptitude + + + + + + + + Title + + char + + + + + + + 1 + 1 + Objectives + + + + + + 1 + 1 + Results + + + + + + 1 + 1 + Comments + + + + + + + + + + + + + + + + + + + Manager's Evaluation Plan + + + + + + + + Send to Subordinates + + + + bottom-up + + + + + + + + + + + Send to Managers + + + + top-down + + + + + + + + + + + Send to Employee + + + + self + + + + + + + + + + + Final Interview With Manager + + + + final + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Run Employee Evaluation + + + 1 + minutes + -1 + + + + + - diff --git a/addons/hr_recruitment/hr_hr_data.xml b/addons/hr_recruitment/hr_hr_data.xml index d430924e170..e2b23cc09f5 100644 --- a/addons/hr_recruitment/hr_hr_data.xml +++ b/addons/hr_recruitment/hr_hr_data.xml @@ -61,439 +61,4 @@ - - - - Job Survey - draft - 20 - - - - - - - - Default Section - - - - - - - Education & Activities - - - - - - - Importance - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - From which university will you graduate? - - single_textbox - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Rate the Importance - - matrix_of_choices_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Education - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Knowledge - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - What is your gender? - - multiple_choice_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - 1 - Male - - - - - - 1 - Female - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - What age group do you belong to? - - multiple_choice_only_one_ans - The comment you entered is in an invalid format. - - - - Other - - - - - - 1 - 0 - 15 - - - - - 1 - 16 - 20 - - - - - 1 - 21 - 30 - - - - - 1 - 31 - 40 - - - - - 1 - 41 - 50 - - - - - 1 - 51 - 60 - - - - - 1 - 61 - 70 - - - - - 1 - 71 + - - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Exprience - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - 1 - do_not_validate - do_not_validate - Please enter a comment. - The choices need to add up to [enter sum here]. - - The comment you entered is in an invalid format. - - This question requires an answer. - - Activities - - comment - The comment you entered is in an invalid format. - - - - Other - - - - - - - - Not important - - - - - - - - Somewhat important - - - - - - - - Important - - - - - - - - Very important - - - - - - - - Most important - - - - - - - - 1 - Good pay - - - - - - - 1 - Getting on with colleagues - - - - - - - 1 - Office environment (décor, light, space etc) - - - - - - - 1 - Desk space - - - - - - - 1 - State of the art technology - - - - - - - 1 - Office location (proximity to home) - - - - - - - 1 - Good management/boss - - - - - - - 1 - Freebies such as tea, coffee and stationery - - - - - - - 1 - Perks such as free parking, gym passes etc - - - - - - - 1 - No out of hours working - - - - - - - 1 - Dress code - - - - - - - 1 - Regular meetings - - - - - - - 1 - Good social life (office nights out, good Christmas parties etc) - - - - - diff --git a/addons/hr_recruitment/hr_hr_demo.xml b/addons/hr_recruitment/hr_hr_demo.xml index 0509afc5968..fd4920a1199 100644 --- a/addons/hr_recruitment/hr_hr_demo.xml +++ b/addons/hr_recruitment/hr_hr_demo.xml @@ -139,4 +139,439 @@ + + + + Job Survey + draft + 20 + + + + + + + + Default Section + + + + + + + Education & Activities + + + + + + + Importance + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + From which university will you graduate? + + single_textbox + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Rate the Importance + + matrix_of_choices_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Education + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Knowledge + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + What is your gender? + + multiple_choice_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + 1 + Male + + + + + + 1 + Female + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + What age group do you belong to? + + multiple_choice_only_one_ans + The comment you entered is in an invalid format. + + + + Other + + + + + + 1 + 0 - 15 + + + + + 1 + 16 - 20 + + + + + 1 + 21 - 30 + + + + + 1 + 31 - 40 + + + + + 1 + 41 - 50 + + + + + 1 + 51 - 60 + + + + + 1 + 61 - 70 + + + + + 1 + 71 + + + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Exprience + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + 1 + do_not_validate + do_not_validate + Please enter a comment. + The choices need to add up to [enter sum here]. + + The comment you entered is in an invalid format. + + This question requires an answer. + + Activities + + comment + The comment you entered is in an invalid format. + + + + Other + + + + + + + + Not important + + + + + + + + Somewhat important + + + + + + + + Important + + + + + + + + Very important + + + + + + + + Most important + + + + + + + + 1 + Good pay + + + + + + + 1 + Getting on with colleagues + + + + + + + 1 + Office environment (décor, light, space etc) + + + + + + + 1 + Desk space + + + + + + + 1 + State of the art technology + + + + + + + 1 + Office location (proximity to home) + + + + + + + 1 + Good management/boss + + + + + + + 1 + Freebies such as tea, coffee and stationery + + + + + + + 1 + Perks such as free parking, gym passes etc + + + + + + + 1 + No out of hours working + + + + + + + 1 + Dress code + + + + + + + 1 + Regular meetings + + + + + + + 1 + Good social life (office nights out, good Christmas parties etc) + + + + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 1aa048670d5..24008e64843 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -7,7 +7,7 @@ hr_timesheet_sheet.sheet tree - + @@ -179,7 +179,8 @@ - + + @@ -268,7 +269,7 @@ search - + @@ -291,7 +292,7 @@ tree - + @@ -302,7 +303,7 @@ tree - + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 62481c8e929..2e3bf4b2d58 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -8,10 +8,7 @@ class project_issue_report(osv.osv): _columns = { 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"), 'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"), - 'probability': fields.float('Avg. Probability', readonly=True), - 'amount_revenue': fields.float('Est.Revenue', readonly=True), - 'amount_costs': fields.float('Est.Cost', readonly=True), - 'amount_revenue_prob': fields.float('Est. Rev*Prob.', readonly=True), + 'nbr': fields.integer('# of Issues', reaadonly=True), 'delay_close': fields.char('Delay to close', size=20, readonly=True), } def init(self, cr): @@ -28,10 +25,6 @@ class project_issue_report(osv.osv): c.categ_id, c.stage_id, count(*) as nbr, - sum(planned_revenue) as amount_revenue, - sum(planned_cost) as amount_costs, - sum(planned_revenue*probability/100)::decimal(16,2) as amount_revenue_prob, - avg(probability)::decimal(16,2) as probability, to_char(avg(date_closed-c.create_date), 'DD"d" HH24:MI:SS') as delay_close from project_issue c diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 08e663f66af..57c97ef6f89 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -289,9 +289,11 @@ form
- - - + + + + + @@ -317,8 +319,12 @@ + + - + + + diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 3962f288bda..101e1c563d3 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -740,9 +740,9 @@ class survey_question_wiz(osv.osv_memory): etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(" Response :- " + str(context['response_no'] + 1) +"/" + str(len(context['response_id'])) )), 'align':"0.0"}) if context['response_no'] > 0: etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_forward_previous",'string': tools.ustr("Previous Answer"),'type':"object"}) - if context['response_no'] + 1 == len(context['response_id']): + if context['response_no'] + 1 == len(context['response_id']) and context['response_no'] != 0: etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)}) - else: + elif context['response_no'] + 1 < len(context['response_id']): etree.SubElement(xml_group, 'button', {'colspan':"1",'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)}) if wiz_id: fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}} diff --git a/addons/survey/wizard/wizard_survey.py b/addons/survey/wizard/wizard_survey.py index 631b8d56aea..0b3d546e6d7 100755 --- a/addons/survey/wizard/wizard_survey.py +++ b/addons/survey/wizard/wizard_survey.py @@ -58,7 +58,7 @@ _survey_form = ''' _survey_fields = { - 'partner_ids': {'string':'Partner', 'type':'many2many', 'relation':'res.partner'}, + 'partner_ids': {'string':'Partner', 'type':'many2many', 'relation':'res.partner', 'required' : '1'}, 'send_mail': {'string':'Send mail for new user', 'type':'boolean', 'default':lambda *a: 1}, 'send_mail_existing': {'string':'Send reminder for existing user', 'type':'boolean', 'default':lambda *a: 1}, 'mail_subject': {'string':'Subject', 'type':'char', 'default':lambda *a: "New user account.", "size":256},