Saurabh d7897f1c53 Resolved merge conflicts

2018-07-18 17:08:16 +05:30

..

accounts.js

…

buying.js

Resolved merge conflicts

2018-07-18 17:08:16 +05:30

stock_controller.js

…

taxes_and_totals.js

…

transaction.js

…