for checking timelog conflicts, also check if tasks are the same
barcode error in sales_invoice fixed.
Merge branch 'master' of https://github.com/webnotes/erpnext
Merge pull request #319 from akhileshdarjee/master

Barcode problems fixed in Invoices
Merge branch 'master' into edge