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

New Menu Structure for HR and Knowledge Management

Browse Source 
bzr revid: vir@tinyerp.com-20100111114835-f05x3w6wl9bb47pa
This commit is contained in:
RCH(Open ERP)
2010-01-11 17:18:35 +05:30
committed by Vir (Open ERP)
parent 2415d1c4e0
commit 86644fee8b
24 changed files with 241 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/report/account_tax_code.py
+5 -5
View File
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -16,7 +16,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -47,15 +47,15 @@ def _record_to_report_line(record):
}
class account_tax_code_report(rml_parse.rml_parse):
#_name = 'report.account.tax.code.entries'
_name = 'report.account.tax.code.entries'
def __init__(self, cr, uid, name, context):
super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
'time': time,
'get_line':self.get_line,
})
def get_line(self, obj):
line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
if not line_ids: return []
addons/crm/crm_jobs_menu.xml
+13 -9
View File
@@ -8,9 +8,9 @@
<field name="name">All Jobs Requests</field>
<field name="res_model">crm.job</field>
<field name="view_mode">tree,calendar,form,graph</field>
<field name="view_id" ref="crm_case_tree_view_job"/>
<field name="view_id" ref="crm_case_tree_view_job"/>
<field name="context" eval="{'default_state':'open'}"/>
<field name="search_view_id" ref="crm.view_crm_case_jobs_filter"/>
<field name="search_view_id" ref="crm.view_crm_case_jobs_filter"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_act_job">
<field name="sequence" eval="1"/>
@@ -36,15 +36,19 @@
<field name="view_id" ref="crm_case_graph_view_job"/>
<field name="act_window_id" ref="crm_case_categ0_act_job"/>
</record>
<menuitem
name="Jobs - Hiring Process"
id="menu_crm_case_job_req_main"
<!--<menuitem
name="Jobs - Hiring Process"
id="menu_crm_case_job_req_main"
parent="menu_hr"/>-->
<menuitem
name="Recruitment"
id="menu_crm_case_job_req_main"
parent="menu_hr"/>
<!--
ALL JOBS REQUESTS
<!--
ALL JOBS REQUESTS
-->
<menuitem parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>
<menuitem name="Applicants" parent="menu_crm_case_job_req_main" id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job"/>
</data>
</openerp>
addons/document/document_view.xml
+13 -8
View File
@@ -1,7 +1,11 @@
<openerp>
<data>
<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>
<!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
<menuitem name="Knowledge Management" icon="terp-stock" id="menu_document"/>
<menuitem name="Configuration" id="menu_document_configuration" parent="menu_document" sequence="50"/>
<menuitem name="Document Management" id="menu_document_management_configuration" parent="menu_document_configuration" />
<record model="ir.ui.view" id="view_document_storage_form">
<field name="name">document.storage</field>
@@ -39,11 +43,11 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
<!-- <menuitem
name="Storage Media"
action="action_document_storage_form"
id="menu_document_storage_media"
parent="menu_document_configuration"/>
parent="menu_document_configuration"/>-->
<record model="ir.ui.view" id="view_document_directory_form">
<field name="name">document.directory</field>
@@ -133,7 +137,7 @@
name="Directories"
action="action_document_directory_form"
id="menu_document_directories"
parent="menu_document_configuration"/>
parent="menu_document_management_configuration"/>
<record model="ir.actions.act_window" id="action_document_directory_tree">
@@ -146,7 +150,7 @@
<menuitem
action="action_document_directory_tree"
id="menu_document_directories_tree"
parent="menu_document_configuration"/>
parent="menu_document_management_configuration" sequence="5"/>
<record model="ir.ui.view" id="view_document_file_form">
<field name="name">ir.attachment</field>
@@ -230,11 +234,12 @@
<field name="res_model">ir.attachment</field>
<field name="view_type">form</field>
</record>
<menuitem name="Documents" id="menu_document_doc" parent="menu_document" sequence="5"/>
<menuitem
name="Search a File"
action="action_document_file_form"
id="menu_document_files"
parent="menu_document"/>
parent="menu_document_doc"/>
<record model="ir.actions.act_window" id="action_document_file_directory_form">
<field name="type">ir.actions.act_window</field>
@@ -289,7 +294,7 @@
</field>
</field>
</record>
<act_window domain="[('partner_id', '=', active_id)]"
id="act_res_partner_document" name="Related Documents"
res_model="ir.attachment"
addons/document_ftp/document_ftp_view.xml
+6 -6
View File
@@ -1,19 +1,19 @@
<openerp>
<data>
<data>
<record model="ir.actions.url" id="action_document_browse">
<field name="name">Browse Files</field>
<field name="url">ftp://localhost:8021/</field>
</record>
<menuitem
name="Browse Files Using FTP"
name="Shared Repository (FTP)"
action="action_document_browse"
id="menu_document_browse"
type="url"
icon="STOCK_EXECUTE"
parent="document.menu_document"/>
parent="document.menu_document_doc" sequence="1"/>
<record id="view_auto_config_form" model="ir.ui.view">
<field name="name">Auto Configure Directory</field>
@@ -49,7 +49,7 @@
<field name="action_id" ref="action_config_auto_directory"/>
</record>
</data>
</openerp>
addons/hr/hr_department_view.xml
+3 -2
View File
@@ -47,7 +47,8 @@
<field name="view_type">tree</field>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
<menuitem action="open_module_tree_department_tree" id="menu_department_tree" parent="base.menu_users"/>
<record id="open_module_tree_department" model="ir.actions.act_window">
<field name="name">Departments</field>
@@ -56,7 +57,7 @@
</record>
<menuitem action="open_module_tree_department" id="menu_department_def" parent="hr.menu_department_tree"/>
<menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="menu_hr_human_resources"/>
<!-- res.users inherit -->
<record model="ir.ui.view" id="view_users_form_inherit">
<field name="name">res.users.form</field>
addons/hr/hr_view.xml
+38 -32
View File
@@ -2,20 +2,21 @@
<openerp>
<data>
<menuitem icon="terp-hr" id="menu_hr_root" name="Human Resources"/>
<menuitem
id="menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
sequence="40" />
<menuitem
id="menu_hr_configuration"
name="Configuration"
<menuitem id="menu_hr_human_resources" sequence="1" name="Human Resources" parent="menu_hr_root"/>
<menuitem
id="menu_hr_reporting"
name="Reporting"
parent="hr.menu_hr_root"
sequence="5" groups="group_hr_manager"/>
sequence="40" />
<menuitem
id="menu_hr_configuration"
name="Configuration"
parent="hr.menu_hr_root"
sequence="50" groups="group_hr_manager"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_configuration" name="Employees" sequence="1"/>
<!--
==========
Employee
Employee
==========
-->
<record id="view_employee_form" model="ir.ui.view">
@@ -93,7 +94,7 @@
<field name="view_id" ref="view_employee_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<record id="open_view_employee_list" model="ir.actions.act_window">
<field name="name">Employees</field>
<field name="res_model">hr.employee</field>
@@ -101,16 +102,15 @@
<field name="view_mode">tree,form</field>
<field name="view_id" eval="False"/>
</record>
<menuitem
<!-- <menuitem
id="menu_open_view_employee_list"
name="Employees"
groups="group_hr_manager"
parent="hr.menu_hr_root"/>
parent="menu_hr_human_resources"/>
<menuitem
action="open_view_employee_tree"
id="menu_open_view_employee_tree"
parent="menu_open_view_employee_list"/>
parent="menu_open_view_employee_list"/>-->
<record id="open_view_employee_list_my" model="ir.actions.act_window">
<field name="name">All Employees</field>
@@ -119,10 +119,15 @@
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem
<!--<menuitem
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_open_view_employee_list"/>
parent="menu_open_view_employee_list"/>-->
<menuitem
name="Employees"
action="open_view_employee_list_my"
id="menu_open_view_employee_list_my"
parent="menu_hr_human_resources"/>
<!--
=======================
@@ -160,9 +165,9 @@
<field eval="True" name="isobject"/>
<field eval="True" name="replace"/>
</ir_set>
<!--
<!--
============
Working Time
============
@@ -186,8 +191,8 @@
<field name="view_type">form</field>
<field name="view_id" eval="False"/>
</record>
<menuitem action="edit_workgroup" id="menu_edit_workgroup" parent="hr.menu_hr_configuration"/>
<menuitem action="edit_workgroup" id="menu_edit_workgroup" name="Work Schedules" parent="menu_view_employee_category_configuration_form" sequence="4"/>
<record id="view_timesheet_tree" model="ir.ui.view">
<field name="name">hr.timesheet.tree</field>
<field name="model">hr.timesheet</field>
@@ -215,13 +220,13 @@
</form>
</field>
</record>
<!--
<!--
============
Employee Category
============
-->
<record id="view_employee_category_form" model="ir.ui.view">
<field name="name">hr.employee.category.form</field>
<field name="model">hr.employee.category</field>
@@ -262,8 +267,9 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="hr.menu_hr_configuration"/>
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form" parent="menu_view_employee_category_configuration_form" sequence="1"/>
<record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories structure</field>
<field name="res_model">hr.employee.category</field>
@@ -271,7 +277,7 @@
<field name="view_id" ref="view_employee_category_tree"/>
<field name="domain">[('parent_id','=',False)]</field>
</record>
<record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
<field name="name">Employees</field>
<field name="type">ir.actions.act_window</field>
@@ -281,7 +287,7 @@
<field name="domain">[('category_id','child_of',[active_id])]</field>
<field name="context">{'category_id':active_id}</field>
</record>
<record id="hr_employee_category_open" model="ir.values">
<field eval="'tree_but_open'" name="key2"/>
<field eval="'hr.employee.category'" name="model"/>
@@ -289,8 +295,8 @@
<field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
<field eval="True" name="object"/>
</record>
<menuitem action="open_view_categ_tree" id="menu_view_employee_category_tree" parent="hr.menu_view_employee_category_form"/>
</data>
</openerp>
addons/hr/process/hr_process.xml
+12 -12
View File
@@ -1,23 +1,23 @@
<?xml version="1.0" ?>
<openerp>
<data>
<!--
Process
-->
<record id="process_process_employeecontractprocess0" model="process.process">
<field eval="1" name="active"/>
<field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;Employee Contract&quot;&quot;&quot;" name="name"/>
</record>
<!--
Process Node
-->
<record id="process_node_employee0" model="process.node">
<field name="menu_id" ref="hr.menu_open_view_employee_list"/>
<field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
<field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Employee&quot;&quot;&quot;" name="name"/>
@@ -25,9 +25,9 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_employeecontact0" model="process.node">
<field name="menu_id" ref="hr.menu_open_view_employee_list"/>
<field name="menu_id" ref="hr.menu_open_view_employee_list_my"/>
<field name="model_id" ref="hr.model_hr_employee"/>
<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
<field eval="&quot;&quot;&quot;Employee Contact&quot;&quot;&quot;" name="name"/>
@@ -35,7 +35,7 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<record id="process_node_openerpuser0" model="process.node">
<field name="menu_id" ref="base.menu_users"/>
<field name="model_id" ref="base.model_res_users"/>
@@ -45,11 +45,11 @@
<field name="process_id" ref="process_process_employeecontractprocess0"/>
<field eval="0" name="flow_start"/>
</record>
<!--
Process Transition
-->
<record id="process_transition_employeeuser0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -58,7 +58,7 @@
<field model="process.node" name="target_node_id" ref="process_node_openerpuser0"/>
<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
</record>
<record id="process_transition_contactofemployee0" model="process.transition">
<field eval="[(6,0,[])]" name="role_ids"/>
<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -67,6 +67,6 @@
<field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
<field model="process.node" name="source_node_id" ref="process_node_employee0"/>
</record>
</data>
</openerp>
addons/hr_attendance/hr_attendance_view.xml
+14 -9
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_attendance_form" model="ir.ui.view">
<field name="name">hr.attendance.form</field>
<field name="model">hr.attendance</field>
@@ -27,7 +27,7 @@
</tree>
</field>
</record>
<record id="view_attendance_who" model="ir.ui.view">
<field name="name">hr.attendance.tree</field>
<field name="model">hr.attendance</field>
@@ -48,11 +48,15 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
groups="group_hr_attendance"/>
<!--<menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root"
groups="group_hr_attendance"/>-->
<menuitem
id="menu_hr_time_tracking"
name="Time Tracking"
parent="hr.menu_hr_root" sequence="5"/>
<menuitem action="open_view_attendance" id="menu_open_view_attendance"
parent="menu_hr_attendance" groups="hr.group_hr_manager"/>
parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/>
<record id="edit_attendance_reason" model="ir.ui.view">
<field name="name">hr.action.reason.form</field>
<field name="model">hr.action.reason</field>
@@ -83,8 +87,9 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_attendance_reason"/>
</record>
<menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_hr_configuration"/>
<menuitem sequence="9" id="menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
<menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="menu_open_view_attendance_reason_config"/>
<record id="hr_attendance_employee" model="ir.ui.view">
<field name="name">hr.employee.form1</field>
<field name="model">hr.employee</field>
@@ -98,6 +103,6 @@
</field>
</field>
</record>
</data>
</openerp>
addons/hr_attendance/hr_attendance_wizard.xml
+4 -4
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<data>
<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>
<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/>
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
groups="group_hr_attendance"/>
</data>
</openerp>
addons/hr_contract/hr_contract_view.xml
+28 -26
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
<field name="name">hr.contract.wage.type.period.view.form</field>
<field name="model">hr.contract.wage.type.period</field>
@@ -13,8 +13,8 @@
</form>
</field>
</record>
<record id="hr_hr_employee_marital_status_form" model="ir.ui.view">
<field name="name">hr.hr.employee.marital.status</field>
<field name="model">hr.employee.marital.status</field>
@@ -26,7 +26,7 @@
</form>
</field>
</record>
<record id="hr_contract_wage_type_view_form" model="ir.ui.view">
<field name="name">hr.contract.wage.type.view.form</field>
<field name="model">hr.contract.wage.type</field>
@@ -41,7 +41,7 @@
</form>
</field>
</record>
<record id="hr_contract_wage_type_view_tree" model="ir.ui.view">
<field name="name">hr.contract.wage.type.view.tree</field>
<field name="model">hr.contract.wage.type</field>
@@ -60,16 +60,17 @@
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration"/><menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
<menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/>
<menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
<record id="action_hr_contract_wage_type_period" model="ir.actions.act_window">
<field name="name">Wage period</field>
<field name="res_model">hr.contract.wage.type.period</field>
<field name="view_type">form</field>
</record>
<menuitem action="action_hr_contract_wage_type_period" id="hr_menu_contract_wage_type_period" parent="hr_contract.next_id_56"/>
<record id="hr_hr_employee_view_form2" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form2</field>
<field name="model">hr.employee</field>
@@ -87,7 +88,7 @@
<field name="wage_type_id"/>
<field name="wage"/>
</tree>
<form string="Contract">
<separator colspan="4" string="Generalities"/>
<field colspan="4" name="name" select="1"/>
@@ -97,11 +98,11 @@
<field name="working_hours_per_day_id"/>
<field name="date_start" select="1"/>
<field name="date_end" select="1"/>
<separator colspan="4" string="Salary"/>
<field name="wage_type_id"/>
<field name="wage"/>
<separator colspan="4" string="Notes"/>
<field colspan="4" name="notes" nolabel="1"/>
</form>
@@ -118,7 +119,7 @@
</notebook>
</field>
</record>
<record id="hr_contract_type_view_form" model="ir.ui.view">
<field name="name">hr.contract.type.view.form</field>
<field name="model">hr.contract.type</field>
@@ -130,16 +131,16 @@
</form>
</field>
</record>
<record id="action_hr_marital_status" model="ir.actions.act_window">
<field name="name">Marital Status</field>
<field name="res_model">hr.employee.marital.status</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem action="action_hr_marital_status" id="hr_menu_marital_status" parent="hr.menu_hr_configuration"/>
<menuitem action="action_hr_marital_status" id="hr_menu_marital_status" parent="hr.menu_view_employee_category_configuration_form" sequence="3"/>
<record id="hr_contract_view_form" model="ir.ui.view">
<field name="name">hr.contract.view.form</field>
<field name="model">hr.contract</field>
@@ -151,13 +152,13 @@
<field name="employee_id" select="1"/>
<field name="function"/>
<newline/>
<separator colspan="4" string="Contract Duration"/>
<field name="date_start" select="1"/>
<field name="date_end" select="1"/>
<field name="working_hours_per_day_id"/>
<newline/>
<separator colspan="4" string="Remuneration"/>
<field name="wage_type_id"/>
<field name="wage"/>
@@ -166,7 +167,7 @@
</form>
</field>
</record>
<record id="hr_contract_type_view_tree" model="ir.ui.view">
<field name="name">hr.contract.type.view.tree</field>
<field name="model">hr.contract.type</field>
@@ -177,7 +178,7 @@
</tree>
</field>
</record>
<record id="hr_contract_view_tree" model="ir.ui.view">
<field name="name">hr.contract.view.tree</field>
<field name="model">hr.contract</field>
@@ -195,7 +196,7 @@
</tree>
</field>
</record>
<record id="action_hr_contract" model="ir.actions.act_window">
<field name="name">Contract</field>
<field name="res_model">hr.contract</field>
@@ -203,9 +204,10 @@
<field name="view_mode">tree,form</field>
<field name="domain">[]</field>
</record>
<menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_root"/>
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>
<!-- <menuitem name="Contract" id="menu_hr_contract" parent="hr.menu_hr_human_resources"/>-->
<!-- <menuitem action="action_hr_contract" id="hr_menu_contract" parent="menu_hr_contract"/>-->
<menuitem id="hr_menu_contract_main" parent="hr.menu_hr_root" name="Contracts" sequence="3"/>
<menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr_menu_contract_main" name="Contracts"/>
</data>
</openerp>
addons/hr_expense/hr_expense_view.xml
+14 -14
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- Expenses -->
<record id="view_expenses_line_tree" model="ir.ui.view">
<field name="name">hr.expense.line.tree</field>
<field name="type">tree</field>
@@ -20,7 +20,7 @@
</tree>
</field>
</record>
<record id="view_expenses_tree" model="ir.ui.view">
<field name="name">hr.expense.expense.tree</field>
<field name="model">hr.expense.expense</field>
@@ -36,8 +36,8 @@
</tree>
</field>
</record>
<record id="view_expenses_form" model="ir.ui.view">
<field name="name">hr.expense.form</field>
<field name="type">form</field>
@@ -96,8 +96,8 @@
</form>
</field>
</record>
<record id="view_hr_expense_filter" model="ir.ui.view">
<field name="name">hr.expense.expense.filter</field>
<field name="model">hr.expense.expense</field>
@@ -118,20 +118,20 @@
</search>
</field>
</record>
<record id="expense_all" model="ir.actions.act_window">
<field name="name">All expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="search_view_id" ref="view_hr_expense_filter"/>
</record>
<menuitem id="next_id_49" name="Expenses"
<menuitem id="next_id_49" name="Expenses" sequence="6"
parent="hr.menu_hr_root"/>
<menuitem action="expense_all" id="menu_expense_all"
<menuitem action="expense_all" id="menu_expense_all" name="Expenses"
parent="next_id_49" groups="hr.group_hr_manager"/>
<record id="view_product_hr_expense_form" model="ir.ui.view">
<field name="name">product.product.expense.form</field>
<field name="model">product.product</field>
@@ -143,6 +143,6 @@
</field>
</field>
</record>
</data>
</openerp>
addons/hr_holidays/__terp__.py
+2 -2
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
addons/hr_holidays/hr_holidays_wizard.xml
+1 -2
View File
@@ -4,11 +4,10 @@
<wizard string="Print Summary of Holidays"
name="hr.holidays.summary"
id="holidays_summary"/>
<menuitem name="Print Summary of Holidays" parent="hr.menu_hr_reporting"
action="holidays_summary"
type="wizard"
id="menu_holidays_summary"/>
id="menu_holidays_summary" sequence="20"/>
<!-- restrict menu access to HR Manager -->
<record model='ir.ui.menu' id="menu_holidays_summary">
addons/hr_holidays/hr_view.xml
+19 -8
View File
@@ -145,11 +145,14 @@
</record>
<menuitem
<!-- <menuitem
name="Holidays Management"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"/>-->
<menuitem
name="Leaves" sequence="7"
parent="hr.menu_hr_root"
id="menu_open_ask_holidays"/>
<record model="ir.actions.act_window" id="open_ask_holidays">
<field name="name">Leave Request(s)</field>
<field name="res_model">hr.holidays</field>
@@ -173,8 +176,13 @@
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
<menuitem
<!-- <menuitem
name="Holidays Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>-->
<menuitem
name="Leaves Requests"
parent="menu_open_ask_holidays"
id="menu_open_ask_holidays_new"
action="open_ask_holidays"/>
@@ -202,11 +210,11 @@
<field name="act_window_id" ref="open_allocation_holidays"/>
</record>
<menuitem
<!-- <menuitem
name="Allocation Requests"
parent="menu_open_ask_holidays"
id="menu_open_allocation_holidays"
action="open_allocation_holidays"/>
action="open_allocation_holidays"/>-->
<!-- holidays status -->
<record model="ir.ui.view" id="edit_holiday_status_form">
@@ -242,11 +250,14 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
<!--<menuitem
action="open_view_holiday_status"
id="menu_open_view_holiday_status"
parent="hr.menu_hr_configuration"/>
parent="hr.menu_hr_configuration"/>-->
<menuitem name="Leaves Statuses"
action="open_view_holiday_status"
id="menu_open_view_holiday_status"
parent="hr_attendance.menu_open_view_attendance_reason_config"/>
<!-- Shortcuts -->
<act_window name="My Holiday Requests"
addons/hr_timesheet/__terp__.py
+2 -2
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
addons/hr_timesheet/hr_timesheet_report.xml
+15 -13
View File
@@ -2,29 +2,31 @@
<openerp>
<data>
<report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
<wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/><menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
<!--<menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/>-->
<!-- <menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"
groups="hr.group_hr_manager"/>-->
<menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="hr.menu_hr_reporting" type="wizard"
groups="hr.group_hr_manager"
/>
<wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
<menuitem
action="wizard_hr_timesheet_my"
id="menu_wizard_hr_timesheet_my"
parent="hr_timesheet.next_id_48"
action="wizard_hr_timesheet_my"
id="menu_wizard_hr_timesheet_my"
parent="hr.menu_hr_reporting"
type="wizard"
groups="hr.group_hr_user"
/>
<report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
<wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
<menuitem
action="wizard_hr_timesheet_users"
id="menu_wizard_hr_timesheet_users"
<menuitem
action="wizard_hr_timesheet_users"
id="menu_wizard_hr_timesheet_users"
groups="hr.group_hr_manager"
parent="hr_timesheet.next_id_48" type="wizard"/>
parent="hr.menu_hr_reporting" type="wizard"/>
</data>
</openerp>
addons/hr_timesheet/hr_timesheet_view.xml
+12 -10
View File
@@ -33,7 +33,7 @@
<newline/>
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" required="1" domain="[('type','=','service')]"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" name="account_id" select="1"/>
<field name="amount" select="2"/>
<field name="general_account_id" select="2"/>
@@ -41,7 +41,7 @@
</form>
</field>
</record>
<record id="hr_timesheet_line_search" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.search</field>
<field name="model">hr.analytic.timesheet</field>
@@ -51,17 +51,17 @@
<group col='8' colspan='4'>
<filter icon="terp-hr" domain="[('date', '=', time.strftime('%%Y-%%m-%%d'))]" string="Today"/>
<filter icon="terp-hr" domain="[('user_id','=',uid)]" string="My Work" help="My Work"/>
<separator orientation="vertical"/>
<separator orientation="vertical"/>
<field name="user_id" select="1" widget="selection"/>
<field name="account_id" select="1" widget="selection"/>
<field name="account_id" select="1" widget="selection"/>
<field name="date" select="1"/>
</group>
</search>
</field>
</record>
</record>
<!-- <menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />-->
<menuitem id="menu_act_hr_timesheet_line_today_form" parent="hr.menu_hr_root" name="Working Hours" />
<record id="act_hr_timesheet_line_me_all_form" model="ir.actions.act_window">
<field name="name">My Working Hours</field>
<field name="type">ir.actions.act_window</field>
@@ -79,13 +79,13 @@
<field name="res_model">hr.analytic.timesheet</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
<field name="search_view_id" ref="hr_timesheet_line_search"/>
</record>
<menuitem
<!-- <menuitem
action="act_hr_timesheet_line_evry1_all_form"
id="menu_act_hr_timesheet_line_evry1_all_form"
parent="hr_timesheet.menu_act_hr_timesheet_line_today_form"
groups="hr.group_hr_manager"/>
groups="hr.group_hr_manager"/>-->
<record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
<field name="name">hr.timesheet.employee.extd_form</field>
@@ -100,5 +100,7 @@
</notebook>
</field>
</record>
</data>
</openerp>
addons/hr_timesheet/hr_timesheet_wizard.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<openerp>
<data>
<wizard id="si_so" model="hr.employee" name="hr_timesheet.si_so" string="Sign in / Sign out by project"/>
<menuitem action="si_so" id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>
<!-- <menuitem action="si_so" id="menu_si_so" parent="hr_attendance.menu_hr_attendance" type="wizard"/>-->
</data>
</openerp>
addons/hr_timesheet_sheet/__terp__.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -45,7 +45,7 @@ The validation can be configured in te company:
""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process','hr_attendance'],
'init_xml': [],
'update_xml': [
'security/ir.model.access.csv',
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+2 -2
View File
@@ -200,8 +200,8 @@
<field name="view_id" eval="False"/>
<field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"
<!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
<menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
groups="hr.group_hr_manager"/>
<!--
addons/report_timesheet/__terp__.py
+3 -3
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -28,7 +28,7 @@
All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
'author': 'Tiny',
'website': 'http://www.openerp.com',
'depends': ['hr_timesheet', 'hr_timesheet_invoice'],
'depends': ['hr_timesheet', 'hr_timesheet_invoice','hr_attendance'],
'init_xml': [],
'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
'demo_xml': [],
addons/report_timesheet/report_timesheet_view.xml
+4 -1
View File
@@ -365,6 +365,9 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="view_random_timesheet_lines_tree"/>
</record>
<!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"
parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>
</data>
</openerp>
addons/wiki/__terp__.py
+5 -5
View File
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
#
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
@@ -24,13 +24,13 @@
'version': '1.0',
'category': 'Generic Modules/Others',
'description': """
The base module to manage documents(wiki)
The base module to manage documents(wiki)
keep track for the wiki groups, pages, and history
""",
'author': 'Tiny & Axelor',
'website': 'http://openerp.com',
'depends': ['base'],
'depends': ['base','document'],
'init_xml': [],
'update_xml': [
'wiki_view.xml',
addons/wiki/wiki_view.xml
+22 -16
View File
@@ -1,22 +1,24 @@
<?xml version="1.0"?>
<openerp>
<data>
<menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>
<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>
<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>
<!-- <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>-->
<menuitem name="Knowledge Management" icon="terp-stock" id="menu_document2"/>
<!--<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>-->
<menuitem name="Wiki" id="menu_document_configuration" parent="document.menu_document_configuration"/>
<!--<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>-->
<menuitem parent="menu_document2" name="Collaborative Content" id="menu_document"/>
<wizard
id="wizard_group_menu_create"
string="Create Menu"
menu="True"
name="wiki.create.menu"/>
<wizard
id="wizard_open_page"
string="Open Page"
menu="True"
name="wiki.wiki.page.open"/>
<record model="ir.ui.view" id="wiki_group_tree">
<field name="name">wiki.groups.tree</field>
<field name="model">wiki.groups</field>
@@ -63,7 +65,11 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
<!-- <menuitem
parent="menu_document_configuration"
id="menu_action_wiki_groups"
action="action_wiki_groups"/>-->
<menuitem name="Wiki Groups"
parent="menu_document_configuration"
id="menu_action_wiki_groups"
action="action_wiki_groups"/>
@@ -73,10 +79,10 @@
<field name="res_model">wiki.groups</field>
<field name="view_type">tree</field>
</record>
<menuitem
<!-- <menuitem
parent="menu_document"
id="menu_action_wiki_groups_browse"
action="action_wiki_groups_browse"/>
action="action_wiki_groups_browse"/>-->
<record id="view_wiki_tree_childs" model="ir.ui.view">
<field name="name">wiki.wiki.tree.childs</field>
@@ -121,7 +127,7 @@
<field name="name" select="1" colspan="6"/>
<field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
<field name="section" select="2" invisible="not context.get('section',False)"/>
<field name="parent_id"/>
<field name="parent_id"/>
</group>
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
<separator colspan="4" string="Modifications"/>
@@ -163,7 +169,7 @@
<field name="context">{'section':'1'}</field>
<field name="search_view_id" ref="view_wiki_filter"/>
</record>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" string="Search Pages" action="action_wiki"/>
<menuitem parent="menu_document" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
<!-- Pages Waiting Review -->
<record model="ir.actions.act_window" id="action_wiki_review">
@@ -176,7 +182,7 @@
<field name="domain">[('review','=',True)]</field>
<field name="filter" eval="True"/>
</record>
<record model="ir.ui.view" id="view_wiki_history_tree">
<field name="name">wiki.wiki.history.tree</field>
<field name="model">wiki.wiki.history</field>
@@ -190,7 +196,7 @@
</tree>
</field>
</record>
<record model="ir.ui.view" id="wiki_history_form">
<field name="name">wiki.wiki.history.form</field>
<field name="model">wiki.wiki.history</field>
@@ -212,10 +218,10 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
<menuitem
<!-- <menuitem
parent="menu_document_configuration"
id="menu_action_history"
action="action_history"/>
action="action_history"/>-->
<act_window domain="[('wiki_id', '=', active_id)]"
id="act_wiki_wiki_history"
@@ -242,7 +248,7 @@
<field eval="'ir.actions.wizard,%d'%wizard_open_page" name="value"/>
<field eval="True" name="object"/>
</record>
<!--record id="ir_open_account_account" model="ir.values">
<field eval="'tree_but_open'" name="key2"/>
<field eval="'wiki.groups'" name="model"/>