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

..

campaign

Adding German translation

2013-02-27 17:36:23 +01:00

communication_log/locale

Adding German translation

2013-02-27 17:36:23 +01:00

customer

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

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

industry_type

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

installation_note

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

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

installation_note_item

added print width in txts of istable type doctypes

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

lead

[lead to customer] [fix] fix for creating customer from lead when there are restrictive permissions based on company for creating customer

2013-05-10 00:39:15 +05:30

opportunity

[quotation][improvement] when made from lead

2013-04-02 18:13:20 +05:30

opportunity_item

added print width in txts of istable type doctypes

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

quotation

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

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

quotation_item

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

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

sales_common

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

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

sales_order

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

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

sales_order_item

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

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

sales_team

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

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

shipping_address

Adding German translation

2013-02-27 17:36:23 +01:00

sms_center

Adding German translation

2013-02-27 17:36:23 +01:00

__init__.py

moved directory structure

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