diff --git a/addons/crm_hr/__terp__.py b/addons/crm_hr/__terp__.py index afa94c81178..3faec9b3b96 100644 --- a/addons/crm_hr/__terp__.py +++ b/addons/crm_hr/__terp__.py @@ -26,21 +26,21 @@ 'version': '1.0', 'category': 'Generic Modules/CRM & SRM', 'description': """ - This module provide Store the Job + This module provide Store the Job """, 'author': 'Tiny', 'website': 'http://www.openerp.com', - 'depends': ['crm','hr','board_crm_configuration'], + 'depends': ['crm','hr','board_crm_configuration','survey'], 'init_xml': [ 'crm_hr_data.xml' ], 'update_xml': [ - 'crm_hr_wizard.xml', + 'crm_hr_wizard.xml', 'crm_hr_view.xml', 'crm_hr_menu.xml', 'report_crm_hr_view.xml', 'security/crm_hr_security.xml', - 'board_crm_hr_statistical_view.xml', + 'board_crm_hr_statistical_view.xml', ], 'demo_xml': [ 'crm_hr_demo.xml' diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml index 94a47be6d2f..8d8f6c2ee94 100644 --- a/addons/crm_hr/crm_hr_data.xml +++ b/addons/crm_hr/crm_hr_data.xml @@ -1,76 +1,479 @@ - + - + Salesman - + - + Junior Developer - - - + + + - + Graduate - - + + Licenced - + > Bac +5 - + - + - + Initial Jobs Demand - + First Interview - + Second Interview - + Contract Proposed - + Contract Signed - + Refused by Employee - + Refused by Company - + + + + + + + Job Survey + draft + + + + + + Default Section + + + + + + + Education & Activities + + + + + + + Importance + + + + + + + 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 + + + + + + + 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 + + + + + + + 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 + + + + + + + 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 + + + + + + + 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 + + + + + + Male + + + + + + Female + + + + + + + + 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 + + + + + + 0 - 15 + + + + + 16 - 20 + + + + + 21 - 30 + + + + + 31 - 40 + + + + + 41 - 50 + + + + + 51 - 60 + + + + + 61 - 70 + + + + + 71 + + + + + + + + + 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 + + + + + + + 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 + + + + + + + + Good pay + + + + + + + Getting on with colleagues + + + + + + + Office environment (décor, light, space etc) + + + + + + + Desk space + + + + + + + State of the art technology + + + + + + + Office location (proximity to home) + + + + + + + Good management/boss + + + + + + + Freebies such as tea, coffee and stationery + + + + + + + Perks such as free parking, gym passes etc + + + + + + + No out of hours working + + + + + + + Dress code + + + + + + + Regular meetings + + + + + + + Good social life (office nights out, good Christmas parties etc) + + + + + diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index 54e4ad3f9cf..d09bc62d325 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -25,6 +25,7 @@ import os import tools import base64 from tools.misc import ustr +from tools.translate import _ from osv.orm import except_orm diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py index 150d44df4b6..acda761b279 100644 --- a/addons/document_ics/document_ics.py +++ b/addons/document_ics/document_ics.py @@ -30,6 +30,7 @@ import random import tools import re +from tools.translate import _ from document.nodes import node_content from tools.safe_eval import safe_eval diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py index 234a878eb2e..cdddcaa0ddb 100644 --- a/addons/hr_attendance/wizard/print_attendance_error.py +++ b/addons/hr_attendance/wizard/print_attendance_error.py @@ -22,6 +22,7 @@ import wizard import time import pooler +from tools.translate import _ _date_form = '''
diff --git a/addons/hr_evaluation/__terp__.py b/addons/hr_evaluation/__terp__.py index 4dc5cb4eecd..27e55d16cf7 100644 --- a/addons/hr_evaluation/__terp__.py +++ b/addons/hr_evaluation/__terp__.py @@ -25,7 +25,7 @@ "author" : "Tiny", "category" : "Generic Modules/Human Resources", "website" : "http://www.openerp.com", - "depends" : ["hr","survey"], + "depends" : ["hr",'crm_hr'], "description": "Ability to create employees evaluation.", "init_xml" : [], "demo_xml" : ["hr_evaluation_demo.xml"], diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml index ba1951558f4..2a3d72d3ccd 100644 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -1287,4 +1287,98 @@ Once the form had been filled, the employee send it to his supervisor. + + + + + waiting_answer + + + fp@tinyerp.com + 2010-02-21 + + + + + + + Manager's Evaluation Plan + + + + + + + + Send to Subordinates + + + + bottom-up + + + + + + + + + + + Send to Managers + + + + top-down + + + + + + + + + + + Send to Employee + + + + self + + + + + + + + + + + Final Interview With Manager + + + + final + + + + + + + + + + 0 + + + draft + + 2010-01-21 + + + + + + diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py index 41fec24ae74..c2d4aecd171 100644 --- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py +++ b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py @@ -22,6 +22,7 @@ import wizard import datetime import pooler +from tools.translate import _ form=''' diff --git a/addons/project/project.py b/addons/project/project.py index 35e2db4d20a..765456ed964 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -493,7 +493,9 @@ class task(osv.osv): typeid = typ.type.id types = map(lambda x:x.id, typ.project_id.type_ids) if types: - if typeid and typeid in types and types.index(typeid) != len(types)-1 : + if not typeid: + self.write(cr, uid, typ.id, {'type': types[0]}) + elif typeid and typeid in types and types.index(typeid) != len(types)-1 : index = types.index(typeid) self.write(cr, uid, typ.id, {'type': types[index+1]}) return True diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index b0f7ca4df52..cde3f076df9 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -471,10 +471,6 @@ - - - - @@ -488,6 +484,11 @@ + + + + + diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index a6df9823cf1..076b3ae4b9e 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -29,6 +29,7 @@ import tools import netsvc from osv import fields, osv import ir +from tools.translate import _ class project_gtd_context(osv.osv): _name = "project.gtd.context" @@ -148,9 +149,12 @@ class project_task(osv.osv): timebox_ids = timebox_obj.search(cr,uid,[]) for task in self.browse(cr,uid,ids): timebox = task.timebox_id.id - if timebox and timebox_ids.index(timebox) != 0 : - index = timebox_ids.index(timebox) - self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index - 1]}) + if timebox: + if timebox_ids.index(timebox): + index = timebox_ids.index(timebox) + self.write(cr, uid, task.id, {'timebox_id': timebox_ids[index - 1]}) + else: + self.write(cr, uid, task.id, {'timebox_id': False}) return True def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): @@ -159,7 +163,7 @@ class project_task(osv.osv): timebox_obj = self.pool.get('project.gtd.timebox') if res['type'] == 'search': tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[])) - search_extended ='''''' % (len(tt)+6,) + search_extended ='''''' % (len(tt)+6,_('Getting Things Done')) search_extended += '''''' search_extended += '''''' for time in tt: diff --git a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py index 0982d5bbba6..0e30368d41b 100644 --- a/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py +++ b/addons/purchase_manual/wizard/wizard_purchase_line_invoice.py @@ -24,6 +24,7 @@ import netsvc import ir import pooler from osv import osv +from tools.translate import _ invoice_form = """ diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py index e366ceae814..fc2a27d479a 100644 --- a/addons/sale_crm/wizard/makesale.py +++ b/addons/sale_crm/wizard/makesale.py @@ -25,6 +25,7 @@ import wizard import netsvc import ir import pooler +from tools.translate import _ sale_form = """ diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml index f618e903b98..eafa1aad81e 100644 --- a/addons/survey/survey_demo.xml +++ b/addons/survey/survey_demo.xml @@ -761,6 +761,11 @@ + + No + + + True Please enter a comment. @@ -984,11 +989,17 @@ 1 - - No + + YES + + No + + + + True Please enter a comment. diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 443a43701e0..20bb9982aa5 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -43,7 +43,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -957,7 +957,7 @@ - + @@ -978,7 +978,7 @@ - +