Reordered estimation condition and removed double update
Reordered estimation condition and removed double update

ZitecCOM/redmine_resources,ZitecCOM/redmine_resources,marius-balteanu/redmine_resources,marius-balteanu/redmine_resources,marius-balteanu/redmine_resources,ZitecCOM/redmine_resources