Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml

Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git
lab patient report aligned
Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Signed-off-by: Dr. M H Buddhika Ariyaratne <buddhika.ari@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	pom.xml
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml
Salary cycle item finished
Signed-off-by: safrin <mylifeofjava@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml
	src/main/webapp/WEB-INF/glassfish-web.xml

Signed-off-by: lahirumadushanka <lahirumadushanka2100>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	pom.xml
Channelling Fee Error Corrected
Merge origin/master
Signed-off-by: lahirumadushanka <lahirumadushanka2100>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git
item master,auto complete,stock report

Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git

Conflicts:
	src/main/resources/META-INF/persistence.xml
	src/main/setup/glassfish-resources.xml

Signed-off-by: lahirumadushanka <lahirumadushanka2100@gmail.com>
Merge branch 'master' of https://divudi@bitbucket.org/divudi/ruhunu.git