Merge lp:~vauxoo/addons-vauxoo/7.0-management_reports-dev_sabrina into lp:addons-vauxoo/7.0

[Sabrina Romero - http://www.vauxoo.com]

SQL views added for management reports.

[Sabrina Romero - http://www.vauxoo.com (sabrina)]

@Nhomar, @Moy

Consider appropriate that Jorge may be the reviewer of the flow for this MP?
I would take it to production since Rafael also need views.

Best regards!

[Moisés López - http://www.vauxoo.com (moylop260)]

@Sabri,
Im agree.

Rafa should test it into runbot.
FYI I press button force build in: http://runbot.vauxoo.com/Chuck_Norris.html#erp_vauxoo_com_-mp-227359

[lp:~vauxoo/addons-vauxoo/7.0-management_reports-dev_sabrina]

1066. By Sabrina Romero - http://www.vauxoo.com on 2014-07-18

[MERGE] Merge with lp:addons-vauxoo/7.0

1067. By Sabrina Romero - http://www.vauxoo.com on 2014-07-22

[MERGE] lp:addons-vauxoo/7.0

1068. By Sabrina Romero - http://www.vauxoo.com on 2014-07-22

[FIX] Access rule added for model custom_timesheet_all.

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr)]

review: Approve

=== modified file 'user_story/__openerp__.py'
--- user_story/__openerp__.py	2014-06-06 21:19:51 +0000
+++ user_story/__openerp__.py	2014-07-22 22:49:37 +0000
@@ -60,6 +60,8 @@
         "view/userstory_view.xml",
         "view/project_view.xml",
         "view/hr_timesheet_view.xml",
+        "view/hr_timesheet_all_view.xml",
+        "view/custom_project_task_view.xml",
         "data/data.xml",
         "data/user_story_template.xml",
     ],

=== modified file 'user_story/model/__init__.py'
--- user_story/model/__init__.py	2014-06-06 21:19:51 +0000
+++ user_story/model/__init__.py	2014-07-22 22:49:37 +0000
@@ -1,2 +1,4 @@
 import user_story
 import timesheet
+import timesheet_all
+import custom_project_task

=== added file 'user_story/model/custom_project_task.py'
--- user_story/model/custom_project_task.py	1970-01-01 00:00:00 +0000
+++ user_story/model/custom_project_task.py	2014-07-22 22:49:37 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+import time
+import datetime
+
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+
+from openerp.tools.sql import drop_view_if_exists
+
+class custom_project_task(osv.Model):
+    _name = "custom.project.task"
+    _auto = False
+    
+    _columns = {
+        'analytic_id': fields.many2one('account.analytic.account', 'Project',
+                    readonly=True, select=True),
+        'counter': fields.integer('Num', readonly=True),
+        'userstory': fields.integer('User Story', readonly=True, 
+                    help='User history id of user history assigned on task.'),
+        'task_user_id': fields.many2one('res.users', 'Task user',
+                    readonly=True, select=True, help='User of project task.'),
+        'project_leader_id': fields.many2one('res.users', 'Leader user',
+                    readonly=True, select=True, help='Leader user of project task.'),
+        'task_id': fields.many2one('project.task', 'Task',
+                    readonly=True, select=True, help='Project task title.'),
+        'deadline': fields.date('Deadline', readonly=True, 
+                    help='Project task deadline.'),
+        'date_end': fields.date('Date End', readonly=True, 
+                    help='Project task Date End.'),
+        'period_end': fields.char('Period End', 128, 
+                    help='Period for the end date of summary work.'),
+        'state': fields.char('State', 128, help='Project task state.'),
+    }
+
+    def init(self, cr):
+        drop_view_if_exists(cr, 'custom_project_task')
+        cr.execute('''
+            create or replace view custom_project_task as (
+                SELECT
+                    1 AS counter,
+                    task.id AS id,
+                    task.date_deadline AS deadline,
+                    task.user_id AS task_user_id,
+                    task.project_leader_id AS project_leader_id,
+                    task.date_end AS date_end,
+                    to_char(task.date_end,'MM/YYYY') AS period_end,
+                    analytic.id AS analytic_id,
+                    us.id AS userstory,
+                    task.id AS task_id,
+                    task_type.name AS state
+                FROM project_task AS task
+                LEFT JOIN project_project AS project ON project.id = task.project_id
+                LEFT JOIN account_analytic_account AS analytic ON analytic.id = project.analytic_account_id
+                LEFT JOIN user_story AS us ON us.id = task.userstory_id
+                LEFT JOIN project_task_type AS task_type ON task_type.id = task.stage_id
+        )''')

=== added file 'user_story/model/timesheet_all.py'
--- user_story/model/timesheet_all.py	1970-01-01 00:00:00 +0000
+++ user_story/model/timesheet_all.py	2014-07-22 22:49:37 +0000
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2014 Vauxoo - http://www.vauxoo.com/
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    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/>.
+#
+##############################################################################
+import time
+import datetime
+
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+
+from openerp.tools.sql import drop_view_if_exists
+
+class custom_timesheet_all(osv.Model):
+    _name = "custom.timesheet.all"
+    _order = "date desc"
+    _auto = False
+    
+    _columns = {
+        'period': fields.char('Period', 128, 
+                    help='Period for the date of summary work.'),
+        'date': fields.date('Date', readonly=True, 
+                    help='Date of summary work.'),
+        'analytic_id': fields.many2one('account.analytic.account', 'Project',
+                    readonly=True, select=True),
+        'userstory': fields.integer('User Story', readonly=True, 
+                    help='User history id of user history assigned on task.'),
+        'task_id': fields.many2one('project.task', 'Task title',
+                    readonly=True, select=True, help='Project task title.'),
+        'user_id': fields.many2one('res.users', 'User',
+                    readonly=True, select=True, help='User of summary work.'),
+        'name': fields.char('Description', 264, help='Description of the summary work.'),
+        'unit_amount': fields.float('Duration', readonly=True, help='Time spent on work.'),
+        'invoiceable': fields.many2one('hr_timesheet_invoice.factor', 'Invoiceable',
+                    readonly=True, help='Definition of invoicing status of the line.'),
+    }
+
+    def init(self, cr):
+        drop_view_if_exists(cr, 'custom_timesheet_all')
+        cr.execute('''
+            create or replace view custom_timesheet_all as (
+                SELECT
+                    work.id AS id,
+                    to_char(work.date,'MM/YYYY') AS period,
+                    work.date AS date,
+                    analytic.id AS analytic_id,
+                    us.id AS userstory,
+                    task.id AS task_id,
+                    work.user_id AS user_id,
+                    work.name AS name,
+                    work.hours AS unit_amount,
+                    acc_anal_line.to_invoice AS invoiceable
+                FROM project_task_work AS work
+                LEFT JOIN hr_analytic_timesheet AS tsheet ON tsheet.id = work.hr_analytic_timesheet_id
+                LEFT JOIN account_analytic_line AS acc_anal_line ON acc_anal_line.id = tsheet.line_id
+                LEFT JOIN account_analytic_account AS analytic ON analytic.id = acc_anal_line.account_id
+                LEFT JOIN project_task AS task ON task.id = work.task_id
+                LEFT JOIN user_story AS us ON us.id = task.userstory_id
+        )''')

=== modified file 'user_story/security/ir.model.access.csv'
--- user_story/security/ir.model.access.csv	2014-06-06 21:19:51 +0000
+++ user_story/security/ir.model.access.csv	2014-07-22 22:49:37 +0000
@@ -5,4 +5,7 @@
 "access_acceptability_criteria_manager","acceptability.criteria.manager","model_acceptability_criteria","user_story.group_user_story_manager",1,1,1,1
 "access_user_story_priority_manager","user.story.priority.manager","model_user_story_priority","user_story.group_user_story_manager",1,1,1,1
 "access_user_story_priority_user","user.story.priority.user","model_user_story_priority","user_story.group_user_story_user",1,0,0,0
-access_hr_custom_timesheet,custom.timesheet,model_custom_timesheet,base.group_hr_user,1,1,1,1
+"access_user_story_priority_user","user.story.priority.user","model_user_story_priority","user_story.group_user_story_user",1,0,0,0
+"access_hr_custom_timesheet","custom.timesheet","model_custom_timesheet","base.group_hr_user",1,1,1,1
+"access_hr_custom_timesheet_all","custom.timesheet.all","model_custom_timesheet_all","base.group_hr_user",1,1,1,1
+"access_management_reports","management.reports","model_custom_project_task","user_story.group_management_reports",1,0,0,0

=== modified file 'user_story/security/userstory_security.xml'
--- user_story/security/userstory_security.xml	2013-08-20 20:14:18 +0000
+++ user_story/security/userstory_security.xml	2014-07-22 22:49:37 +0000
@@ -20,5 +20,10 @@
         eval="[(6,0,[ref('user_story.group_user_story_user')])]"/>
     </record>
 
+    <record id="group_management_reports" model="res.groups">
+        <field name="name">Management Reports</field>
+        <field name="category_id" ref="module_user_story"/>
+    </record>
+
 </data>
 </openerp>

=== added file 'user_story/view/custom_project_task_view.xml'
--- user_story/view/custom_project_task_view.xml	1970-01-01 00:00:00 +0000
+++ user_story/view/custom_project_task_view.xml	2014-07-22 22:49:37 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="custom_project_task_tree" model="ir.ui.view">
+            <field name="name">custom.project.task.tree</field>
+            <field name="model">custom.project.task</field>
+            <field name="arch" type="xml">
+                <tree editable="top" create='false' edit='false' string="Project Task">
+                    <field name="deadline"/>
+                    <field name="task_user_id"/>
+                    <field name="project_leader_id"/>
+                    <field name="analytic_id"/>
+                    <field name="userstory"/>
+                    <field name="task_id" options='{"no_open": True}'/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="custom_project_task_search" model="ir.ui.view">
+            <field name="name">custom.project.task.search</field>
+            <field name="model">custom.project.task</field>
+            <field name="arch" type="xml">
+                <search string="Project Task">                 
+                    <field name="deadline"/>
+                    <field name="task_user_id"/>
+                    <field name="project_leader_id"/>
+                    <field name="analytic_id"/>
+                    <field name="userstory"/>                  
+                    <field name="task_id"/>
+                    <field name="state"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Deadline" icon="terp-go-month" domain="[]" context="{'group_by':'deadline'}"/>
+                        <filter string="Task User" icon="terp-personal" domain="[]" context="{'group_by':'task_user_id'}"/>          
+                        <filter string="Leader User" icon="terp-personal" domain="[]" context="{'group_by':'project_leader_id'}"/>  
+                        <filter string="Project" icon="terp-go-month" domain="[]" context="{'group_by':'analytic_id'}"/>
+                        <filter string="User Story" icon="terp-personal" domain="[]" context="{'group_by':'userstory'}"/>          
+                        <filter string="Task" icon="terp-personal" domain="[]" context="{'group_by':'task_id'}"/>
+                        <filter string="State" icon="terp-go-month" domain="[]" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_project_line_task_graph">
+            <field name="name">Project Task Graph</field>
+            <field name="model">custom.project.task</field>
+            <field name="arch" type="xml">
+                <graph string="Project Task" type="bar" orientation="horizontal">
+                    <field name="task_user_id" group="True"/>
+                    <field name="counter" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="act_custom_project_task" model="ir.actions.act_window">
+            <field name="name">Project Task Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">custom.project.task</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_today":1}</field>
+            <field name="view_id" ref="custom_project_task_tree"/>
+        </record>
+        
+        <menuitem id="menu_project_management_report" name="Project Reports" parent="base.menu_main_pm" sequence="9" groups="user_story.group_management_reports"/>
+        <menuitem id="menu_custom_project_task" parent="menu_project_management_report" action="act_custom_project_task" sequence="1" groups="user_story.group_management_reports"/>
+
+    </data>
+</openerp>

=== added file 'user_story/view/hr_timesheet_all_view.xml'
--- user_story/view/hr_timesheet_all_view.xml	1970-01-01 00:00:00 +0000
+++ user_story/view/hr_timesheet_all_view.xml	2014-07-22 22:49:37 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="hr_timesheet_line_tree_all" model="ir.ui.view">
+            <field name="name">custom.timesheet.all.tree</field>
+            <field name="model">custom.timesheet.all</field>
+            <field name="arch" type="xml">
+                <tree editable="top" create='false' edit='false' string="Timesheet Activities All">
+                    <field name="date"/>
+                    <field name="user_id" options='{"no_open": True}'/> 
+                    <field name="analytic_id"/>
+                    <field name="userstory"/>
+                    <field name="task_id" options='{"no_open": True}'/>
+                    <field name="name"/>
+                    <field name="period"/>
+                    <field name="unit_amount" widget="float_time"/>
+                    <field name="invoiceable"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="hr_timesheet_line_all_search" model="ir.ui.view">
+            <field name="name">custom.timesheet.all.search</field>
+            <field name="model">custom.timesheet.all</field>
+            <field name="arch" type="xml">
+                <search string="Timesheet All">                 
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="analytic_id"/>
+                    <field name="userstory"/>                  
+                    <field name="task_id"/>
+                    <field name="name"/>
+                    <field name="period"/>
+                    <field name="invoiceable"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                        <filter string="Summary Work User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Project" icon="terp-go-month" domain="[]" context="{'group_by':'analytic_id'}"/>
+                        <filter string="User Story" icon="terp-personal" domain="[]" context="{'group_by':'userstory'}"/>          
+                        <filter string="Task" icon="terp-personal" domain="[]" context="{'group_by':'task_id'}"/>
+                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period'}"/>
+                        <filter string="Invoiceable" icon="terp-go-month" domain="[]" context="{'group_by':'invoiceable'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_timesheet_line_all_graph">
+            <field name="name">Timesheet All Graph</field>
+            <field name="model">custom.timesheet.all</field>
+            <field name="arch" type="xml">
+                <graph string="Timesheet" type="bar" orientation="horizontal">
+                    <field name="task_id" group="True"/>
+                    <field name= "unit_amount" operator="+"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="act_hr_timesheet_line_all" model="ir.actions.act_window">
+            <field name="name">Timesheet Activities All Report</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">custom.timesheet.all</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_today":1}</field>
+            <field name="view_id" ref="hr_timesheet_line_tree_all"/>
+        </record>
+
+        <menuitem id="menu_hr_working_hour_all" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_all" groups="user_story.group_management_reports"/>
+
+    </data>
+</openerp>