From 86644fee8b95c862716d83a20f321671df255a4d Mon Sep 17 00:00:00 2001 From: "RCH(Open ERP)" <> Date: Mon, 11 Jan 2010 17:18:35 +0530 Subject: [PATCH] New Menu Structure for HR and Knowledge Management bzr revid: vir@tinyerp.com-20100111114835-f05x3w6wl9bb47pa --- addons/account/report/account_tax_code.py | 10 +-- addons/crm/crm_jobs_menu.xml | 22 +++--- addons/document/document_view.xml | 21 +++--- addons/document_ftp/document_ftp_view.xml | 12 ++-- addons/hr/hr_department_view.xml | 5 +- addons/hr/hr_view.xml | 70 ++++++++++--------- addons/hr/process/hr_process.xml | 24 +++---- addons/hr_attendance/hr_attendance_view.xml | 23 +++--- addons/hr_attendance/hr_attendance_wizard.xml | 8 +-- addons/hr_contract/hr_contract_view.xml | 54 +++++++------- addons/hr_expense/hr_expense_view.xml | 28 ++++---- addons/hr_holidays/__terp__.py | 4 +- addons/hr_holidays/hr_holidays_wizard.xml | 3 +- addons/hr_holidays/hr_view.xml | 27 ++++--- addons/hr_timesheet/__terp__.py | 4 +- addons/hr_timesheet/hr_timesheet_report.xml | 28 ++++---- addons/hr_timesheet/hr_timesheet_view.xml | 22 +++--- addons/hr_timesheet/hr_timesheet_wizard.xml | 2 +- addons/hr_timesheet_sheet/__terp__.py | 6 +- .../hr_timesheet_sheet_view.xml | 4 +- addons/report_timesheet/__terp__.py | 6 +- .../report_timesheet_view.xml | 5 +- addons/wiki/__terp__.py | 10 +-- addons/wiki/wiki_view.xml | 38 +++++----- 24 files changed, 241 insertions(+), 195 deletions(-) diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py index 07ce5285802..6a02d64d462 100644 --- a/addons/account/report/account_tax_code.py +++ b/addons/account/report/account_tax_code.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -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 . +# along with this program. If not, see . # ############################################################################## @@ -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 [] diff --git a/addons/crm/crm_jobs_menu.xml b/addons/crm/crm_jobs_menu.xml index 000369ec21a..cf67dc79ada 100644 --- a/addons/crm/crm_jobs_menu.xml +++ b/addons/crm/crm_jobs_menu.xml @@ -8,9 +8,9 @@ All Jobs Requests crm.job tree,calendar,form,graph - + - + @@ -36,15 +36,19 @@ - --> + - - - + + diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index e23b3ac5025..f7df0b84a5b 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,7 +1,11 @@ - - + + + + + document.storage @@ -39,11 +43,11 @@ form tree,form - + parent="menu_document_configuration"/>--> document.directory @@ -133,7 +137,7 @@ name="Directories" action="action_document_directory_form" id="menu_document_directories" - parent="menu_document_configuration"/> + parent="menu_document_management_configuration"/> @@ -146,7 +150,7 @@ + parent="menu_document_management_configuration" sequence="5"/> ir.attachment @@ -230,11 +234,12 @@ ir.attachment form + + parent="menu_document_doc"/> ir.actions.act_window @@ -289,7 +294,7 @@ - + - + Browse Files ftp://localhost:8021/ + parent="document.menu_document_doc" sequence="1"/> + + - - Auto Configure Directory @@ -49,7 +49,7 @@ - + diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index fe65d988237..51b12af2538 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -47,7 +47,8 @@ tree [('parent_id','=',False)] - + + Departments @@ -56,7 +57,7 @@ - + res.users.form diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a862ac86c0f..ae526efed77 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -2,20 +2,21 @@ - - + - + sequence="40" /> + + @@ -93,7 +94,7 @@ [('parent_id','=',False)] - + Employees hr.employee @@ -101,16 +102,15 @@ tree,form - - + parent="menu_hr_human_resources"/> + parent="menu_open_view_employee_list"/>--> All Employees @@ -119,10 +119,15 @@ tree,form [] - + parent="menu_open_view_employee_list"/>--> + - + hr.employee.category.form hr.employee.category @@ -262,8 +267,9 @@ form tree,form - - + + + Categories structure hr.employee.category @@ -271,7 +277,7 @@ [('parent_id','=',False)] - + Employees ir.actions.act_window @@ -281,7 +287,7 @@ [('category_id','child_of',[active_id])] {'category_id':active_id} - + @@ -289,8 +295,8 @@ - + - + diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index 8910f767132..5376936afe3 100755 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -1,23 +1,23 @@ - + - + - + - + - + @@ -25,9 +25,9 @@ - + - + @@ -35,7 +35,7 @@ - + @@ -45,11 +45,11 @@ - + - + @@ -58,7 +58,7 @@ - + @@ -67,6 +67,6 @@ - + \ No newline at end of file diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 347538622a3..2654add4ad3 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -1,7 +1,7 @@ - + hr.attendance.form hr.attendance @@ -27,7 +27,7 @@ - + hr.attendance.tree hr.attendance @@ -48,11 +48,15 @@ form tree,form - + + - + parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/> + hr.action.reason.form hr.action.reason @@ -83,8 +87,9 @@ tree,form - - + + + hr.employee.form1 hr.employee @@ -98,6 +103,6 @@ - + diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml index 92c28911b40..41be936dea9 100644 --- a/addons/hr_attendance/hr_attendance_wizard.xml +++ b/addons/hr_attendance/hr_attendance_wizard.xml @@ -1,15 +1,15 @@ - - + + - - + diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 1f43bc78884..0d82be364d4 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -1,7 +1,7 @@ - + hr.contract.wage.type.period.view.form hr.contract.wage.type.period @@ -13,8 +13,8 @@ - - + + hr.hr.employee.marital.status hr.employee.marital.status @@ -26,7 +26,7 @@ - + hr.contract.wage.type.view.form hr.contract.wage.type @@ -41,7 +41,7 @@ - + hr.contract.wage.type.view.tree hr.contract.wage.type @@ -60,16 +60,17 @@ tree,form [] - - + + + Wage period hr.contract.wage.type.period form - - + + hr.hr.employee.view.form2 hr.employee @@ -87,7 +88,7 @@ - +
@@ -97,11 +98,11 @@ - + - + @@ -118,7 +119,7 @@
- + hr.contract.type.view.form hr.contract.type @@ -130,16 +131,16 @@ - + Marital Status hr.employee.marital.status form tree,form - - - + + + hr.contract.view.form hr.contract @@ -151,13 +152,13 @@ - + - + @@ -166,7 +167,7 @@ - + hr.contract.type.view.tree hr.contract.type @@ -177,7 +178,7 @@ - + hr.contract.view.tree hr.contract @@ -195,7 +196,7 @@ - + Contract hr.contract @@ -203,9 +204,10 @@ tree,form [] - - - - + + + + + diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 184f95a4c3f..225d197404c 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -1,9 +1,9 @@ - + - + hr.expense.line.tree tree @@ -20,7 +20,7 @@ - + hr.expense.expense.tree hr.expense.expense @@ -36,8 +36,8 @@ - - + + hr.expense.form form @@ -96,8 +96,8 @@ - - + + hr.expense.expense.filter hr.expense.expense @@ -118,20 +118,20 @@ - + All expenses hr.expense.expense form - - - - - + product.product.expense.form product.product @@ -143,6 +143,6 @@ - + diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index 2aaec93c781..121816f5c1b 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -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 . +# along with this program. If not, see . # ############################################################################## diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml index 475da254cdf..7759845e564 100644 --- a/addons/hr_holidays/hr_holidays_wizard.xml +++ b/addons/hr_holidays/hr_holidays_wizard.xml @@ -4,11 +4,10 @@ - + id="menu_holidays_summary" sequence="20"/> diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml index 321541beb92..9c422c41a1d 100644 --- a/addons/hr_holidays/hr_view.xml +++ b/addons/hr_holidays/hr_view.xml @@ -145,11 +145,14 @@ - --> + - Leave Request(s) hr.holidays @@ -173,8 +176,13 @@ - --> + @@ -202,11 +210,11 @@ - + action="open_allocation_holidays"/>--> @@ -242,11 +250,14 @@ form tree,form - - + parent="hr.menu_hr_configuration"/>--> + ). # @@ -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 . +# along with this program. If not, see . # ############################################################################## diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml index 7d07cb98011..bffb33a98b6 100644 --- a/addons/hr_timesheet/hr_timesheet_report.xml +++ b/addons/hr_timesheet/hr_timesheet_report.xml @@ -2,29 +2,31 @@ - + - --> + + - - + - + - - + parent="hr.menu_hr_reporting" type="wizard"/> + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 0650889f182..541c38d3b81 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -33,7 +33,7 @@ - + @@ -41,7 +41,7 @@ - + hr.analytic.timesheet.search hr.analytic.timesheet @@ -51,17 +51,17 @@ - + - + - + + + - - My Working Hours ir.actions.act_window @@ -79,13 +79,13 @@ hr.analytic.timesheet form tree,form - + - + groups="hr.group_hr_manager"/>--> hr.timesheet.employee.extd_form @@ -100,5 +100,7 @@ + + diff --git a/addons/hr_timesheet/hr_timesheet_wizard.xml b/addons/hr_timesheet/hr_timesheet_wizard.xml index d78c617e9dc..b5f270fe0e8 100644 --- a/addons/hr_timesheet/hr_timesheet_wizard.xml +++ b/addons/hr_timesheet/hr_timesheet_wizard.xml @@ -2,7 +2,7 @@ - + diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 7cc7044e473..6ba2936aac4 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -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 . +# along with this program. If not, see . # ############################################################################## @@ -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', diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 8a0f032e4d7..8d2a65bb725 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -200,8 +200,8 @@ - - --> + + diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py index 3093134e47a..dd74a660af2 100644 --- a/addons/wiki/__terp__.py +++ b/addons/wiki/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -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 . +# along with this program. If not, see . # ############################################################################## @@ -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', diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index eeb96a93557..10aae9ed92b 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -1,22 +1,24 @@ - - - - + + + + + + - + - + wiki.groups.tree wiki.groups @@ -63,7 +65,11 @@ form tree,form - --> + @@ -73,10 +79,10 @@ wiki.groups tree - + action="action_wiki_groups_browse"/>--> wiki.wiki.tree.childs @@ -121,7 +127,7 @@ - + @@ -163,7 +169,7 @@ {'section':'1'} - + @@ -176,7 +182,7 @@ [('review','=',True)] - + wiki.wiki.history.tree wiki.wiki.history @@ -190,7 +196,7 @@ - + wiki.wiki.history.form wiki.wiki.history @@ -212,10 +218,10 @@ form tree,form - + action="action_history"/>--> - +