remove conflicts
changes
remove debugger
changes
changes on 19 sept
remove conflicts in morning 19 sept
export from multiple tables
remove conflicts and complete the task of estimate generate report
remove conflicts
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into poonam
client_mail_history#20sep
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into prachi
searching and product/service working 20-sep
Merge pull request #409 from vaibhavcisin274/vaibhav

searching and product/service working 20-sep
Merge pull request #412 from vaibhavcisin274/anshul

Anshul
complete export pdf of estimate report
remove conflicts in estimate/show and gemlock#21 sep
Merge pull request #410 from vaibhavcisin274/prachi

Prachi
remove conflicts an pull of 21 sept
apply pdf export on client resport generate