Saurabh ab8c7e616e resolved merge conflicts		2018-02-08 15:17:15 +05:30
..
accounts.js	expenses included in valuation account type in purchase taxes and charges (#11725)	2017-11-27 11:48:09 +05:30
buying.js	[feature] [refactor] Shipping Rule for Buying + Refactor (#11628)	2017-11-17 14:31:09 +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	[Fix] Incorrect change amount if enabled rounded total	2018-02-05 18:13:29 +05:30
transaction.js	resolved merge conflicts	2018-02-08 15:17:15 +05:30