Nabin Hait 8bf58367b8 Fixed merge conflict		2017-03-27 12:30:01 +05:30
..
accounts.js	[WIP] Process Payroll Changes	2016-09-28 15:14:41 +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] Calculate paid amount when is pos is enabled	2017-01-17 12:11:57 +05:30
transaction.js	Fixed merge conflict	2017-03-27 12:30:01 +05:30