Neil Trini Lasrado f37d329cf5 Merge branch 'develop' into eval-group

2017-02-02 17:30:10 +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

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

…

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

…

purchase_trends_filters.js

…

queries.js

[minor] replace object values in translations (#7602)

2017-01-30 12:35:34 +05:30

sales_trends_filters.js

…

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

…

stock_analytics.js

…

stock_grid_report.js

…

utils.js

[minor] moved the address_and_contact utils to frappe

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

website_utils.js

…