calculation functionality solve prblem taxex and additional charges
conflicts remove 21-sep
Merge pull request #415 from vaibhavcisin274/vaibhav

Vaibhav