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

[MERGE/FIX] lp:~openerp-dev/openobject-addons/trunk-review-dashboards-hr-tpa 

bzr revid: jam@tinyerp.com-20120607043436-fsh175obowv1ads1
This commit is contained in:
Jigar Amin - OpenERP 2012-06-07 10:04:36 +05:30
parent 04ae044d55 875b6f2834
commit 19c544da37
17 changed files with 26 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
addons/hr/hr_board.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<!-- This board view will be complete by other hr_* modules-->
<record id="board_hr_form" model="ir.ui.view">
<field name="name">board.hr.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="My Board" layout="manual">
<form string="Human Resources Dashboard" layout="manual">
<board style="2-1">
<column/>
<column/>
@ -15,6 +15,7 @@
</form>
</field>
</record>
<record id="open_board_hr" model="ir.actions.act_window">
<field name="name">Human Resources Dashboard</field>
<field name="res_model">board.board</field>
@ -23,33 +24,8 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_hr_form"/>
</record>
<menuitem id="menu_hr_reporting" parent="base.menu_reporting" name="Human Resources" sequence="40" />
<menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard" name="Human Resources" sequence="35"/>
<menuitem id="menu_hr_dashboard_user" parent="menu_hr_dashboard" action="open_board_hr" icon="terp-graph" sequence="4"/>
<!-- This board view will be complete by other hr_* modules-->
<record id="board_hr_manager_form" model="ir.ui.view">
<field name="name">board.hr.manager.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="HR Manager Board" layout="manual">
<board style="2-1">
<column/>
<column/>
</board>
</form>
</field>
</record>
<record id="open_board_hr_manager" model="ir.actions.act_window">
<field name="name">HR Manager Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_hr_manager_form"/>
</record>
<menuitem id="menu_hr_dashboard" parent="base.menu_reporting_dashboard" action="open_board_hr" sequence="30"/>
</data>
</openerp>

6
addons/hr/i18n/hr.pot
View File

@ -408,12 +408,6 @@ msgstr ""
msgid "Working Address"
msgstr ""
#. module: hr
#: model:ir.actions.act_window,name:hr.open_board_hr_manager
#: model:ir.ui.menu,name:hr.menu_hr_dashboard_manager
msgid "HR Manager Dashboard"
msgstr ""
#. module: hr
#: field:hr.department,child_ids:0
msgid "Child Departments"

7
addons/hr_evaluation/board_hr_evaluation_view.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.actions.act_window" id="action_hr_evaluation_interview_board">
<field name="name">Interview Requests</field>
<field name="res_model">hr.evaluation.interview</field>
@ -16,9 +17,9 @@
<field name="inherit_id" ref="hr.board_hr_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/board/column[1]" position="inside">
<action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
</xpath>
<xpath expr="/form/board/column[2]" position="inside">
<action name="%(action_hr_evaluation_interview_board)d" string="Interview Requests"/>
</xpath>
</field>
</record>

1
addons/hr_expense/__openerp__.py
View File

@ -56,7 +56,6 @@ re-invoice your customer's expenses if your work by project.
'security/ir_rule.xml',
'report/hr_expense_report_view.xml',
'board_hr_expense_view.xml',
'board_hr_expense_manager_view.xml',
'hr_expense_installer_view.xml',
],
'demo_xml': [

25
addons/hr_expense/board_hr_expense_manager_view.xml
View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="action_employee_expense" model="ir.actions.act_window">
<field name="name">All Employee Expenses</field>
<field name="res_model">hr.expense.expense</field>
<field name="view_type">form</field>
<field name="domain">[('state','in',('confirm', 'accepted'))]</field>
<field name="view_id" ref="hr_expense.view_editable_expenses_tree"/>
</record>
<record id="board_hr_manager_expense_form" model="ir.ui.view">
<field name="name">board.hr.manager.expense.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="hr.board_hr_manager_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/board/column" position="inside">
<action name="%(action_employee_expense)d" string="All Employee Expenses"/>
</xpath>
</field>
</record>
</data>
</openerp>

1
addons/hr_holidays/__openerp__.py
View File

@ -65,7 +65,6 @@ Note that:
'wizard/hr_holidays_summary_department_view.xml',
'wizard/hr_holidays_summary_employees_view.xml',
'board_hr_holidays_view.xml',
'board_hr_manager_holidays_view.xml',
],
'demo_xml': ['hr_holidays_demo.xml',],
'test': ['test/test_hr_holiday.yml',

5
addons/hr_holidays/board_hr_holidays_view.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
<field name="name">My Leaves</field>
<field name="res_model">hr.holidays.status</field>
@ -10,6 +11,7 @@
<field name="context">{}</field>
<field name="domain">[]</field>
</record>
<record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
<field name="name">board.hr.holidays.leave.month.form</field>
<field name="model">board.board</field>
@ -17,9 +19,10 @@
<field name="inherit_id" ref="hr.board_hr_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column[1]" position="inside">
<action name="%(action_hr_holidays_leaves_by_month)d" string="Leaves"/>
<action name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves"/>
</xpath>
</field>
</record>
</data>
</openerp>

28
addons/hr_holidays/board_hr_manager_holidays_view.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
<field name="name">Leaves To Validate</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','in',('confirm', 'validate', 'validate1'))]</field>
<field name="view_id" ref="hr_holidays.view_holiday_allocation_tree"/>
</record>
<record id="board_hr_holidays_manager_form" model="ir.ui.view">
<field name="name">board.hr.holidays.manager.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="hr.board_hr_manager_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/board/column" position="inside">
<action name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
</xpath>
</field>
</record>
</data>
</openerp>

1
addons/hr_holidays/hr_holidays_view.xml
View File

@ -255,7 +255,6 @@
</field>
</record>
<!-- My leave dashboard -->
<menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
<record model="ir.actions.act_window" id="open_ask_holidays">

5
addons/hr_holidays/i18n/hr_holidays.pot
View File

@ -540,11 +540,6 @@ msgstr ""
msgid "Active"
msgstr ""
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
msgid "Leaves To Validate"
msgstr ""
#. module: hr_holidays
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."

9
addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
View File

@ -30,13 +30,14 @@
<record id="board_hr_applicants_status_form" model="ir.ui.view">
<field name="name">board.hr.applicants.status.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="hr.board_hr_manager_form"/>
<field name="inherit_id" ref="hr.board_hr_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/board/column" position="inside">
<action name="%(action_applicants_status)d" string="Applicants Status"/>
</xpath>
<xpath expr="/form/board/column[1]" position="inside">
<action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
</xpath>
</field>
</record>
</data>
</openerp>

1
addons/hr_timesheet_invoice/__openerp__.py
View File

@ -45,7 +45,6 @@ reports, etc.""",
'wizard/hr_timesheet_analytic_profit_view.xml',
'wizard/hr_timesheet_invoice_create_view.xml',
'wizard/hr_timesheet_invoice_create_final_view.xml',
'board_hr_timesheet_invoice.xml',
],
'demo': [
'hr_timesheet_invoice_demo.xml',

77
addons/hr_timesheet_invoice/board_hr_timesheet_invoice.xml
View File

@ -1,77 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
<record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
<field name="name">Costs to invoice</field>
<field name="res_model">report.account.analytic.line.to.invoice</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
</record>
<!-- <record id="board_hr_timesheet_invoice_form" model="ir.ui.view">
<field name="name">board.hr.timesheet.invoice</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.board_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column/action[@string='Draft Customer Invoices']" position="before">
<action name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close"/>
<action name="%(act_my_account)d" string="Accounts to invoice"/>
</xpath>
</field>
</record> -->
<!-- Need to merge in above view -->
<!--<record id="board_hr_timesheet_invoice_report_form1" model="ir.ui.view">
<field name="name">board.hr.timesheet.invoice</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.board_account_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column/action[@string='Aged income']" position="after">
<action name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
</xpath>
</field>
</record> -->
<record id="view_timesheet_uninvoiced_line_tree" model="ir.ui.view">
<field name="name">timesheet.uninvoiced.line.tree</field>
<field name="model">report.timesheet.line</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Uninvoiced line with billing rate">
<field name="date"/>
<field name="account_id"/>
<field name="user_id" />
<field name="name"/>
<field name="cost"/>
</tree>
</field>
</record>
<record id="action_timesheet_uninvoiced_line" model="ir.actions.act_window">
<field name="name">Uninvoice lines with billing rate</field>
<field name="res_model">report.timesheet.line</field>
<field name="view_type">form</field>
<field name="view_mode">form,tree</field>
<field name="domain">[('invoice_id','=',False)]</field>
<field name="view_id" ref="view_timesheet_uninvoiced_line_tree"/>
</record>
<record id="board_hr_timesheet_uninvoiced_form" model="ir.ui.view">
<field name="name">board.hr.timesheet.uninvoiced.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="inherit_id" ref="hr.board_hr_manager_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column" position="inside">
<action name="%(action_timesheet_uninvoiced_line)d" string="Uninvoice Lines With Billing Rate"/>
</xpath>
</field>
</record>
</data>
</openerp>

11
addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
View File

@ -243,11 +243,6 @@ msgstr ""
msgid "Deadline"
msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
msgid "Accounts to invoice"
msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,partner_id:0
msgid "Partner"
@ -285,7 +280,6 @@ msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_invoice
msgid "Costs to invoice"
msgstr ""
@ -907,11 +901,6 @@ msgstr ""
msgid "Product"
msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
msgid "Uninvoice lines with billing rate"
msgstr ""
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
msgid "%"

28
addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
View File

@ -2,30 +2,18 @@
<openerp>
<data>
<record id="action_hr_timesheet_sheet_graph" model="ir.actions.act_window">
<field name="name">Timesheets</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_graph"/>
</record>
<record id="hr_timesheet_sheet_tree" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
<record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.sheet.graph</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">tree</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'done'" string="Timesheets">
<field name="date_from"/>
<field name="user_id"/>
<field name="department_id" invisible="1"/>
<graph orientation="horizontal" string="Available Attendance" type="bar">
<field name="name"/>
<field name="total_attendance" widget="float_time"/>
<field name="total_timesheet" widget="float_time"/>
<field name="state"/>
</tree>
<field name="total_attendance" operator="+"/>
</graph>
</field>
</record>
<record id="action_week_attendance_graph" model="ir.actions.act_window">
<field name="name">My Total Attendances By Week</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
@ -34,6 +22,7 @@
<field name="domain">[('user_id','=',uid)]</field>
<field name="view_id" ref="hr_timesheet_sheet.view_hr_timesheet_sheet_graph"/>
</record>
<record id="board_hr_week_attendace_form" model="ir.ui.view">
<field name="name">board.hr.timesheet.sheet.form</field>
<field name="model">board.board</field>
@ -45,5 +34,6 @@
</xpath>
</field>
</record>
</data>
</openerp>

23
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -2,18 +2,6 @@
<openerp>
<data>
<record id="hr_timesheet_sheet_graph" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.graph</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Timesheets" type="bar">
<field name="name"/>
<field name="total_attendance" operator="+"/>
<field name="total_timesheet" operator="+"/>
</graph>
</field>
</record>
<record id="hr_timesheet_account_form" model="ir.ui.view">
<field name="name">hr.timesheet.account.form</field>
<field name="model">hr_timesheet_sheet.sheet.account</field>
@ -336,17 +324,6 @@
</tree>
</field>
</record>
<record id="view_hr_timesheet_sheet_graph" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.sheet.graph</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph orientation="horizontal" string="Available Attendance" type="bar">
<field name="name"/>
<field name="total_attendance" operator="+"/>
</graph>
</field>
</record>
<record id="hr_timesheet_day_tree" model="ir.ui.view">
<field name="name">hr.timesheet.day.tree</field>

1
addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
View File

@ -272,7 +272,6 @@ msgstr ""
#: view:hr_timesheet_sheet.sheet:0
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_sheet_graph
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
#: view:res.company:0
msgid "Timesheets"