Nabin Hait cf72d7f135 Fixed merge conflict		2018-02-22 14:47:26 +05:30
..
accounts.js	Fixed translations and tests (#12900)	2018-02-14 17:44:06 +05:30
buying.js	Fix parenthesis in buying controller (#12923)	2018-02-15 11:21:49 +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	[Bug] Wrong Calculation of Total Weight at Purchase Invoice item for Purchasing in Different Unit (UoM) #12965 (#12966)	2018-02-16 14:45:40 +05:30
transaction.js	[Enhance] Quality Inspection Template (#12988)	2018-02-22 11:03:48 +05:30