Nabin Hait 570e29d5e7 Fixed merge conflict

2018-01-17 18:56:02 +05:30

..

agriculture

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

controllers

Fixed merge conflict

2018-01-17 18:56:02 +05:30

education

minor fixes in the assessment result tool (#11795)

2017-11-30 11:39:06 +05:30

leaflet

[Agriculture Domain] (#11663)

2017-12-06 18:36:27 +05:30

payment

Lint and fix JS files

2017-05-30 12:54:42 +05:30

pos

POS - Add % to the Discount Field #9749

2017-10-31 01:07:09 -07:00

templates

[new feature] Product Configurator (via Item Quick Entry) (#11535)

2017-11-14 15:27:28 +05:30

utils

Batch number selector bug fix (#12346)

2018-01-08 17:57:32 +05:30

account_tree_grid.js

Lint and fix JS files

2017-05-30 12:54:42 +05:30

communication.js

[hotfix] Show Make button only for Email communication (#10876)

2017-10-05 14:19:45 +05:30

conf.js

Update erpnext manual link (#6853)

2016-11-07 17:18:15 +05:30

financial_statements.js

Financial Statements Button translateabled (#9032)

2017-05-26 21:32:51 +05:30

help_links.js

Update BOM cost in all BOMs based on latest rm rate

2017-08-22 10:49:57 +05:30

purchase_trends_filters.js

Lint and fix JS files

2017-05-30 12:54:42 +05:30

queries.js

[gst] adde reports + docs

2017-06-22 22:32:08 +05:30

sales_trends_filters.js

Lint and fix JS files

2017-05-30 12:54:42 +05:30

setup_wizard.js

Agri fixes (#11988)

2017-12-13 18:50:39 +05:30

shopping_cart.js

Hide cart icon and badge count after logging out (#11530)

2017-11-17 11:41:35 +05:30

sms_manager.js

Removal of SMS Settings and SMS Parameters from ERPNext (#10033)

2017-08-08 14:55:30 +05:30

stock_analytics.js

Lint and fix JS files

2017-05-30 12:54:42 +05:30

stock_grid_report.js

load all js and css like before in desk.html

2015-03-06 13:17:26 +05:30

utils.js

[fix] allow to change doc status on get items (#12174)

2017-12-26 16:22:40 +05:30

website_utils.js

Newsletter moved to Frappe

2016-06-28 17:28:40 +05:30