44 Commits

Author	SHA1	Message	Date
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
Akhilesh Darjee	e158cea77a	[cleanup] [minor] replaced for territory to applicable territory	2013-10-31 19:50:51 +05:30
Akhilesh Darjee	0b39e95011	[cleanup] moved for territory, price list and item price doctype from setup to stock	2013-10-31 12:35:52 +05:30
Rushabh Mehta	8c5a5f1ed5	New Setup Wizard	2013-10-08 17:59:11 +05:30
Nabin Hait	11f41955c9	[minor] fixed conflict while merging perpetual branch into master	2013-09-24 14:36:55 +05:30
Anand Doshi	f0fc9a54ee	[minor] [patch] removed patches from march to august 2012	2013-09-21 13:43:48 +05:30
Akhilesh Darjee	0dc627d9b1	[fix] [minor] price list patch fixed	2013-09-17 13:52:22 +05:30
Akhilesh Darjee	06713d997e	[fix] [minor] price list patch of june 2013 update fixed	2013-09-17 13:44:22 +05:30
Nabin Hait	5cd1d54347	[minor] merged with master branch	2013-09-17 10:30:24 +05:30
Akhilesh Darjee	c96c13af4e	[fix] make demo for price list	2013-09-12 19:19:46 +05:30
Anand Doshi	31f1f005dd	[minor] [patch] fixed old patch	2013-09-12 17:43:38 +05:30
Anand Doshi	94d62a8d9f	[minor] [patch] fixed old patch	2013-09-12 17:39:36 +05:30
Akhilesh Darjee	db59ffb76d	[usability] item price moved to price list	2013-09-11 13:05:24 +05:30
Nabin Hait	cc0e2d1740	[minor] merged with master	2013-08-06 16:19:18 +05:30
Nabin Hait	939b1523e9	[patch] perpetual accounting patch	2013-08-06 15:55:44 +05:30
Rushabh Mehta	e67d1fbcdf	[license] [minor] Updated License Text in all js and py files	2013-08-05 14:59:54 +05:30
Anand Doshi	17aa1337bc	[minor] fixed patch	2013-07-16 15:22:55 +05:30
Anand Doshi	e47963305d	[minor] fixed patch	2013-07-16 15:18:18 +05:30
Anand Doshi	8f9f8a43c7	[lead] [address] store lead address in Address doctype, with link field=lead	2013-06-28 19:18:33 +05:30
Anand Doshi	70902da4da	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: patches/december_2012/deprecate_tds.py patches/june_2012/reports_list_permission.py selling/doctype/sales_bom/locale/_messages_doc.json selling/doctype/sales_bom/locale/ar-doc.json selling/doctype/sales_bom/locale/de-doc.json selling/doctype/sales_bom/locale/es-doc.json selling/doctype/sales_bom/locale/fr-doc.json selling/doctype/sales_bom/locale/hi-doc.json selling/doctype/sales_bom/locale/hr-doc.json selling/doctype/sales_bom/locale/nl-doc.json selling/doctype/sales_bom/locale/pt-BR-doc.json selling/doctype/sales_bom/locale/pt-doc.json selling/doctype/sales_bom/locale/sr-doc.json selling/doctype/sales_bom/locale/ta-doc.json selling/doctype/sales_bom/locale/th-doc.json selling/doctype/sales_bom_item/locale/_messages_doc.json selling/doctype/sales_bom_item/locale/ar-doc.json selling/doctype/sales_bom_item/locale/de-doc.json selling/doctype/sales_bom_item/locale/es-doc.json selling/doctype/sales_bom_item/locale/fr-doc.json selling/doctype/sales_bom_item/locale/hi-doc.json selling/doctype/sales_bom_item/locale/hr-doc.json selling/doctype/sales_bom_item/locale/nl-doc.json selling/doctype/sales_bom_item/locale/pt-BR-doc.json selling/doctype/sales_bom_item/locale/pt-doc.json selling/doctype/sales_bom_item/locale/sr-doc.json selling/doctype/sales_bom_item/locale/ta-doc.json selling/doctype/sales_bom_item/locale/th-doc.json	2013-06-26 14:07:29 +05:30
Nabin Hait	50899d2bd4	[fix][patch] bom exploded items	2013-06-25 15:17:38 +05:30
Rushabh Mehta	d242a8babd	[patch] breakup global defaults	2013-06-25 11:46:07 +05:30
Rushabh Mehta	7a93d5de30	[bug fixes] [global defaults] [cleanup]	2013-06-24 18:18:46 +05:30
Rushabh Mehta	7925bd7079	[merge]	2013-06-24 15:47:02 +05:30
Nabin Hait	82366d3bb8	[report] deleted old reports based on search_criteria	2013-06-24 14:31:56 +05:30
Anand Doshi	61a2f68bc6	[webshop] territories in price list, taxes, updates in shopping cart settings	2013-06-21 17:55:31 +05:30
Anand Doshi	b5fd788131	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: projects/doctype/project/project.py utilities/transaction_base.py	2013-06-17 12:55:05 +05:30
Anand Doshi	11d311376e	[event] [fix] commonified delete_events method, which is executed before auto-creation of events. Fixed delete issue	2013-06-17 12:51:36 +05:30
Anand Doshi	a2e2d4bd19	[price list] [fix] fix in buying selling price list patch	2013-06-12 17:44:10 +05:30
Anand Doshi	060d9248d3	[fixes] buying/selling price lists, communication and website settings	2013-06-12 17:40:36 +05:30
Rushabh Mehta	a642d59cfd	[patch] [cleanup] drop unused tables	2013-06-11 17:32:48 +05:30
Anand Doshi	097ac352d6	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-10 15:38:31 +05:30
Anand Doshi	670199b9c6	[patch] [fix] event for project, oppty, lead	2013-06-10 15:38:01 +05:30
Anand Doshi	83ce95932a	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-10 15:28:40 +05:30
Anand Doshi	dec9a165ac	[patch] [fix] events for project, lead, oppty	2013-06-10 15:26:54 +05:30
Anand Doshi	7e2010a649	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: patches/patch_list.py projects/doctype/project/project.py utilities/transaction_base.py	2013-06-10 15:25:07 +05:30
Anand Doshi	e53a81dcea	[event] [lead, opportunity, project] [fix] create events	2013-06-10 15:15:40 +05:30
Anand Doshi	6e6fb42906	[projects] [patch] fixed project completed patch	2013-06-07 15:55:31 +05:30
Rushabh Mehta	224ad17b1d	[profile] removed themes	2013-06-07 15:09:45 +05:30
Rushabh Mehta	cdd265d3bf	[project] added patch	2013-06-07 14:52:53 +05:30
Nabin Hait	aec5553814	bom exploded items grouped by items	2013-06-04 17:20:47 +05:30
Nabin Hait	8d7310ac5f	bom exploded items grouped by items	2013-06-04 17:11:43 +05:30
Nabin Hait	89ab4719ff	bom exploded items grouped by items	2013-06-04 17:07:57 +05:30
Nabin Hait	ad600cce22	bom exploded items grouped by items	2013-06-04 16:56:56 +05:30