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

..

accounts

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

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

buying

minor fixes

2015-04-05 17:18:07 +05:30

change_log/v5

[breadcrumbs] refactor

2015-03-09 15:48:16 +05:30

config

[email] many fixes, newsletter, unsubscribe

2015-03-19 17:16:03 +05:30

contacts

Changed company name from Web Notes to Frappe Technologies

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

controllers

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

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

crm

[hotfix] strip email when importing newsletter list

2015-04-05 13:44:52 +05:30

hr

Merge pull request #3013 from neilLasrado/expense

2015-04-02 14:29:29 +05:30

hub_node

Changed company name from Web Notes to Frappe Technologies

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

manufacturing

[production order] explict idx + test fix

2015-04-02 16:03:11 +05:30

patches

[fix] email account patch fix and minor setup wizard fix

2015-04-03 14:30:15 +05:30

projects

[task] open, close from list:

2015-04-01 15:43:14 +05:30

public

minor fix in taxes and totals

2015-03-23 14:33:22 +05:30

selling

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

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

setup

[fix] on setup wizard language selection and load, set it as system default language

2015-04-04 16:15:04 +05:30

shopping_cart

Test case fixes

2015-03-18 14:57:09 +05:30

startup

Changed company name from Web Notes to Frappe Technologies

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

stock

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

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

support

move opportunity item to CRM

2015-04-02 22:06:36 +05:30

templates

[breadcrumbs] refactor

2015-03-09 15:48:16 +05:30

tests

Changed company name from Web Notes to Frappe Technologies

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

translations

update translations

2015-03-08 21:29:59 +05:30

utilities

Fixed note permission query

2015-03-31 14:42:22 +05:30

__init__.py

keep version in separate file

2014-05-28 16:58:55 +05:30

__version__.py

bumped to version 4.24.3

2015-03-30 13:11:48 +06:00

hooks.py

[incoming sales email] to opportunity

2015-04-02 22:00:34 +05:30

modules.txt

[hub] start

2015-02-18 19:09:56 +05:30

patches.txt

Merge pull request #3051 from rmehta/opportunity

2015-04-03 11:01:59 +05:30

tasks.py

Changed company name from Web Notes to Frappe Technologies

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