Just downloaded the softewsare, and am looking at it now. I see that there is not much activity here.
Not sure if cover Singapore/Malaysia in your company.
In some countries such as Singapore and Malaysia, if a holiday falls on Saturday or Sunday. The holiday is replaced in the following manner.
If the Holiday fall on Saturday,
For companies that works on Saturday, – Saturday is an off day
For Company that is off on Saturday – an additional day is added to annual leave.
If Holday falls on Sunday,
Following Monday is a public Holiday.
Not sure if your updated version would handle this?