Nabin Hait 2490ea0b91 Fixed merge conflict		2016-09-01 12:29:31 +05:30
..
accounts.js	[Fix] Get account of the mode of payment on sales invoice and pos profile	2016-08-10 13:16:39 +05:30
stock_controller.js	[enhance] merge customize buttons under groups	2016-01-13 09:18:31 +05:30
taxes_and_totals.js	Fixed merge conflict	2016-09-01 12:29:31 +05:30
transaction.js	Coded column deleted, column added from UI	2016-08-26 14:32:38 +05:30