Prateeksha Singh a5f6e54b70 fix merge conflict		2018-08-06 13:56:53 +05:30
..
agriculture	Agriculture module corrections (#13438)	2018-04-02 10:51:53 +05:30
controllers	Resolved merge conflicts	2018-07-18 17:08:16 +05:30
education
hub	fix merge conflict	2018-08-06 13:56:53 +05:30
leaflet
payment	Allow no ZERO Payment	2018-01-29 15:39:52 +01:00
pos	Add UOM to Item View with Price	2018-05-17 00:09:21 -07:00
projects	[minor] fixes to moment.defaultDateFormat and daily work summary eplies	2018-06-25 22:38:20 +05:30
templates	Payroll Entry - Validate Attendance (#14738)	2018-06-28 23:28:07 +05:30
utils	Merge branch 'master' into develop	2018-06-06 05:53:19 +00:00
account_tree_grid.js	Remove unnecessary columns Analytics Reports (#13344)	2018-03-22 11:12:02 +05:30
communication.js
conf.js	[revert] modules dropdown	2018-07-23 17:04:34 +05:30
financial_statements.js	Financial Reports	2018-07-20 15:11:55 +05:30
help_links.js	Email alert renamed to Notification (#14618)	2018-06-21 09:17:52 +05:30
purchase_trends_filters.js	controller and other changes	2018-05-14 11:45:38 +05:30
queries.js
sales_trends_filters.js
setup_wizard.js	fix css for coa dialog in setup wizard (#14793)	2018-07-03 10:35:31 +05:30
shopping_cart.js	Update shopping_cart.js	2018-03-09 16:28:25 +05:30
sms_manager.js
stock_analytics.js	Remove unnecessary columns Analytics Reports (#13344)	2018-03-22 11:12:02 +05:30
stock_grid_report.js
utils.js	Update Qty and Rate in PO and SO	2018-07-13 17:02:08 +05:30
website_utils.js