Anand Doshi 4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt

2013-05-23 15:22:47 +05:30

..

april_2012

first cut error fixes

2013-01-09 15:23:05 +05:30

april_2013

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

2013-05-17 15:10:57 +05:30

august_2012

[patches] [fix] fixed an old patch

2013-05-16 15:45:06 +05:30

december_2012

removed print statements

2013-04-09 17:43:36 +05:30

february_2013

[patches] [fix] fixed an old patch

2013-05-16 15:57:45 +05:30

january_2013

removed print statements

2013-04-09 17:43:36 +05:30

july_2012

[patches] [fix] fix in an old patch

2013-05-16 15:40:07 +05:30

june_2012

[patches] [fix] removed blog reload

2013-05-16 15:35:08 +05:30

mar_2012

[patches] [fix] replace sync with reload_doc in old patches

2013-05-16 15:28:19 +05:30

march_2013

fixe sin patch

2013-04-11 16:02:06 +05:30

may_2012

[patches] [fix] replace sync with reload_doc in old patches

2013-05-16 15:28:19 +05:30

may_2013

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

2013-05-23 15:22:47 +05:30

november_2012

fixed patches for new sync

2013-03-06 11:30:09 +05:30

october_2012

[patches] [fix] fix in update_account_property_patch

2013-04-22 14:25:06 +05:30

september_2012

[patches] [fix] fixed an old patch

2013-05-16 15:46:32 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30

patch_list.py

Merge branch 'edge' of github.com:webnotes/erpnext into webshop

2013-05-23 15:22:47 +05:30