Subversion Repositories SmartDukaan

Rev

Rev 4992 | Rev 5047 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4992 Rev 5005
Line 854... Line 854...
854 
                elif holiday.holidayType == HolidayType.MONTHLY:
 854 
                elif holiday.holidayType == HolidayType.MONTHLY:
855 
                    holidayDate = datetime.date(currentDate.year, currentDate.month, holiday.holidayValue)
 855 
                    holidayDate = datetime.date(currentDate.year, currentDate.month, holiday.holidayValue)
856 
                    if holidayDate >=  currentDate and holidayDate <= expectedDate:
 856 
                    if holidayDate >=  currentDate and holidayDate <= expectedDate:
857 
                        holidayDelay = holidayDelay + 1
857 
                        holidayDelay = holidayDelay + 1
858 
                elif holiday.holidayType == HolidayType.SPECIFIC:
 858 
                elif holiday.holidayType == HolidayType.SPECIFIC:
- 
 
 859 
                    holidayValue = str(holiday.holidayValue)
859 
                    holidayDate = datetime.date(holiday.holidayValue[:4], holiday.holidayValue[4:6], holiday.holidayValue[6:8])
 860 
                    holidayDate = datetime.date(int(holidayValue[:4]), int(holidayValue[4:6]), int(holidayValue[6:8]))
860 
                    if holidayDate >=  currentDate and holidayDate <= expectedDate:
 861 
                    if holidayDate >=  currentDate and holidayDate <= expectedDate:
861 
                        holidayDelay = holidayDelay + 1
862 
                        holidayDelay = holidayDelay + 1
862 
    except Exception as e:
 863 
    except Exception as e:
863 
        print e
 864 
        print e
864 
    return holidayDelay
865 
    return holidayDelay