odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Merge]: Merge 

bzr revid: rpa@openerp.co.in-20100121130549-i5dmmhctrmvom3yj
This commit is contained in:
rpa (Open ERP) 2010-01-21 18:35:49 +05:30
parent 528291793a 13460bde68
commit 3c820d77a4
15 changed files with 564 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/crm_hr/__terp__.py
View File

@ -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'

445
addons/crm_hr/crm_hr_data.xml
View File

@ -1,76 +1,479 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="1">
<!-- CASE CATEGORY(categ_id) -->
<record model="crm.case.categ" id="categ_job1">
<field name="name">Salesman</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.categ" id="categ_job2">
<field name="name">Junior Developer</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<!-- Resource(type_id) -->
<record model="crm.case.resource.type" id="type_job1">
<field name="name">Graduate</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.resource.type" id="type_job2">
<field name="name">Licenced</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.resource.type" id="type_job3">
<field name="name"> > Bac +5</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<!-- STAGE(stage_id) -->
<record model="crm.case.stage" id="stage_job1">
<field name="name">Initial Jobs Demand</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job2">
<field name="name">First Interview</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job3">
<field name="name">Second Interview</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job4">
<field name="name">Contract Proposed</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.claim')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job5">
<field name="name">Contract Signed</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job6">
<field name="name">Refused by Employee</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
<record model="crm.case.stage" id="stage_job7">
<field name="name">Refused by Company</field>
<field name="section_id" ref="crm.section_sales_department"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="object_id" search="[('model','=','crm.job')]" model="ir.model"/>
</record>
</data>
<data>
<record id="survey_job_0" model="survey">
<field name="title">Job Survey</field>
<field name="state">draft</field>
<field eval="[(6,0,[])]" name="users"/>
</record>
</data>
<data>
<record id="survey_page_job_0" model="survey.page">
<field name="title">Default Section</field>
<field name="survey_id" ref="survey_job_0"/>
<field eval="1" name="sequence"/>
</record>
</data>
<data>
<record id="survey_page_job_1" model="survey.page">
<field name="title">Education &amp;amp; Activities</field>
<field name="survey_id" ref="survey_job_0"/>
<field eval="2" name="sequence"/>
</record>
</data>
<data>
<record id="survey_page_job_2" model="survey.page">
<field name="title">Importance</field>
<field name="survey_id" ref="survey_job_0"/>
<field eval="3" name="sequence"/>
</record>
</data>
<data>
<record id="survey_question_job_0" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="1" name="sequence"/>
<field name="question">From which university will you graduate?</field>
<field eval="0" name="is_require_answer"/>
<field name="type">single_textbox</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_0"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_job_1" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="1" name="sequence"/>
<field name="question">Rate the Importance</field>
<field eval="0" name="is_require_answer"/>
<field name="type">matrix_of_choices_only_one_ans</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_2"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_job_2" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="1" name="sequence"/>
<field name="question">Education</field>
<field eval="0" name="is_require_answer"/>
<field name="type">comment</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_1"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_job_3" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="2" name="sequence"/>
<field name="question">Knowledge</field>
<field eval="0" name="is_require_answer"/>
<field name="type">comment</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_1"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_job_4" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="2" name="sequence"/>
<field name="question">What is your gender?</field>
<field eval="0" name="is_require_answer"/>
<field name="type">multiple_choice_only_one_ans</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_0"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
<record id="survey_answer_job_70" model="survey.answer">
<field name="answer">Male</field>
<field name="question_id" ref="crm_hr.survey_question_job_4"/>
<field eval="1" name="sequence"/>
</record>
<record id="survey_answer_job_71" model="survey.answer">
<field name="answer">Female</field>
<field name="question_id" ref="crm_hr.survey_question_job_4"/>
<field eval="2" name="sequence"/>
</record>
</data>
<data>
<record id="survey_question_job_5" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="3" name="sequence"/>
<field name="question">What age group do you belong to?</field>
<field eval="0" name="is_require_answer"/>
<field name="type">multiple_choice_only_one_ans</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_0"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
<record id="survey_answer_job_81" model="survey.answer">
<field name="answer">0 - 15</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="1" name="sequence"/>
</record>
<record id="survey_answer_job_82" model="survey.answer">
<field name="answer">16 - 20</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="2" name="sequence"/>
</record>
<record id="survey_answer_job_83" model="survey.answer">
<field name="answer">21 - 30</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="3" name="sequence"/>
</record>
<record id="survey_answer_job_84" model="survey.answer">
<field name="answer">31 - 40</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="4" name="sequence"/>
</record>
<record id="survey_answer_job_85" model="survey.answer">
<field name="answer">41 - 50</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="5" name="sequence"/>
</record>
<record id="survey_answer_job_86" model="survey.answer">
<field name="answer">51 - 60</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="6" name="sequence"/>
</record>
<record id="survey_answer_job_87" model="survey.answer">
<field name="answer">61 - 70</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="7" name="sequence"/>
</record>
<record id="survey_answer_job_88" model="survey.answer">
<field name="answer">71 +</field>
<field name="question_id" ref="crm_hr.survey_question_job_5"/>
<field eval="8" name="sequence"/>
</record>
</data>
<data>
<record id="survey_question_job_6" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="3" name="sequence"/>
<field name="question">Exprience</field>
<field eval="0" name="is_require_answer"/>
<field name="type">comment</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_1"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_job_7" model="survey.question">
<field name="validation_type">do_not_validate</field>
<field name="comment_valid_type">do_not_validate</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
<field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
<field eval="0" name="comment_column"/>
<field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="rating_allow_one_column_require"/>
<field name="req_error_msg">This question requires an answer.</field>
<field eval="4" name="sequence"/>
<field name="question">Activities</field>
<field eval="0" name="is_require_answer"/>
<field name="type">comment</field>
<field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
<field eval="0" name="make_comment_field"/>
<field eval="1" name="in_visible_menu_choice"/>
<field name="page_id" ref="survey_page_job_1"/>
<field name="comment_label">Other</field>
<field eval="1" name="in_visible_rating_weight"/>
<field eval="0" name="allow_comment"/>
</record>
</data>
<data>
<record id="survey_question_column_heading_job_0" model="survey.question.column.heading">
<field eval="1" name="in_visible_menu_choice"/>
<field name="title">Not important</field>
<field eval="1" name="in_visible_rating_weight"/>
<field name="question_id" ref="survey_question_job_1"/>
</record>
</data>
<data>
<record id="survey_question_column_heading_job_1" model="survey.question.column.heading">
<field eval="1" name="in_visible_menu_choice"/>
<field name="title">Somewhat important</field>
<field eval="1" name="in_visible_rating_weight"/>
<field name="question_id" ref="survey_question_job_1"/>
</record>
</data>
<data>
<record id="survey_question_column_heading_job_2" model="survey.question.column.heading">
<field eval="1" name="in_visible_menu_choice"/>
<field name="title">Important</field>
<field eval="1" name="in_visible_rating_weight"/>
<field name="question_id" ref="survey_question_job_1"/>
</record>
</data>
<data>
<record id="survey_question_column_heading_job_3" model="survey.question.column.heading">
<field eval="1" name="in_visible_menu_choice"/>
<field name="title">Very important</field>
<field eval="1" name="in_visible_rating_weight"/>
<field name="question_id" ref="survey_question_job_1"/>
</record>
</data>
<data>
<record id="survey_question_column_heading_job_4" model="survey.question.column.heading">
<field eval="1" name="in_visible_menu_choice"/>
<field name="title">Most important</field>
<field eval="1" name="in_visible_rating_weight"/>
<field name="question_id" ref="survey_question_job_1"/>
</record>
</data>
<data>
<record id="survey_answer_job_0" model="survey.answer">
<field name="answer">Good pay</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="1" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_1" model="survey.answer">
<field name="answer">Getting on with colleagues</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="2" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_2" model="survey.answer">
<field name="answer">Office environment (décor, light, space etc)</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="3" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_3" model="survey.answer">
<field name="answer">Desk space</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="4" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_4" model="survey.answer">
<field name="answer">State of the art technology</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="5" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_5" model="survey.answer">
<field name="answer">Office location (proximity to home)</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="6" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_6" model="survey.answer">
<field name="answer">Good management/boss</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="7" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_7" model="survey.answer">
<field name="answer">Freebies such as tea, coffee and stationery</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="8" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_8" model="survey.answer">
<field name="answer">Perks such as free parking, gym passes etc</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="9" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_9" model="survey.answer">
<field name="answer">No out of hours working</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="10" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_10" model="survey.answer">
<field name="answer">Dress code</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="11" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_11" model="survey.answer">
<field name="answer">Regular meetings</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="12" name="sequence"/>
</record>
</data>
<data>
<record id="survey_answer_job_12" model="survey.answer">
<field name="answer">Good social life (office nights out, good Christmas parties etc)</field>
<field name="question_id" ref="crm_hr.survey_question_job_1"/>
<field eval="13" name="sequence"/>
</record>
</data>
</openerp>

1
addons/document/document_storage.py
View File

@ -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

1
addons/document_ics/document_ics.py
View File

@ -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

1
addons/hr_attendance/wizard/print_attendance_error.py
View File

@ -22,6 +22,7 @@
import wizard
import time
import pooler
from tools.translate import _
_date_form = '''<?xml version="1.0"?>
<form string="Select a time span">

2
addons/hr_evaluation/__terp__.py
View File

@ -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"],

94
addons/hr_evaluation/hr_evaluation_data.xml
View File

@ -1287,4 +1287,98 @@ Once the form had been filled, the employee send it to his supervisor.
<field name="question_id" ref="survey_question_9"/>
</record>
</data>
<data noupdate="1">
<record id="survey_request_1" model="survey.request">
<field name="state">waiting_answer</field>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field name="user_id" ref="base.user_root"/>
<field name="email">fp@tinyerp.com</field>
<field name="date_deadline">2010-02-21</field>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
<field eval="1" name="active"/>
<field eval="6" name="month_next"/>
<field name="name">Manager's Evaluation Plan</field>
<field eval="3" name="month_first"/>
<field name="company_id" ref="base.main_company"/>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_plan_phase_sendtosubordinates0" model="hr_evaluation.plan.phase">
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="name">Send to Subordinates</field>
<field eval="0" name="send_anonymous_manager"/>
<field eval="1" name="sequence"/>
<field name="company_id" ref="base.main_company"/>
<field name="action">bottom-up</field>
<field eval="0" name="send_anonymous_employee"/>
<field eval="0" name="send_answer_employee"/>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field eval="0" name="send_answer_manager"/>
<field eval="0" name="wait"/>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_plan_phase_sendtomanagers0" model="hr_evaluation.plan.phase">
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="name">Send to Managers</field>
<field eval="0" name="send_anonymous_manager"/>
<field eval="2" name="sequence"/>
<field name="company_id" ref="base.main_company"/>
<field name="action">top-down</field>
<field eval="0" name="send_anonymous_employee"/>
<field eval="0" name="send_answer_employee"/>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field eval="0" name="send_answer_manager"/>
<field eval="0" name="wait"/>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="name">Send to Employee</field>
<field eval="0" name="send_anonymous_manager"/>
<field eval="3" name="sequence"/>
<field name="company_id" ref="base.main_company"/>
<field name="action">self</field>
<field eval="0" name="send_anonymous_employee"/>
<field eval="0" name="send_answer_employee"/>
<field name="survey_id" ref="hr_evaluation.survey_2"/>
<field eval="0" name="send_answer_manager"/>
<field eval="0" name="wait"/>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_plan_phase_finalinterviewwithmanager0" model="hr_evaluation.plan.phase">
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="name">Final Interview With Manager</field>
<field eval="0" name="send_anonymous_manager"/>
<field eval="4" name="sequence"/>
<field name="company_id" ref="base.main_company"/>
<field name="action">final</field>
<field eval="0" name="send_anonymous_employee"/>
<field eval="0" name="send_answer_employee"/>
<field name="survey_id" ref="crm_hr.survey_job_0"/>
<field eval="0" name="send_answer_manager"/>
<field eval="1" name="wait"/>
</record>
</data>
<data noupdate="1">
<record id="hr_evaluation_evaluation_0" model="hr_evaluation.evaluation">
<field name="rating">0</field>
<field name="employee_id" ref="hr.employee1"/>
<field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
<field name="state">draft</field>
<field eval="[(6,0,[ref('survey_request_1')])]" name="survey_request_ids"/>
<field name="date">2010-01-21</field>
<field name="phase_id" ref="hr_evaluation_plan_phase_sendtomanagers0"/>
<field name="manager_id" ref="base.user_root"/>
</record>
</data>
</openerp>

1
addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
View File

@ -22,6 +22,7 @@
import wizard
import datetime
import pooler
from tools.translate import _
form='''<?xml version="1.0"?>
<form string="Choose">

4
addons/project/project.py
View File

@ -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

9
addons/project/project_view.xml
View File

@ -471,10 +471,6 @@
<field name="arch" type="xml">
<search string="Task Edition">
<group col="20" colspan="4">
<filter string="By Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
<separator orientation="vertical"/>
<filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/>
<filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
<filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
@ -488,6 +484,11 @@
<filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="gtk-execute" separator="1"/>
</field>
</group>
<group expand="1" string="Group By..." colspan="4" col="20">
<filter string="By Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
</group>
</search>
</field>
</record>

12
addons/project_gtd/project_gtd.py
View File

@ -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 ='''<newline/><group col="%d">''' % (len(tt)+6,)
search_extended ='''<newline/><group col="%d" expand="1" string="%s">''' % (len(tt)+6,_('Getting Things Done'))
search_extended += '''<filter domain="[('timebox_id','=', False)]" icon="gtk-new" string="Inbox"/>'''
search_extended += '''<separator orientation="vertical"/>'''
for time in tt:

1
addons/purchase_manual/wizard/wizard_purchase_line_invoice.py
View File

@ -24,6 +24,7 @@ import netsvc
import ir
import pooler
from osv import osv
from tools.translate import _
invoice_form = """<?xml version="1.0"?>
<form string="Control invoices">

1
addons/sale_crm/wizard/makesale.py
View File

@ -25,6 +25,7 @@ import wizard
import netsvc
import ir
import pooler
from tools.translate import _
sale_form = """<?xml version="1.0"?>
<form string="Convert to Quote">

15
addons/survey/survey_demo.xml
View File

@ -761,6 +761,11 @@
<field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
<field name="sequence" eval="1"/>
</record>
<record id="survey_answer_no" model="survey.answer">
<field name="answer">No</field>
<field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
<field name="sequence" eval="2"/>
</record>
<record id="survey_question_odoo_continue_using_odoo" model="survey.question">
<field name="make_comment_field">True</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>
@ -984,11 +989,17 @@
<field name="in_visible_single_text">1</field>
<field name="sequence" eval="2"/>
</record>
<record id="survey_answer_No" model="survey.answer">
<field name="answer">No</field>
<record id="survey_answer_YES" model="survey.answer">
<field name="answer">YES</field>
<field name="question_id" ref="survey_question_odoo_dms" />
<field name="sequence" eval="1"/>
</record>
<record id="survey_answer_No" model="survey.answer">
<field name="answer">No</field>
<field name="question_id" ref="survey_question_odoo_dms" />
<field name="sequence" eval="2"/>
</record>
<record id="survey_question_odoo_dms" model="survey.question">
<field name="make_comment_field">True</field>
<field name="make_comment_field_err_msg">Please enter a comment.</field>

12
addons/survey/survey_view.xml
View File

@ -43,7 +43,7 @@
<field name="in_visible_menu_choice" invisible="1"/>
<notebook colspan="4">
<page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
</group>
<group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
@ -93,7 +93,7 @@
<group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
<field name="column_name" colspan="2"/>
</group>
</group>
</group>
</page>
<page string="Validation" attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
<group col="6" colspan="4">
@ -279,7 +279,7 @@
<field name="in_visible_menu_choice" invisible="1"/>
<notebook colspan="4">
<page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
</group>
<group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
@ -463,7 +463,7 @@
<field name="in_visible_menu_choice" invisible="1"/>
<notebook colspan="4">
<page string="Answer" attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<group colspan="4" attrs="{'invisible':[('type','=','table')]}">
<field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
</group>
<group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
@ -957,7 +957,7 @@
<field name="arch" type="xml">
<form string="Survey Request">
<field name="date_deadline"/>
<field name="survey_id"/>
<field name="survey_id" widget="selection"/>
<field name="user_id" on_change="on_change_user(user_id)"/>
<field name="email"/>
<field name="answer_ids" nolabel="1" colspan="4"/>
@ -978,7 +978,7 @@
<field name="arch" type="xml">
<tree string="Survey Request">
<field name="date_deadline"/>
<field name="survey_id" />
<field name="survey_id" widget="selection"/>
<field name="email" />
<field name="state" />
</tree>