Merge branch 'master' of heroku.com:invoice-project-cis into sivanand
show page of invoice
Merge branch 'master' into sivanand
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into sivanand
remove debugger from projects create
remove debugger form this files
remove CONFLICT
Merge pull request #229 from vaibhavcisin274/poonam

Poonam
18 july
set tab in general prefrence
add print and export to pdf in invoice module
porduct service functionality on estimate
Merge pull request #232 from vaibhavcisin274/vaibhav

porduct service functionality on estimate
invoice_mail in invoice
changes application js
Merge pull request #233 from vaibhavcisin274/vaibhav

changes application js
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into poonam
add sum functionality estimate
Merge pull request #234 from vaibhavcisin274/vaibhav

add sum functionality estimate
Merge branch 'master' of github.com:vaibhavcisin274/invoice-project into sivanand