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

..

purchase_common

[selling] [calculations] client side calculations, cleanup, patch fixes

2013-05-21 19:35:06 +05:30

purchase_order

[purchase] [validation] validate warehouse belongs to company if set

2013-05-02 11:34:37 +05:30

purchase_order_item

[fixes] updated no_copy field

2013-05-22 12:10:16 +05:30

purchase_order_item_supplied

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

purchase_receipt_item_supplied

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

quality_inspection

[autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype

2013-05-09 15:13:47 +05:30

quality_inspection_reading

added print width in txts of istable type doctypes

2013-03-07 11:37:33 +05:30

supplier

[rename] [fix] merge should be passed to on_rename method of controller for further processing

2013-05-09 12:45:18 +05:30

supplier_quotation

[files] [patch] dropped file_list property and moved links to

2013-04-10 11:08:50 +05:30

supplier_quotation_item

[fixes] updated no_copy field

2013-05-22 12:10:16 +05:30

__init__.py

moved directory structure

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