Merge lp:~openerp-dev/openobject-addons/7.0-bug-1172257-avo into lp:openobject-addons/7.0

[Amit Vora(OpenERP)]

Hello,

        I have fixed Reporting / Human Resources / Timesheet Analysis and group by user display wrong.
        I have also fixed Reporting / Human Resources / Timesheet sheet Analysis and group by user display undefine

Thanks.
avo

[lp:~openerp-dev/openobject-addons/7.0-bug-1172257-avo]

9850. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9851. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9852. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9853. By Amit Vora(OpenERP) on 2014-04-28

[IMP] add demo data for hr_timesheet_sheet module

9854. By Amit Vora(OpenERP) on 2014-05-06

[IMP] default group by user_id and account_id

9855. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

9856. By Amit Vora(OpenERP) on 2014-05-08

[IMP] improve code

9857. By Amit Vora(OpenERP) on 2014-05-08

[IMP] set proper indentation

Unmerged revisions

9857. By Amit Vora(OpenERP) on 2014-05-08

[IMP] set proper indentation

9856. By Amit Vora(OpenERP) on 2014-05-08

[IMP] improve code

9855. By Amit Vora(OpenERP) on 2014-05-06

[MRG] merge with main branch

9854. By Amit Vora(OpenERP) on 2014-05-06

[IMP] default group by user_id and account_id

9853. By Amit Vora(OpenERP) on 2014-04-28

[IMP] add demo data for hr_timesheet_sheet module

9852. By Amit Vora(OpenERP) on 2014-04-25

[MRG] merge with main branch

9851. By Amit Vora(OpenERP) on 2014-04-23

[MRG] merge with main branch

9850. By Amit Vora(OpenERP) on 2014-03-13

[MERGE] merge with main branch

9849. By Amit Vora(OpenERP) on 2014-02-20

[FIX] improve query for hr_timesheet report

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_demo.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_demo.xml	2012-11-29 22:26:45 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_demo.xml	2014-05-08 12:52:12 +0000
@@ -8,5 +8,14 @@
             <field name="employee_id" ref="hr.employee_fp" />
         </record>
 -->
+        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+            <field name="name">Sheet 1</field>
+            <field name="user_id" ref="base.user_root"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_from"/>
+            <field eval="time.strftime('%Y-%m-%d')" name="date_to"/>
+            <field name="employee_id" ref="hr.employee"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="state">draft</field>
+        </record>
     </data>
 </openerp>

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report.py'
--- hr_timesheet_sheet/report/hr_timesheet_report.py	2012-12-17 15:23:03 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report.py	2014-05-08 12:52:12 +0000
@@ -52,12 +52,11 @@
             create or replace view hr_timesheet_report as (
                 select
                     min(t.id) as id,
-                    l.date as date,
-                    to_char(l.date, 'YYYY-MM-DD') as day,
-                    to_char(l.date,'YYYY') as year,
-                    to_char(l.date,'MM') as month,
                     sum(l.amount) as cost,
                     sum(l.unit_amount) as quantity,
+                    to_char(htss.date_from, 'YYYY-MM-DD') as day,
+                    to_char(htss.date_from, 'YYYY') as year,
+                    to_char(htss.date_from, 'MM') as month,
                     l.account_id as account_id,
                     l.journal_id as journal_id,
                     l.product_id as product_id,
@@ -68,8 +67,10 @@
                 from
                     hr_analytic_timesheet as t
                     left join account_analytic_line as l ON (t.line_id=l.id)
+                    left join hr_timesheet_sheet_sheet as htss ON (t.sheet_id=htss.id)
+                where t.sheet_id IS NOT NULL
                 group by
-                    l.date,
+                    htss.id,
                     l.account_id,
                     l.product_id,
                     l.general_account_id,

=== modified file 'hr_timesheet_sheet/report/hr_timesheet_report_view.xml'
--- hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2012-11-29 22:26:45 +0000
+++ hr_timesheet_sheet/report/hr_timesheet_report_view.xml	2014-05-08 12:52:12 +0000
@@ -48,7 +48,7 @@
                     <group expand="1" string="Group By...">
                         <filter string="User" name="group_user_id" icon="terp-personal" context="{'group_by':'user_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
+                        <filter string="Analytic Account" name="group_account_id" icon="terp-folder-green" context="{'group_by':'account_id'}" groups="analytic.group_analytic_accounting"/>
                         <filter string="General Account" icon="terp-folder-orange" context="{'group_by':'general_account_id'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Group by day of date"/>
@@ -64,7 +64,7 @@
             <field name="res_model">hr.timesheet.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'search_default_group_account_id':1,'group_by_no_leaf':1,'group_by':[]}</field>
             <field name="help" type="html">
               <p>
                 This report performs analysis on timesheets created by your

=== modified file 'hr_timesheet_sheet/report/timesheet_report.py'
--- hr_timesheet_sheet/report/timesheet_report.py	2013-11-25 14:26:24 +0000
+++ hr_timesheet_sheet/report/timesheet_report.py	2014-05-08 12:52:12 +0000
@@ -111,7 +111,8 @@
                         htss.state,
                         htss.id,
                         htss.department_id,
-                        htss.user_id
+                        htss.user_id,
+                        aal.id
             )
         """)
 timesheet_report()