pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MOD]hr_*: usability improvement

Browse Source 
bzr revid: amp@tinyerp.com-20100918073924-3020grhwot6v837w
This commit is contained in:
AMP (OpenERP)
2010-09-18 13:09:24 +05:30
parent 01d5194378
commit b4a3da2cc0
4 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_contract/security/ir.model.access.csv
+1
View File
@@ -17,3 +17,4 @@
"access_hr_department_contract","hr.department.contract","hr.model_hr_department","base.group_hr_contract",1,1,1,1
"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
"access_hr_contract_employee","hr.contract.employee","model_hr_contract","base.group_user",1,0,0,0
"access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
17 access_hr_department_contract hr.department.contract hr.model_hr_department base.group_hr_contract 1 1 1 1
18 access_hr_contract_manager hr.contract.manager model_hr_contract base.group_hr_manager 1 1 1 1
19 access_hr_contract_employee hr.contract.employee model_hr_contract base.group_user 1 0 0 0
20 access_hr_contract_type_manager hr.contract.type.manager model_hr_contract_type base.group_hr_manager 1 1 1 1
addons/hr_evaluation/security/ir.model.access.csv
+1 -3
View File
@@ -12,12 +12,10 @@
"access_hr_evaluation_plan_phase_system","hr_evaluation.plan.phase.system","model_hr_evaluation_plan_phase","base.group_system",1,1,1,1
"access_hr_evaluation_evaluation_system","hr_evaluation.evaluation.system","model_hr_evaluation_evaluation","base.group_system",1,0,0,0
"access_hr_evaluation_interview_system","hr.evaluation.interview.system","model_hr_evaluation_interview","base.group_system",1,0,0,0
<<<<<<< TREE
"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
"access_hr_evaluation_interview_employee","hr.evaluation.interview.employee","model_hr_evaluation_interview","base.group_user",1,0,0,0
"access_hr_evaluation_user","hr_evaluation.user","model_hr_evaluation_plan","base.group_hr_user",1,0,0,0
"access_hr_evaluation_employee","hr_evaluation.employee","model_hr_evaluation_plan","base.group_user",1,0,0,0
=======
"access_survey_type_hr_manager","survey.type","survey.model_survey_type","base.group_hr_manager",1,1,1,1
"access_survey_hr_manager","survey.hr.manager","survey.model_survey","base.group_hr_manager",1,1,1,1
"access_survey_history_manager","survey.history","survey.model_survey_history","base.group_hr_manager",1,1,1,1
@@ -34,4 +32,4 @@
"access_survey_answer_hr_user","survey.answer.hr.user","survey.model_survey_answer","base.group_hr_user",1,1,1,0
"access_survey_response_answer_hr_user","survey.response.answer.hr.user","survey.model_survey_response_answer","base.group_hr_user",1,1,1,0
"access_survey_type_hr_user","survey.type.hr.user","survey.model_survey_type","base.group_hr_user",1,1,1,0
"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0>>>>>>> MERGE-SOURCE
"access_survey_question_hr_user","survey.question.hr.user","survey.model_survey_question","base.group_hr_user",1,1,1,0>>>>>>>
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
12 access_hr_evaluation_plan_phase_system hr_evaluation.plan.phase.system model_hr_evaluation_plan_phase base.group_system 1 1 1 1
13 access_hr_evaluation_evaluation_system hr_evaluation.evaluation.system model_hr_evaluation_evaluation base.group_system 1 0 0 0
14 access_hr_evaluation_interview_system hr.evaluation.interview.system model_hr_evaluation_interview base.group_system 1 0 0 0
<<<<<<< TREE
15 access_hr_evaluation_evaluation_employee hr_evaluation.evaluation.employee model_hr_evaluation_evaluation base.group_user 1 0 0 0
16 access_hr_evaluation_interview_employee hr.evaluation.interview.employee model_hr_evaluation_interview base.group_user 1 0 0 0
17 access_hr_evaluation_user hr_evaluation.user model_hr_evaluation_plan base.group_hr_user 1 0 0 0
18 access_hr_evaluation_employee hr_evaluation.employee model_hr_evaluation_plan base.group_user 1 0 0 0
=======
19 access_survey_type_hr_manager survey.type survey.model_survey_type base.group_hr_manager 1 1 1 1
20 access_survey_hr_manager survey.hr.manager survey.model_survey base.group_hr_manager 1 1 1 1
21 access_survey_history_manager survey.history survey.model_survey_history base.group_hr_manager 1 1 1 1
32 access_survey_answer_hr_user survey.answer.hr.user survey.model_survey_answer base.group_hr_user 1 1 1 0
33 access_survey_response_answer_hr_user survey.response.answer.hr.user survey.model_survey_response_answer base.group_hr_user 1 1 1 0
34 access_survey_type_hr_user survey.type.hr.user survey.model_survey_type base.group_hr_user 1 1 1 0
35 access_survey_question_hr_user survey.question.hr.user survey.model_survey_question base.group_hr_user 1 1 1 0>>>>>>> MERGE-SOURCE 0>>>>>>>
addons/hr_timesheet/security/ir.model.access.csv
-3
View File
@@ -7,12 +7,9 @@
"access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,0,0,0
"access_hr_analytic_timesheet_manager","hr.analytic.timesheet.manager","model_hr_analytic_timesheet","base.group_hr_manager",1,1,1,1
"access_hr_analytic_timesheet_system","hr.analytic.timesheet.system","model_hr_analytic_timesheet","base.group_system",1,0,0,0
<<<<<<< TREE
"access_hr_account_analytic_line_manager","account.account.analytic.line.manager","account.model_account_analytic_line","base.group_hr_manager",1,1,1,1
"access_account_analytic_journal_manager","account.account.analytic.journal.manager","account.model_account_analytic_journal","base.group_hr_manager",1,1,1,1
"access_product_product_manager","product.product.manager","product.model_product_product","base.group_hr_manager",1,1,1,1
"access_product_template_hr_timesheet_manager","product.template.hr.timesheet.manager","product.model_product_template","base.group_hr_manager",1,1,1,1
"access_product_uom_hr_timesheet_manager","product.uom.hr.timesheet.manager","product.model_product_uom","base.group_hr_manager",1,1,1,1
=======
"access_hr_analytic_timesheet_employee","hr.analytic.timesheet.employee","model_hr_analytic_timesheet","base.group_user",1,1,1,0
>>>>>>> MERGE-SOURCE
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
7 access_product_uom_hr_timesheet product.uom.hr.timesheet product.model_product_uom base.group_hr_user 1 0 0 0
8 access_hr_analytic_timesheet_manager hr.analytic.timesheet.manager model_hr_analytic_timesheet base.group_hr_manager 1 1 1 1
9 access_hr_analytic_timesheet_system hr.analytic.timesheet.system model_hr_analytic_timesheet base.group_system 1 0 0 0
<<<<<<< TREE
10 access_hr_account_analytic_line_manager account.account.analytic.line.manager account.model_account_analytic_line base.group_hr_manager 1 1 1 1
11 access_account_analytic_journal_manager account.account.analytic.journal.manager account.model_account_analytic_journal base.group_hr_manager 1 1 1 1
12 access_product_product_manager product.product.manager product.model_product_product base.group_hr_manager 1 1 1 1
13 access_product_template_hr_timesheet_manager product.template.hr.timesheet.manager product.model_product_template base.group_hr_manager 1 1 1 1
14 access_product_uom_hr_timesheet_manager product.uom.hr.timesheet.manager product.model_product_uom base.group_hr_manager 1 1 1 1
=======
15 access_hr_analytic_timesheet_employee hr.analytic.timesheet.employee model_hr_analytic_timesheet base.group_user 1 1 1 0
>>>>>>> MERGE-SOURCE
addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
-4
View File
@@ -21,7 +21,6 @@
</field>
</record>
<<<<<<< TREE
<!--record id="view_account_analytic_account_form" model="ir.ui.view">
<field name="name">account.analytic.account.form</field>
<field name="model">account.analytic.account</field>
@@ -33,9 +32,6 @@
</field>
</field>
</record-->
=======
>>>>>>> MERGE-SOURCE
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>