From 5b2852e44286719be48483cc253539d8446b3667 Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Mon, 7 Dec 2009 11:37:06 +0100 Subject: [PATCH 01/13] [IMP] Disallow connection to PostgreSQL with postgres user himself (security flaws) bzr revid: christophe.chauvet@syleam.fr-20091207103706-vp3sc1gydbjtqmzg --- bin/openerp-server.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/openerp-server.py b/bin/openerp-server.py index 33b5fef9aeb..2d445070011 100755 --- a/bin/openerp-server.py +++ b/bin/openerp-server.py @@ -70,6 +70,12 @@ logger = netsvc.Logger() #----------------------------------------------------------------------- import tools +# Check if the connection to PostgreSQL don't use postgres user +if tools.config['db_user'] == 'postgres': + sys.stderr.write("Attempted to connected database with postgres user." \ + " This is a security flaws, aborting.\n") + sys.exit(1) + logger.notifyChannel("server", netsvc.LOG_INFO, "version - %s" % release.version ) for name, value in [('addons_path', tools.config['addons_path']), ('database hostname', tools.config['db_host'] or 'localhost'), From 44b340bf91f52d0341f58f73796c5de34677065a Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 11 Mar 2010 11:21:33 +0530 Subject: [PATCH 02/13] [REVIEW]: code formatting and add comment * remove tabs and place space(4) bzr revid: mga@mga-20100311055133-cftf0r5zuya3uax8 --- bin/netsvc.py | 4 +--- bin/pooler.py | 3 +-- bin/tiny_socket.py | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index eae53826a74..475bbc33ba7 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -151,9 +151,7 @@ def init_logger(): if tools.config['syslog']: # SysLog Handler if os.name == 'nt': - handler = logging.handlers.NTEventLogHandler("%s %s" % - (release.description, - release.version)) + handler = logging.handlers.NTEventLogHandler("%s %s" % (release.description, release.version)) else: handler = logging.handlers.SysLogHandler('/dev/log') formatter = logging.Formatter("%s %s" % (release.description, release.version) + ':%(levelname)s:%(name)s:%(message)s') diff --git a/bin/pooler.py b/bin/pooler.py index 81382924e26..e0a0ff22d7c 100644 --- a/bin/pooler.py +++ b/bin/pooler.py @@ -24,7 +24,7 @@ pool_dic = {} def get_db_and_pool(db_name, force_demo=False, status=None, update_module=False): if not status: status={} - + db = get_db_only(db_name) if db_name in pool_dic: @@ -81,4 +81,3 @@ def get_pool(db_name, force_demo=False, status=None, update_module=False): return pool # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/bin/tiny_socket.py b/bin/tiny_socket.py index cb51aefc140..6a0d9371ef5 100644 --- a/bin/tiny_socket.py +++ b/bin/tiny_socket.py @@ -25,12 +25,20 @@ import cStringIO import marshal class Myexception(Exception): + """ + custome exception object store + * faultcode + * faulestring + * args + """ + def __init__(self, faultCode, faultString): self.faultCode = faultCode self.faultString = faultString self.args = (faultCode, faultString) class mysocket: + def __init__(self, sock=None): if sock is None: self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) @@ -40,14 +48,17 @@ class mysocket: # prepare this socket for long operations: it may block for infinite # time, but should exit as soon as the net is down self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) + def connect(self, host, port=False): if not port: protocol, buf = host.split('//') host, port = buf.split(':') self.sock.connect((host, int(port))) + def disconnect(self): self.sock.shutdown(socket.SHUT_RDWR) self.sock.close() + def mysend(self, msg, exception=False, traceback=None): msg = cPickle.dumps([msg,traceback]) size = len(msg) @@ -59,6 +70,7 @@ class mysocket: if sent == 0: raise RuntimeError, "socket connection broken" totalsent = totalsent + sent + def myreceive(self): buf='' while len(buf) < 8: @@ -89,6 +101,3 @@ class mysocket: raise res[0] else: return res[0] - - - From 41ce0509ac37f2ee3683d2a61ce2e180b842d49a Mon Sep 17 00:00:00 2001 From: "Harry (Open ERP)" Date: Thu, 11 Mar 2010 12:54:30 +0530 Subject: [PATCH 03/13] [IMP] act_window: Add new options in act_window to set key2 value bzr revid: hmo@tinyerp.com-20100311072430-m2lmwng09vmdsrtu --- bin/import_xml.rng | 1 + bin/tools/convert.py | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/import_xml.rng b/bin/import_xml.rng index 1e1167656b0..e637d42f123 100644 --- a/bin/import_xml.rng +++ b/bin/import_xml.rng @@ -193,6 +193,7 @@ + diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 2e16237f50a..75b438cc6ea 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -369,9 +369,10 @@ form: module.record_id""" % (xml_id,) domain = rec.get('domain','').encode('utf-8') or '{}' context = rec.get('context','').encode('utf-8') or '{}' res_model = rec.get('res_model','').encode('utf-8') - src_model = rec.get('src_model','').encode('utf-8') + src_model = rec.get('src_model','').encode('utf-8') view_type = rec.get('view_type','').encode('utf-8') or 'form' view_mode = rec.get('view_mode','').encode('utf-8') or 'tree,form' + usage = rec.get('usage','').encode('utf-8') limit = rec.get('limit','').encode('utf-8') auto_refresh = rec.get('auto_refresh','').encode('utf-8') @@ -419,7 +420,8 @@ form: module.record_id""" % (xml_id,) self.idref[xml_id] = int(id) if src_model: - keyword = 'client_action_relate' + #keyword = 'client_action_relate' + keyword = rec.get('key2','').encode('utf-8') or 'client_action_relate' keys = [('action', keyword), ('res_model', res_model)] value = 'ir.actions.act_window,'+str(id) replace = rec.get('replace','') or True From 41f1c7f21786916829ac7694d5a1e26c22d5ae51 Mon Sep 17 00:00:00 2001 From: "nch@tinyerp.com" <> Date: Thu, 11 Mar 2010 17:12:51 +0530 Subject: [PATCH 04/13] [FIX]:groupby syntex in account_invoice bzr revid: nch@tinyerp.com-20100311114251-h30ewk8742mvwuuu --- addons/account/account_invoice_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - - + + From d9c5b69c4166abc4e565909bc3c724dd057dc00f Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Thu, 11 Mar 2010 17:33:01 +0530 Subject: [PATCH 05/13] [FIX] Delivery : Proper Weight calculation of stock picking lp bug: https://launchpad.net/bugs/519220 fixed bzr revid: jvo@tinyerp.com-20100311120301-unq2j5pdo7ihcid7 --- addons/delivery/delivery_view.xml | 120 ++++++++++++++++++++++++++++++ addons/delivery/stock.py | 41 +++++++--- 2 files changed, 152 insertions(+), 9 deletions(-) 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: From e0ed681a416aadfc47e0ea43ad14892376c53bf5 Mon Sep 17 00:00:00 2001 From: "YYA(OpenERP)" <> Date: Thu, 11 Mar 2010 19:01:02 +0530 Subject: [PATCH 06/13] [IMP] hr_evulation: demo data modified [IMP] survey: improve survey [IMP] hr_recruitment: demo and data file modified bzr revid: mra@tinyerp.com-20100311133102-ihp86dfasrn4ia6e --- addons/hr_evaluation/__terp__.py | 3 +- addons/hr_evaluation/hr_evaluation_data.xml | 1604 ------------------ addons/hr_evaluation/hr_evaluation_demo.xml | 1618 ++++++++++++++++++- addons/hr_recruitment/hr_hr_data.xml | 435 ----- addons/hr_recruitment/hr_hr_demo.xml | 435 +++++ addons/survey/survey.py | 4 +- addons/survey/wizard/wizard_survey.py | 2 +- 7 files changed, 2054 insertions(+), 2047 deletions(-) delete mode 100644 addons/hr_evaluation/hr_evaluation_data.xml 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/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}, From a41b35fa7fe9578f22bf102f17de4c0777641bbc Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 11 Mar 2010 14:29:21 +0100 Subject: [PATCH 07/13] [FIX] hr_attendance,hr_timesheet_sheet: Remove the action description in the search view and tree view bzr revid: stephane@openerp.com-20100311132921-80582428vofug1nu --- addons/hr_attendance/hr_attendance_view.xml | 2 -- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) 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_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 1aa048670d5..6c62b855f5a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -268,7 +268,7 @@ search - + @@ -291,7 +291,7 @@ tree - + @@ -302,7 +302,7 @@ tree - + From 1629f7cc7532cabb50912d53efc59aabdc641c6f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 11 Mar 2010 14:32:58 +0100 Subject: [PATCH 08/13] [FIX] hr_timesheet_sheet: Remove the editable attribute on the tree view, we will use the default form to create a new timesheet sheet bzr revid: stephane@openerp.com-20100311133258-hl1g5jg4fjlywb5i --- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 6c62b855f5a..08d5f7f9776 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 - + From 795cf7129e8c4d0934eb9d27fede052d1c4c7d60 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Thu, 11 Mar 2010 14:39:05 +0100 Subject: [PATCH 09/13] [FIX] hr_timesheet_sheet: Add a new button in the search view, only show the confirmed sheets bzr revid: stephane@openerp.com-20100311133905-0kbhuy9yy02a4uqe --- addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 08d5f7f9776..24008e64843 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -179,7 +179,8 @@ - + + From 771b0336557e7bd351c49bb7323ec6b76b95d07a Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 11 Mar 2010 19:42:46 +0530 Subject: [PATCH 10/13] [IMP]: improvement in trigger server action [ADD]: add new server action called copy bzr revid: mga@mga-20100311141246-vomrixgaz3ajn0ef --- bin/addons/base/ir/ir.xml | 5 ++-- bin/addons/base/ir/ir_actions.py | 48 ++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index a13764e8733..0c280d2c0b3 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -1252,9 +1252,10 @@