148 Commits

Author	SHA1	Message	Date
Nabin Hait	650501526f	[merge] fixed conflict	2013-07-07 11:38:10 +05:30
Nabin Hait	00d344b934	[fixes] default records while install	2013-07-05 11:32:18 +05:30
Nabin Hait	3525481823	[patch] restore defaults	2013-07-05 11:27:26 +05:30
Rushabh Mehta	5381bdd730	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-26 17:21:03 +05:30
Rushabh Mehta	2f7e1abd0f	[setup] new page + minor fixes	2013-06-26 17:20:12 +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
Rushabh Mehta	a94d1af871	[install] fixes - do not update parent doctype if in_import	2013-06-25 12:36:13 +05:30
Nabin Hait	3e8eca35a2	[report][fix] stock balance	2013-06-24 17:18:24 +05:30
Rushabh Mehta	7925bd7079	[merge]	2013-06-24 15:47:02 +05:30
Rushabh Mehta	847cfe2b07	[docs] [setup] cleanup	2013-06-24 15:43:18 +05:30
Nabin Hait	8b96ba1da6	[general ledger] group by voucher	2013-06-24 13:54:16 +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	f78d16cca1	[general ledger] group by voucher option	2013-06-21 15:13:49 +05:30
Rushabh Mehta	68b9b1f11d	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-18 15:47:24 +05:30
Rushabh Mehta	4736c35662	[commit] unified notifications	2013-06-18 15:46:32 +05:30
Anand Doshi	aa0ccf8223	Merge branch 'responsive' of github.com:webnotes/erpnext into responsive	2013-06-17 13:46:55 +05:30
Rushabh Mehta	dd790a57ba	[keyboard shortcuts] keyboard shortcuts using jquery hotkeys instead of mousetrap	2013-06-17 12:55:54 +05:30
Anand Doshi	1e820f352e	Merge branch 'master' of github.com:webnotes/erpnext into responsive ... Conflicts: buying/doctype/purchase_common/purchase_common.py	2013-06-17 12:02:04 +05:30
Anand Doshi	ad6180ef6d	[material request on re-order level] [fixes] if error occurs, send email to the System Manager	2013-06-17 11:57:04 +05:30
Rushabh Mehta	a642d59cfd	[patch] [cleanup] drop unused tables	2013-06-11 17:32:48 +05:30
Anand Doshi	27e6f13b5d	[cleanup] deprecated search criteria, amendment_date, cancel_reason	2013-06-11 16:23:18 +05:30
Rushabh Mehta	c382eb58d5	[cleanup] removed Featured Item, Website Product Category, Valuation Control	2013-06-11 12:03:37 +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
Nabin Hait	ed7d8e6b66	Merge branch 'master' of github.com:webnotes/erpnext	2013-05-22 16:26:38 +05:30
Nabin Hait	62d0629d61	[feature] reorder level checking through scheduler	2013-05-22 16:19:10 +05:30
Anand Doshi	488a821534	[website] [fix] fixes in sitemap and rss generators	2013-05-22 15:51:47 +05:30
Anand Doshi	3f9366bb6c	Merge branch 'edge' of github.com:webnotes/erpnext into webshop ... Conflicts: stock/doctype/item/item.txt	2013-05-06 12:07:30 +05:30
Anand Doshi	cd772daf1d	[website] [fix]	2013-05-02 17:47:17 +05:30
Anand Doshi	07f6958c1f	[login] [disable signup] option to disable signup link in login page	2013-05-02 15:51:45 +05:30
Anand Doshi	aeef7bd910	[sales taxes and charges] renamed field cost_center_other_charges to cost_center	2013-04-19 16:21:55 +05:30
Anand Doshi	5717fe3aba	[cost center] [default value] default cost center for each company, auto set default cost center for various transactions during creation	2013-04-17 18:02:52 +05:30
Rushabh Mehta	3023a8fa9b	[website] [cleanup] separated website generation in framework and erpnext	2013-04-03 16:34:23 +05:30
Rushabh Mehta	27c4079ff9	[framework] [cleanup] desktop, todo, messages, modules setup moved to framework	2013-04-03 15:21:44 +05:30
Rushabh Mehta	9db1a68d89	[website] [cleanup] moved website generic utils to framework	2013-04-02 10:41:37 +05:30
Rushabh Mehta	74506e96d3	[profile/email] [feature] added option not to send print as email body. fix in profile delete	2013-03-25 17:52:14 +05:30
Rushabh Mehta	06d186ba98	[stock] [feature] added project to stock ledger entry and updated stock balance report	2013-03-25 17:03:52 +05:30
Anand Doshi	d5aeb21dd9	fix in get_value_diff of stock grid report: case for serialized items	2013-03-08 12:46:48 +05:30
Rushabh Mehta	481d0deaca	fix in schedule handler	2013-03-07 12:48:47 +05:30
Rushabh Mehta	202508410c	completed dropbox backup in backup manager	2013-03-07 12:25:21 +05:30
Rushabh Mehta	07287e8b93	removed colour fields from txt files	2013-03-05 14:19:48 +05:30
Rushabh Mehta	5640a69e78	updated sync	2013-03-05 14:12:34 +05:30
Rushabh Mehta	213b180060	merge, update bean validations	2013-03-01 19:09:06 +05:30
Rushabh Mehta	fee642d547	completed Time Log / Time Log Batch	2013-03-01 18:24:52 +05:30
Anand Doshi	a6acdda094	fixes in calendar event display on desktop	2013-03-01 14:41:32 +05:30
Rushabh Mehta	b21eb9ac09	added time log batch	2013-02-28 18:42:46 +05:30
billyfordson	9b352309c6	Adding German translation	2013-02-27 17:36:23 +01:00
Rushabh Mehta	ed19666e1b	added Time Log	2013-02-26 16:36:41 +05:30
Anand Doshi	805fdf313c	shifted item name and description fields to the left of stock reports	2013-02-26 12:23:39 +05:30
Rushabh Mehta	9e02949821	updated language and separated slickgrid files	2013-02-25 11:05:27 +05:30
Rushabh Mehta	dcb1b659b5	added language	2013-02-21 17:05:01 +05:30