Anand Doshi 879ec66ea3 Merge branch 'production' of github.com:webnotes/erpnext into production ...

Conflicts:
	accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
	buying/doctype/purchase_order_item/purchase_order_item.txt
	buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
	patches/patch_list.py

2012-12-19 22:28:00 +05:30

..

doctype

merged with master

2012-12-14 10:43:56 +05:30

page

fixed conflict

2012-12-19 12:18:15 +05:30

__init__.py

added disabled in Report and no_sync fields in import_merge

2012-12-19 15:34:00 +05:30

cleanup_data.py

begin commit fix in cleanup data

2012-10-09 15:19:59 +02:00

transaction_base.py

removed unnecessary imports

2012-11-30 16:38:04 +05:30