Anand Doshi 7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py

2013-10-15 12:18:46 +05:30

..

campaign

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

customer

[communication] [setup wizard] [minor] [fixes]

2013-10-09 16:08:54 +05:30

customer_discount

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

industry_type

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

installation_note

[minor] removed prevdoc_date

2013-10-10 17:08:19 +05:30

installation_note_item

[minor] removed prevdoc_date

2013-10-10 17:08:19 +05:30

lead

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

2013-10-15 12:18:46 +05:30

opportunity

Merged master into wsgi

2013-10-10 16:04:40 +05:30

opportunity_item

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

quotation

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

2013-10-15 12:18:46 +05:30

quotation_item

[cleanup] [minor] removed default value 0.00

2013-08-07 15:06:51 +05:30

sales_bom

[usability] item price moved to price list

2013-09-11 13:05:24 +05:30

sales_bom_item

[usability] item price moved to price list

2013-09-11 13:05:24 +05:30

sales_common

[minor] removed prevdoc_date

2013-10-10 17:08:19 +05:30

sales_order

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

2013-10-15 12:18:46 +05:30

sales_order_item

[fix] [minor] removed reserved warehouse from no_copy in sales order item

2013-08-22 15:43:18 +05:30

sales_team

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

selling_settings

[cleanup] [minor] price list field rename (wip), set default supplier from item, make demo - purchase cycle (wip)

2013-08-09 15:30:11 +05:30

shopping_cart_price_list

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

shopping_cart_settings

[fix] [minor] show missing currency message in shopping cart settings

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

shopping_cart_shipping_rule

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

shopping_cart_taxes_and_charges_master

[website] [minor] moving to framework

2013-09-10 18:29:39 +05:30

sms_center

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

2013-09-25 19:55:41 +05:30

__init__.py

moved directory structure

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