399 Commits

Author	SHA1	Message	Date
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
Anand Doshi	8bef70cceb	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-26 13:53:17 +05:30
Anand Doshi	bd7218979e	[shipping rule] added doctypes shipping rule and shipping rule conditions	2013-06-26 13:53:01 +05:30
Nabin Hait	e26acffcfe	[report] available qty for packing items	2013-06-26 13:47:11 +05:30
Akhilesh Darjee	e05e6a114e	[Fix]SMS Center Cell Number	2013-06-25 18:00:30 +05:30
Rushabh Mehta	e08f1bc034	[email] [fix] decode subject	2013-06-25 16:21:58 +05:30
Rushabh Mehta	9132de5e4c	[global defaults] breakup added buying settings and selling settings	2013-06-25 11:54:37 +05:30
Rushabh Mehta	d242a8babd	[patch] breakup global defaults	2013-06-25 11:46:07 +05:30
Akhilesh Darjee	78e622ef5c	Deleted search criteria	2013-06-25 11:08:19 +05:30
Akhilesh Darjee	a19014a846	Moved Sales BOM & Sales BOM Item to Selling module, completed 'Available Stock for packing Items' report	2013-06-24 19:05:16 +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
Nabin Hait	4cd977a2a9	[fixes] pull previous doc details	2013-06-24 12:20:35 +05:30
Anand Doshi	61a2f68bc6	[webshop] territories in price list, taxes, updates in shopping cart settings	2013-06-21 17:55:31 +05:30
Nabin Hait	99fd749334	[report][cleanup] pending so items for purchase request	2013-06-21 16:56:32 +05:30
Saurabh	36cb3caaa7	[Pending so Items for purchase receipt]	2013-06-21 16:25:28 +05:30
Akhilesh Darjee	64c8e28423	[Fixed] Merge conflict fixed	2013-06-21 13:09:18 +05:30
Akhilesh Darjee	1ded5c618e	[Report]Cleanup of territory target variance, sales person target variance & budget variance reports	2013-06-21 12:47:51 +05:30
Anand Doshi	d52b03a8cc	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: accounts/search_criteria/trend_analyzer/trend_analyzer.py buying/doctype/purchase_common/purchase_common.js	2013-06-21 12:22:52 +05:30
Saurabh	7989deda20	Merge branch 'master' of https://github.com/webnotes/erpnext	2013-06-21 10:54:12 +05:30
Saurabh	f8f68c54d9	[trends analyzer] cleanup completed	2013-06-20 18:52:31 +05:30
Nabin Hait	0930b94264	[target report] cleanup	2013-06-20 16:35:09 +05:30
Nabin Hait	739a7fdf74	Merge pull request #494 from akhileshdarjee/master ... [Report] Completed Territory Target Variance & Sales Person Target Variance reports	2013-06-20 02:53:31 -07:00
Akhilesh Darjee	e6974d10c2	Fixed conflict merge	2013-06-20 15:22:04 +05:30
Nabin Hait	b8ebbcafa9	[trend analyzer] cleanup	2013-06-20 13:03:10 +05:30
Nabin Hait	616657d4a2	Merge pull request #495 from saurabh6790/master ... [erpnext][reports][Trend Analyzer]	2013-06-19 22:18:44 -07:00
Akhilesh Darjee	92571c6929	[Report] Completed Budget variance Report and corrections in Territory Target Varinace & Sales Person Target Variance Report	2013-06-19 18:15:20 +05:30
Anand Doshi	c2a352711f	[shopping cart] show items, editable qty and show amount for that item	2013-06-19 17:19:20 +05:30
Akhilesh Darjee	4ddc2618e8	[Report] Completed Sales Person Target Variance (Item-Group wise)	2013-06-18 18:46:02 +05:30
Anand Doshi	ca628d9f54	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: selling/doctype/sales_order/sales_order.txt	2013-06-18 18:30:41 +05:30
Anand Doshi	3c6c3cf5ee	[sales order] [shipping address] allow to edit shipping address	2013-06-18 18:26:30 +05:30
Akhilesh Darjee	2967581102	Merge branch 'master' of https://github.com/webnotes/erpnext	2013-06-17 19:27:30 +05:30
Akhilesh Darjee	f841a7bc14	Completed territory_target_variance(item_group_wise) report	2013-06-17 19:25:48 +05:30
Anand Doshi	e81321219e	[webshop] [cart] add to cart, remove_from_cart, update qty, checkout methods	2013-06-17 15:42:38 +05:30
Rushabh Mehta	64c2764b56	[translations/build] deleted translation files (to be built on demand)	2013-06-17 11:56:41 +05:30
Anand Doshi	abc100302c	[cart] create quotation on checkout	2013-06-14 17:44:03 +05:30
Saurabh	feb8669cbd	[Reports][Validation changes in Purchase and Sales trends]	2013-06-14 17:40:48 +05:30
Saurabh	606d8383ff	Merge branch 'master' of https://github.com/webnotes/erpnext	2013-06-14 16:48:41 +05:30
Saurabh	1848b71a0a	[Reports][Sales and Purchase Trends][Completed]	2013-06-14 15:03:45 +05:30
Rushabh Mehta	37982a6a1f	[contact/address] fixed auto setting closes #475 (erpnext)	2013-06-14 13:29:20 +05:30
Saurabh	0326f5414e	[reports][purchase and sales trends]	2013-06-13 19:17:56 +05:30
Saurabh	f9966f44cd	[Report][Quotation Trend Complete]	2013-06-12 17:55:19 +05:30
Anand Doshi	060d9248d3	[fixes] buying/selling price lists, communication and website settings	2013-06-12 17:40:36 +05:30
Saurabh	bcbd9a4800	[Report][Quotation Trend]	2013-06-11 18:06:58 +05:30
Anand Doshi	3daf45fcd8	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-11 17:34:18 +05:30
Anand Doshi	2e0cc41fc6	[chart of accounts/cost center] [add account/cost center] fix in permission issue	2013-06-11 17:33:37 +05:30
Anand Doshi	3b867f7377	[cleanup] [fix] removed amendment_date	2013-06-11 17:21:11 +05:30
Anand Doshi	b53b9dcff4	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-11 16:23:45 +05:30
Anand Doshi	27e6f13b5d	[cleanup] deprecated search criteria, amendment_date, cancel_reason	2013-06-11 16:23:18 +05:30