Nabin Hait dd839055e3 Fixed merge conflict

2017-01-17 15:52:56 +05:30

..

tests

Revert "[optimize] remove count(*) from queries"

2016-11-21 21:04:47 +05:30

__init__.py

moved modules inside erpnext folder

2013-12-11 10:43:52 +05:30

accounts_controller.py

[fix] warehouse test cases

2017-01-16 16:57:53 +05:30

buying_controller.py

Fixed version conflict

2016-10-05 17:18:36 +05:30

item_variant.py

[Fix] Timeout error in item attribute validation

2016-12-16 13:35:50 +05:30

print_settings.py

[cleanup] remove Features Setup

2016-05-11 16:47:14 +05:30

queries.py

[cleanup] move contact, address to frappe 💥

2017-01-13 18:54:47 +05:30

recurring_document.py

[fix] set default depreciation accounts and test fix

2016-03-31 15:04:06 +05:30

sales_and_purchase_return.py

[Fix] PO status not changed as material return created against them (#6869)

2016-11-16 11:10:10 +05:30

selling_controller.py

[minor] fixes in validate selling price

2016-11-16 17:19:47 +05:30

status_updater.py

[Fix] After amend the status become cancelled even if docstatus is zero

2017-01-13 12:51:19 +05:30

stock_controller.py

[fix] warehouse test cases

2017-01-16 17:23:20 +05:30

taxes_and_totals.py

Fixed merge conflict

2017-01-17 15:52:56 +05:30

trends.py

[minor][fix] for condition maker

2016-10-03 12:48:25 +05:30

website_list_for_contact.py

[Enhancement] Supplier quotation added on supplier portal

2016-09-21 17:07:25 +05:30