Nabin Hait dd839055e3 Fixed merge conflict

2017-01-17 15:52:56 +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

[Fix] POS issues

2017-01-12 15:22:02 +05:30

schools

Added assessment result tool

2017-01-10 17:32:02 +05:30

templates

Email inbox based off of frappe email inbox pr (#7308)

2017-01-13 14:51:09 +05:30

utils

[cleanup] move contact, address to frappe 💥

2017-01-13 18:54:47 +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

[minor] new global for query report filters

2016-09-01 17:53:42 +05:30

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

[fix] address queries + tests

2017-01-16 13:06:15 +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

Email ID renamed to Email Address

2017-01-03 16:45:38 +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

Fetch same items multiple times from source doc if all qty not processed

2017-01-09 15:32:20 +05:30

website_utils.js

Newsletter moved to Frappe

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