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

[Amit Vora(OpenERP)]

Hello,
            I have Fixed HR leave/holidays report not taking half-days into account.
Thanks.
avo

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

9850. By Amit Vora(OpenERP) on 2014-02-25

[MERGE] merge with main branch

9851. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

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

[MERGE] merge with main branch

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

[MRG] merge with main branch

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

[MRG] merge with main barnch

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

[MERGE] merge with main branch

[Bharat Devnani (Open ERP) (bde-openerp)]

Hello Amit,

Your solution doesn't seem to fix the issue, as it doesn't consider the month in which the leaves are taken. So propose a proper solution.

Thanks & Regards,
Devnani Bharat R.

review: Needs Fixing

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

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

[IMP] add domain condition date_from & date_to

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

[IMP] date convert in unicode

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

[IMP] typecast in string

[Amit Vora(OpenERP) (amit.vora-openerp)]

Hello,

I have Fixed HR leave/holidays report not taking half-days into account and it also consider the month in which the leaves are taken.

Thanks.
avo

review: Needs Resubmitting

Unmerged revisions

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

[IMP] typecast in string

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

[IMP] date convert in unicode

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

[IMP] add domain condition date_from & date_to

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

[MERGE] merge with main branch

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

[MRG] merge with main barnch

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

[MRG] merge with main branch

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

[MERGE] merge with main branch

9851. By Amit Vora(OpenERP) on 2014-03-03

[IMP] improve code

9850. By Amit Vora(OpenERP) on 2014-02-25

[MERGE] merge with main branch

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

[FIX] half leave not count proper in hr leave

=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py	2013-12-19 13:51:47 +0000
+++ hr_holidays/report/holidays_summary_report.py	2014-05-08 06:21:21 +0000
@@ -50,8 +50,13 @@
     display={}
     if dept==0:
         count=0
-        p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr, uid, [('employee_id','in',[empid,False]), ('type', '=', 'remove')])
-        ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr, uid, p_id, ['date_from','date_to','holiday_status_id','state'])
+        p_id=pooler.get_pool(cr.dbname).get('hr.holidays').search(cr, uid, [('employee_id','in',[empid,False]), ('type', '=', 'remove'), ('date_from','>=', str(som)), ('date_to','<=', str(eom))])
+        ids_date = pooler.get_pool(cr.dbname).get('hr.holidays').read(cr, uid, p_id, ['date_from','date_to','holiday_status_id','state', 'number_of_days_temp'])
+
+        for items in ids_date:
+            if items['state'] in holiday_type:
+                count += items['number_of_days_temp']
+ 
 
         for index in range(1,61):
             diff=index-1
@@ -61,7 +66,6 @@
                 if current >= strToDate(item['date_from']) and current <= strToDate(item['date_to']):
                     if item['state'] in holiday_type:
                         display[index]=item['holiday_status_id'][0]
-                        count=count +1
                     else:
                         display[index]=' '
                     break
@@ -101,8 +105,7 @@
         cr.execute("SELECT id, name, color_name FROM hr_holidays_status ORDER BY id")
         legend=cr.fetchall()
         today=datetime.datetime.today()
-
-        first_date=data['form']['date_from']
+        first_date = data['form']['date_from']
         som = strToDate(first_date)
         eom = som+datetime.timedelta(59)
         day_diff=eom-som