Saurabh 35d8ce4fbd resolved merge conflicts		2018-01-12 16:58:32 +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	Added rounded total in the POS and fix rounded issue in js side (#12457)	2018-01-12 16:28:16 +05:30
transaction.js	resolved merge conflicts	2018-01-09 12:05:20 +05:30