brotherton-erpnext/selling/doctype
Anand Doshi daaa14c079 Merge branch '1310' of github.com:webnotes/erpnext
Conflicts:
	setup/doctype/setup_control/setup_control.py
	stock/doctype/stock_entry/stock_entry.py
	utilities/demo/demo_docs/Price_List.csv
2013-11-04 13:14:39 +05:30
..
campaign [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
customer Merge branch 'i18n' of git://github.com/bperretti/erpnext into bperretti-i18n 2013-10-24 11:40:32 +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 [Cleanup] Sales Common deprecated 2013-10-18 12:50:28 +05:30
installation_note_item [minor] removed prevdoc_date 2013-10-10 17:08:19 +05:30
lead Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n 2013-10-16 15:09:18 -03:00
opportunity [fix] [merge conflict] 2013-10-24 11:57:02 +05:30
opportunity_item [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
quotation [fix] [merge conflict] 2013-10-24 11:57:02 +05:30
quotation_item [cleanup] [minor] removed default value 0.00 2013-08-07 15:06:51 +05:30
sales_bom Fix translate selling/doctype/sales_bom/sales_bom.js 2013-10-15 17:54:25 -03:00
sales_bom_item [usability] item price moved to price list 2013-09-11 13:05:24 +05:30
sales_order [fix] [conflict] 2013-10-18 12:55:59 +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 [naming series] create, remove Property Setters to set naming fixes webnotes/erpnext#854 2013-10-18 17:27:45 +05:30
shopping_cart_price_list [website] [minor] moving to framework 2013-09-10 18:29:39 +05:30
shopping_cart_settings [cleanup] [minor] for territory fixed to applicable territory 2013-10-31 19:56:31 +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