Anand Doshi 0dc79f4de0 Merge remote-tracking branch 'frappe/v4.x.x' into develop ...

Conflicts:
	.travis.yml
	erpnext/__version__.py
	erpnext/controllers/queries.py
	erpnext/hooks.py
	erpnext/selling/sales_common.js
	erpnext/stock/doctype/bin/bin.py
	erpnext/stock/doctype/stock_entry/stock_entry.js
	erpnext/stock/doctype/stock_entry/stock_entry.py
	erpnext/stock/stock_ledger.py
	setup.py

2015-04-06 13:21:07 +05:30

..

js

Changed company name from Web Notes to Frappe Technologies

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

tests

fixed test cases

2015-03-18 16:22:13 +05:30

__init__.py

moved modules inside erpnext folder

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

accounts_controller.py

fixes

2015-03-20 14:29:23 +05:30

buying_controller.py

[subcontract] refactor, make stock entry from PO

2015-03-03 15:50:24 +05:30

print_settings.py

Changed company name from Web Notes to Frappe Technologies

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

queries.py

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

recurring_document.py

fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30

selling_controller.py

[git fixes] salary manager, time log title, notificaitons

2015-03-03 16:06:54 +05:30

status_updater.py

Changed company name from Web Notes to Frappe Technologies

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

stock_controller.py

Merge remote-tracking branch 'frappe/v4.x.x' into develop

2015-04-06 13:21:07 +05:30

taxes_and_totals.py

[hotfix] taxes and totals

2015-04-05 20:09:09 +05:30

trends.py

Changed company name from Web Notes to Frappe Technologies

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

website_list_for_contact.py

Changed company name from Web Notes to Frappe Technologies

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