Nabin Hait 0d66579e83 Merge branch 'develop' into develop

2017-02-20 19:22:03 +05:30

..

controllers

[Fix] Calculate paid amount when is pos is enabled

2017-01-17 12:11:57 +05:30

payment

Added zero value condition

2016-08-31 02:09:15 +05:30

pos

[Enhancement] POS Redesign (#7639)

2017-02-01 18:07:22 +05:30

schools

Renamed Evaluation Criteria to Assessment Criteria

2017-02-01 18:47:36 +05:30

templates

[Minor] List of Contacts

2017-02-13 16:01:52 +05:30

utils

[minor] auto close opportunity after 7 days

2017-02-17 14:54:50 +05:30

account_tree_grid.js

[rename] group_or_ledger to is_group

2015-04-23 13:14:17 +05:30

conf.js

Update erpnext manual link (#6853)

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

financial_statements.js

added project filter to gl and carry project filter from P&L

2017-01-24 06:46:07 -03:00

help_links.js

add help_links.js

2016-08-22 14:37:22 +05:30

purchase_trends_filters.js

[fix] Get defaults based on doctype or fieldname

2015-12-23 16:37:06 +05:30

queries.js

[minor] Show item quantity in warehouse set query

2017-02-10 19:14:43 +05:30

sales_trends_filters.js

[fix] Get defaults based on doctype or fieldname

2015-12-23 16:37:06 +05:30

setup_wizard.js

Fixed merge conflict

2017-02-20 15:00:04 +05:30

shopping_cart.js

[minor] rename icons as per FontAwesome 4 (#7136)

2016-12-05 14:17:26 +05:30

sms_manager.js

Changed company name from Web Notes to Frappe Technologies

2015-03-03 14:56:43 +05:30

stock_analytics.js

[fix] load dependancies on page load event

2016-07-02 17:13:11 +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

[minor] moved the address_and_contact utils to frappe

2017-01-30 10:45:28 +05:30

website_utils.js

Newsletter moved to Frappe

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