Commit Graph

6581 Commits

Author SHA1 Message Date
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
Nabin Hait
8a7d4f51b4 [latest updates] 2013-05-17 12:49:15 +05:30
Nabin Hait
b9669de3ff [patch] repost_stock: commit after every 50 2013-05-17 12:21:13 +05:30
Nabin Hait
f826b93a75 [patch] set conversion factor in pur invoice and repost stock_received_but_not_billed patch 2013-05-17 12:19:50 +05:30
Anand Doshi
44a01faff9 [patches] [fix] fixed an old patch 2013-05-16 16:17:15 +05:30
Anand Doshi
27ff675a07 [patches] [fix] fixed an old patch 2013-05-16 16:15:19 +05:30
Anand Doshi
9a22e3f1db [patches] [fix] fixed an old patch 2013-05-16 16:13:16 +05:30
Anand Doshi
cae99dbf71 [patches] [fix] fixed an old patch 2013-05-16 15:57:45 +05:30
Anand Doshi
6e0e1c8fcc [patches] [fix] fixed an old patch 2013-05-16 15:46:32 +05:30
Anand Doshi
101877276e [patches] [fix] fixed an old patch 2013-05-16 15:45:06 +05:30
Anand Doshi
71c265dee8 [patches] [fix] fix in old patch 2013-05-16 15:42:56 +05:30
Anand Doshi
6febab9f92 [patches] [fix] fix in an old patch 2013-05-16 15:40:07 +05:30
Anand Doshi
c852596f15 [patches] [fix] removed purchase request reload 2013-05-16 15:37:36 +05:30
Anand Doshi
1d4b5b4ca6 [patches] [fix] removed blog reload 2013-05-16 15:35:08 +05:30
Anand Doshi
45736cf2a9 Merge branch 'master' of github.com:webnotes/erpnext 2013-05-16 15:28:34 +05:30
Anand Doshi
4221814131 [patches] [fix] replace sync with reload_doc in old patches 2013-05-16 15:28:19 +05:30
Nabin Hait
b4cb103e65 Merge branch 'master' into edge 2013-05-16 11:03:47 +05:30
Nabin Hait
1fd546f424 [fixes] prosting date for gl entry 2013-05-16 11:02:07 +05:30
Anand Doshi
0eef6e9e42 Merge branch 'edge' of github.com:webnotes/erpnext into webshop
Conflicts:
	patches/patch_list.py
2013-05-15 21:18:27 +05:30
Anand Doshi
1dde46aff0 [buying, selling] [refactor] get item details 2013-05-15 21:15:57 +05:30
Anand Doshi
bad148a431 Merge branch 'master' into edge 2013-05-15 12:39:08 +05:30
Anand Doshi
bfc18ea6c4 [setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration 2013-05-15 12:24:50 +05:30
Anand Doshi
fdec02385d Merge branch 'master' into edge 2013-05-15 11:42:50 +05:30
Anand Doshi
2e311acaa5 [website] [fix] fixes in support ticket and profile pages, when using guest user login 2013-05-15 11:42:09 +05:30
Anand Doshi
4f4873695b Merge branch 'master' into edge 2013-05-14 19:26:23 +05:30
Anand Doshi
4430c0d718 [upload attendance] [fix] fixed import issue for role restricted whitelist methods 2013-05-14 19:23:37 +05:30