284 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
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
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	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
Anand Doshi	c2a352711f	[shopping cart] show items, editable qty and show amount for that item	2013-06-19 17:19:20 +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
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
Rushabh Mehta	37982a6a1f	[contact/address] fixed auto setting closes #475 (erpnext)	2013-06-14 13:29:20 +05:30
Anand Doshi	060d9248d3	[fixes] buying/selling price lists, communication and website settings	2013-06-12 17:40:36 +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
Rushabh Mehta	f85368ec5e	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-11 16:07:44 +05:30
Anand Doshi	5c069050d5	Merge branch 'master' of github.com:webnotes/erpnext into responsive	2013-06-11 14:34:45 +05:30
Anand Doshi	433047b2e2	[customer] [permlevel] changed fields/perms with permlevel 2 to permlevel 1	2013-06-11 14:28:42 +05:30
Rushabh Mehta	0b61c2e10f	[docs] added readme for selling	2013-06-11 14:24:25 +05:30
Rushabh Mehta	3c8cffb69b	[cleanup] removed Shipping Address, Communication Log	2013-06-11 14:23:59 +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	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	b2dc1aeca9	[lead] [next contact] [fix] create event	2013-06-10 12:34:31 +05:30
Anand Doshi	9d04924bc2	[selling] [cleanup] rearranged fields	2013-06-05 20:46:56 +05:30
Anand Doshi	12cea9587f	[terms and conditions] removed terms html and added terms and conditions to purchase invoice	2013-06-05 14:59:28 +05:30
Anand Doshi	bf3e54a45b	[issues #437] [fix] pulling terms and conditions	2013-06-05 14:11:32 +05:30
Nabin Hait	c6548b64c2	[fixes][merge conflict]	2013-06-05 12:53:53 +05:30
Nabin Hait	0feebc1a67	[status updater] managed by controllers and commonified for sales and purchase	2013-06-03 16:45:38 +05:30
Anand Doshi	ecc28f0311	[sales invoice] [update stock] allow update stock in sales invoice, without it being a pos invoice	2013-05-30 17:43:30 +05:30
Anand Doshi	200c8f7980	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: accounts/doctype/sales_invoice/sales_invoice.py selling/doctype/sales_common/sales_common.py	2013-05-29 12:30:54 +05:30
Nabin Hait	df33532280	[fixes] pulling available qty on selection of item in case of pos	2013-05-29 11:03:11 +05:30
Anand Doshi	5d74c82c06	Merge branch 'webshop' of github.com:webnotes/erpnext into responsive ... Conflicts: selling/doctype/quotation/quotation.js	2013-05-28 17:46:50 +05:30
Anand Doshi	923d41dfd2	[selling/buying] [fixes] fixes in client side code, server side code, print formats	2013-05-28 17:23:36 +05:30
Nabin Hait	77a2ee01e2	[rename][fixes] do not update customer name of renaming of customer	2013-05-28 11:56:48 +05:30
Anand Doshi	fc77718a3d	[selling/buying] [fixes] updated js files of various doctypes related to selling/g/buying	2013-05-27 19:29:07 +05:30
Anand Doshi	3543f30046	[calculations] [client/server] first cut	2013-05-24 19:25:01 +05:30
Rushabh Mehta	126f2c62f2	[merge] merge with master	2013-05-24 16:09:13 +05:30
Anand Doshi	2168e39bf3	[selling/buying] set dynamic labels	2013-05-23 19:25:08 +05:30
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
Anand Doshi	aabe11b689	[sales order] [validate] validate item details specifically when submitting	2013-05-23 12:59:12 +05:30