Commit Graph

5871 Commits

Author SHA1 Message Date
Anand Doshi
996191e8b7 [purchase invoice] [fix] error message for missing expense account for an item 2013-05-27 18:28:36 +05:30
Nabin Hait
da6e4670a3 [report][fix] filter fixes in sales/pur register 2013-05-27 16:34:15 +05:30
Rushabh Mehta
74560b32c1 [website] updates for bootstrap3 2013-05-27 14:47:56 +05:30
Anand Doshi
5dfba486a6 [note] [fix] strip invalid characters from title and set it as the name of the note 2013-05-27 12:25:28 +05:30
Anand Doshi
149b461e62 Merge branch 'master' of github.com:webnotes/erpnext into webshop 2013-05-24 19:28:36 +05:30
Anand Doshi
3543f30046 [calculations] [client/server] first cut 2013-05-24 19:25:01 +05:30
Rushabh Mehta
d9384c0583 [listview] fixed alignment of tags and fixed progress bars 2013-05-24 17:26:27 +05:30
Rushabh Mehta
43c51b63c4 [form] added print email buttons, fixes to editor, note 2013-05-24 16:52:21 +05:30
Rushabh Mehta
b4a2949c37 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:21 +05:30
Rushabh Mehta
9c5f4fe165 [knowledge base] removed and added patch to move to notes 2013-05-24 16:33:10 +05:30
Rushabh Mehta
7e118cd875 Merge branch 'edge' of github.com:webnotes/erpnext into responsive 2013-05-24 16:11:09 +05:30
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Rushabh Mehta
9b10e362f7 [form/list] ui fixes, [note] new table to merge question + answer 2013-05-24 16:00:56 +05:30
Nabin Hait
7cd49529f4 [sales invoice][fix] float precision issue 2013-05-24 13:51:25 +05:30
Nabin Hait
f2e981459f Merge branch 'master' into edge 2013-05-24 12:14:18 +05:30
Rushabh Mehta
8e95af35d3 [form] [tags] added tags via tag-it in forms and listview 2013-05-24 11:20:44 +05:30
Anand Doshi
2168e39bf3 [selling/buying] set dynamic labels 2013-05-23 19:25:08 +05:30
Nabin Hait
93ed5b9dae [sales invoice][fix] check item rate with sales order and delivery note 2013-05-23 19:21:58 +05:30
Nabin Hait
3d75ad1896 [sales invoice][fix] check item rate with sales order and delivery note 2013-05-23 19:14:28 +05:30
Nabin Hait
f4591ecc24 [stock ledger][fix] message for negative qty error 2013-05-23 19:07:10 +05:30
Nabin Hait
1e2350d182 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-23 17:42:15 +05:30
Nabin Hait
b56412c646 [fixes][aii] cancelled gl entry for delivery note and patch 2013-05-23 17:41:52 +05:30
Rushabh Mehta
b394a25904 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:49 +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
ded5da5b40 Merge branch 'master' into edge 2013-05-23 13:34:31 +05:30
Anand Doshi
654b970eef Merge branch 'master' of github.com:webnotes/erpnext 2013-05-23 12:59:30 +05:30
Anand Doshi
aabe11b689 [sales order] [validate] validate item details specifically when submitting 2013-05-23 12:59:12 +05:30
Nabin Hait
5dc36f416a [permission] delete permission added for pos setting 2013-05-23 12:53:47 +05:30
Nabin Hait
d39b30ab99 [validation] invoice rate will be same as order/delivery 2013-05-23 11:44:18 +05:30
Anand Doshi
b0299592f2 Merge branch 'master' into edge 2013-05-22 22:15:15 +05:30
Nabin Hait
455c245dce Merge branch 'master' of github.com:webnotes/erpnext 2013-05-22 16:55:54 +05:30
Nabin Hait
66928243c1 [fixes] removed communication section break from quotation 2013-05-22 16:55:10 +05:30
Anand Doshi
87ddf11374 Merge branch 'master' into edge 2013-05-22 16:32:47 +05:30
Anand Doshi
3f15a04a35 [website] [product group] show search and breadcrumbs below the item group's description 2013-05-22 16:31:15 +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
aed6530b08 Merge branch 'master' into edge 2013-05-22 15:52:36 +05:30
Anand Doshi
488a821534 [website] [fix] fixes in sitemap and rss generators 2013-05-22 15:51:47 +05:30
Anand Doshi
6241012f08 [website] [slideshow] clear website cache on update of a slide show 2013-05-22 12:37:50 +05:30
Anand Doshi
176526e933 Merge branch 'master' into edge 2013-05-22 12:23:13 +05:30
Anand Doshi
ace9cbad9e [support] [fix] [patch] reload support ticket and communication before the patch 2013-05-22 12:22:29 +05:30
Anand Doshi
07e2291fb8 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-22 12:16:40 +05:30
Anand Doshi
dcfb4b7ab9 [website] [fix] explicitly pass meta description 2013-05-22 12:14:31 +05:30
Nabin Hait
b7e07ac6a5 [fixes] updated no_copy field 2013-05-22 12:10:16 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
65d8755567 [selling] [calculation] fixes 2013-05-21 19:53:33 +05:30
Anand Doshi
5be11b44ac Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	controllers/buying_controller.py
2013-05-21 19:40:09 +05:30
Anand Doshi
f309613a7d [selling] [calculations] client side calculations, cleanup, patch fixes 2013-05-21 19:35:06 +05:30
Nabin Hait
cb99045764 [patch] update lead, contact in support ticket 2013-05-21 17:17:40 +05:30
Nabin Hait
e2089fb712 [fixes] set lead, contact and company on support ticket 2013-05-21 16:53:31 +05:30