Saurabh 59798b4e88 resolved merge conflict

2018-06-20 15:23:25 +05:30

..

accounts.js

Tax amount showing under wrong tax header in the report (#13843)

2018-05-02 12:20:55 +05:30

buying.js

[feature] Blanket Order

2018-06-14 15:55:38 +05:30

stock_controller.js

[fix] posting date, time is always current unless explicitly set

2017-03-14 17:06:51 +05:30

taxes_and_totals.js

resolved merge conflict

2018-06-20 15:23:25 +05:30

transaction.js

[minor] minor fixes along with the codacy

2018-06-14 15:55:38 +05:30