Commit Graph

5950 Commits

Author SHA1 Message Date
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
Nabin Hait
5e50ffa308 [fixes] employee query in leave application 2013-05-21 15:31:32 +05:30
Rushabh Mehta
b4854e79f5 [docs] started copy-pasting existing user manual 2013-05-21 15:28:46 +05:30
Nabin Hait
96e4de3aac Merge branch 'master' into edge 2013-05-21 11:15:22 +05:30
Nabin Hait
a35466b008 [price list] on deletion of price list, delete all item price record for the same price list 2013-05-20 18:32:06 +05:30
Rushabh Mehta
dfbd99888b [docs] now common website for all documentation - erpnext.org 2013-05-20 17:44:08 +05:30
Rushabh Mehta
9acf570278 [docs] moved to file generator 2013-05-20 15:36:58 +05:30
Nabin Hait
17c790cdbe Merge branch 'master' of github.com:webnotes/erpnext 2013-05-20 15:30:33 +05:30
Nabin Hait
f8525fea06 [fixes][patch] update valuation rate in purchase cycle and repost patch 2013-05-20 15:30:02 +05:30
Nabin Hait
9053cbc9f8 [fixes][patch] update valuation rate in purchase cycle and repost patch 2013-05-20 15:28:44 +05:30
Nabin Hait
fdefe0750a [fixes] item valuation rate in pur cycle 2013-05-20 13:59:24 +05:30
Anand Doshi
dcbfeca3da Merge branch 'master' into edge 2013-05-20 13:51:08 +05:30
Anand Doshi
1d49d3fcc7 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-20 13:48:20 +05:30
Anand Doshi
6b2aa7ed0d [country info] [fix] added additional timezones + fixed fresh install 2013-05-20 13:43:50 +05:30
Rushabh Mehta
893bb122f2 [docs] added ability to add static pages in docs folder and README.md in modules and doctypes 2013-05-20 13:19:47 +05:30
Nabin Hait
031b7b3069 [fixes] repost stock: commit after every 20 2013-05-20 12:19:57 +05:30
Anand Doshi
b5aa8da0dd Merge branch 'edge' of github.com:webnotes/erpnext into webshop 2013-05-17 15:12:49 +05:30
Anand Doshi
8d04f8b045 Merge branch 'master' into edge 2013-05-17 15:11:31 +05:30
Anand Doshi
48787e944e Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/april_2013/p05_update_file_data.py
2013-05-17 15:10:57 +05:30
Nabin Hait
d37ac68f1b [fixes] fixes in patch 2013-05-17 13:17:01 +05:30
Nabin Hait
434c1c69cc Merge branch 'master' into edge 2013-05-17 12:51:56 +05:30
Nabin Hait
8f78bec5b8 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-17 12:49:36 +05:30