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

Task-919 : Merge the board_project into scrum,project,project_planning,hr_timesheet_sheet 

bzr revid: sbh@tinyerp.com-20100608081458-ma9lig9wdm3qmn5q
This commit is contained in:
sbh (Open ERP) 2010-06-08 13:44:58 +05:30
parent f12d991446
commit 24dc10e94d
11 changed files with 65 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
addons/hr_timesheet_sheet/board_hr_timesheet_view.xml
View File

@ -31,5 +31,40 @@
</xpath>
</field>
</record>
<record id="hr_timesheet_sheet_tree" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Timesheets">
<field name="date_from"/>
<field name="user_id"/>
<field name="name"/>
<field name="total_attendance"/>
<field name="total_timesheet"/>
<field name="state"/>
</tree>
</field>
</record>
<!-- Project Manager Board -->
<record id="act_hr_timesheet_sheet" model="ir.actions.act_window">
<field name="name">Timesheets</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('state','&lt;&gt;','done'),('user_id','in',department_users_get())]</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_timesheet_sheet_tree"/>
</record>
<record id="board_project_timesheet_form" model="ir.ui.view">
<field name="name">board.project.timesheet.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="project.board_project_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/hpaned/child1" position="inside">
<action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets" width="510"/>
</xpath>
</field>
</record>
</data>
</openerp>

7
addons/project/__openerp__.py
View File

@ -26,7 +26,7 @@
"author" : "Tiny",
"website" : "http://www.openerp.com",
"category" : "Generic Modules/Projects & Services",
"depends" : ["product", "analytic", "process", "mail_gateway"],
"depends" : ["product", "analytic", "process", "mail_gateway","board"],
"description": """Project management module that track multi-level projects, tasks,
work done on tasks, eso. It is able to render planning, order tasks, eso.
""",
@ -43,9 +43,12 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
"project_installer.xml",
"report/project_report_view.xml",
"wizard/project_close_task_view.xml",
"board_project_view.xml",
'board_project_manager_view.xml'
],
'demo_xml': [
'project_demo.xml'
'project_demo.xml',
'board_project_demo.xml',
],
'installable': True,
'active': False,

0
addons/board_project/board_project_demo.xml → addons/project/board_project_demo.xml
View File

32
addons/board_project/board_project_manager_view.xml → addons/project/board_project_manager_view.xml
View File

@ -21,28 +21,6 @@
<!-- <field name="domain">[('user_id','in',department_users_get())]</field>-->
<!-- </record>-->
<record id="hr_timesheet_sheet_tree" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.tree.simplified.board</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Timesheets">
<field name="date_from"/>
<field name="user_id"/>
<field name="name"/>
<field name="total_attendance"/>
<field name="total_timesheet"/>
<field name="state"/>
</tree>
</field>
</record>
<record id="act_hr_timesheet_sheet" model="ir.actions.act_window">
<field name="name">Timesheets</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="domain">[('state','&lt;&gt;','done'),('user_id','in',department_users_get())]</field>
<field name="view_type">form</field>
<field name="view_id" ref="hr_timesheet_sheet_tree"/>
</record>
<record id="board_project_manager_form" model="ir.ui.view">
@ -56,17 +34,9 @@
<!-- <action colspan="4" height="220" name="%(act_my_project)d" string="My projects" width="510"/>-->
<action colspan="4" height="150" name="%(act_my_account)d" string="My accounts to invoice" width="510"/>
<action colspan="4" height="150" name="%(act_hr_timesheet_sheet)d" string="User's timesheets" width="510"/>
</child1>
<child2>
<button colspan="4" icon="terp-partner" name="%(open_board_project)d" string="My tasks board" type="action"/>
<action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
</child2>
</hpaned>
</form>
@ -82,7 +52,7 @@
<field name="view_id" ref="board_project_manager_form"/>
</record>
<menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="board_project.next_id_86" sequence="1" groups="project.group_project_user"/>
<menuitem action="open_board_project_manager" icon="terp-graph" id="menu_board_project_manager" parent="project.next_id_86" sequence="1" groups="project.group_project_user"/>
</data>
</openerp>

4
addons/board_project/board_project_view.xml → addons/project/board_project_view.xml
View File

@ -82,14 +82,14 @@
<field name="view_id" ref="project.view_project_message_tree"/>
</record>
<record id="action_view_project_member_tree" model="ir.actions.act_window">
<!-- <record id="action_view_project_member_tree" model="ir.actions.act_window">
<field name="name">Project's Members</field>
<field name="res_model">resource.resource</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('resource_type','=','user')]</field>
<field name="view_id" ref="resource.resource_resource_tree"/>
</record>
</record>-->
<record id="board_project_form" model="ir.ui.view">
<field name="name">board.project.form</field>

1
addons/project_issue/__openerp__.py
View File

@ -45,6 +45,7 @@
'report/project_issue_report_view.xml',
'security/project_issue_security.xml',
'security/ir.model.access.csv',
"board_project_issue_view.xml",
],
'demo_xml': ['project_issue_demo.xml'],
'installable': True,

0
addons/board_project/board_project_issue_view.xml → addons/project_issue/board_project_issue_view.xml
View File

3
addons/project_planning/__openerp__.py
View File

@ -47,7 +47,8 @@ At the end of the month, the planning manager can also check if the encoded time
'update_xml': [
'security/ir.model.access.csv',
'project_planning_view.xml',
'project_planning_report.xml'
'project_planning_report.xml',
'board_project_planning_view.xml',
],
'demo_xml': [
#'report_account_analytic.planning.csv',

17
addons/project_planning/board_project_planning_view.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="board_project_planning_form" model="ir.ui.view">
<field name="name">board.project.planning.form</field>
<field name="model">board.board</field>
<field name="inherit_id" ref="project.board_project_manager_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="/form/hpaned/child2" position="inside">
<action colspan="4" name="%(project_planning.action_account_analytic_planning_stat_form)d" string="My Project's planning" domain="[('manager_id','=',uid),('planning_id.state','&lt;&gt;','cancel')]"/>
</xpath>
</field>
</record>
</data>
</openerp>

1
addons/scrum/__openerp__.py
View File

@ -57,6 +57,7 @@
'process/scrum_process.xml',
'wizard/scrum_backlog_sprint_view.xml',
'wizard/scrum_backlog_merger_view.xml',
"board_scrum_view.xml",
],
'demo_xml': ['scrum_demo.xml'],
'installable': True,

2
addons/board_project/board_scrum_view.xml → addons/scrum/board_scrum_view.xml
View File

@ -57,7 +57,7 @@
</record>
<menuitem
id="menu_deshboard_scurm"
name="Scrum Dashboard" parent="next_id_86"
name="Scrum Dashboard" parent="project.next_id_86"
icon="terp-graph" action="open_board_project_scrum"/>
</data>
</openerp>