Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

# By buddhika
# Via buddhika
* 'master' of https://github.com/pdhssp/HealthOffice.git:
  Signed-off-by: buddhika <dmahaarachchi@gmail.com>
  Signed-off-by: buddhika <buddhika.ari@gmail.com>

Conflicts:
	web/inventory_purchase.xhtml
	web/tem.xhtml

Signed-off-by: buddhika75 <buddhika.ari@gmail.com>