Anand Doshi 15db6c4659 Merge branch 'master' of github.com:webnotes/erpnext into responsive ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py

2013-07-02 11:50:32 +05:30

..

js

[lead] [address] store lead address in Address doctype, with link field=lead

2013-06-28 19:18:33 +05:30

__init__.py

fixes in tax controller and test purchase receipt

2012-12-04 11:49:37 +05:30

accounts_controller.py

Merge branch 'master' of github.com:webnotes/erpnext into responsive

2013-07-02 11:50:32 +05:30

buying_controller.py

Merge branch 'master' of github.com:webnotes/erpnext into responsive

2013-06-21 12:22:52 +05:30

selling_controller.py

[cart] create quotation on checkout

2013-06-14 17:44:03 +05:30

status_updater.py

[status updater] managed by controllers and commonified for sales and purchase

2013-06-03 16:45:38 +05:30

stock_controller.py

aii fixes

2013-03-29 16:42:33 +05:30

trends.py

Merge branch 'master' of https://github.com/webnotes/erpnext

2013-06-21 16:35:50 +05:30