Nabin Hait cf72d7f135 Fixed merge conflict

2018-02-22 14:47:26 +05:30

..

agriculture

[Agriculture Domain] (#11663)

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

controllers

Fixed merge conflict

2018-02-22 14:47:26 +05:30

education

minor fixes in the assessment result tool (#11795)

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

hub

[hub] cleanups

2018-02-15 10:54:23 +05:30

leaflet

[Agriculture Domain] (#11663)

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

payment

Allow no ZERO Payment

2018-01-29 15:39:52 +01:00

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

Calculate due date in Purchase Invoice on the basis of Supplier invoice date (#12913)

2018-02-16 13:05:21 +05:30

account_tree_grid.js

Lint and fix JS files

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

communication.js

[fix] primary button color for make

2018-01-23 16:08:52 +05:30

conf.js

Update erpnext manual link (#6853)

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

financial_statements.js

Report presentation currency (#12670)

2018-02-12 15:04:50 +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

Validate Bank name in Setup wizard on the same slide (#12968)

2018-02-16 14:44:42 +05:30

shopping_cart.js

Changes for Rollup (#12924)

2018-02-20 14:21:50 +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

Report presentation currency (#12670)

2018-02-12 15:04:50 +05:30

website_utils.js

Newsletter moved to Frappe

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