Commit Graph

3067 Commits

Author SHA1 Message Date
Anand Doshi
255d58b3a0 fixes in error logging and refresh cache issues 2012-07-13 08:53:07 +05:30
Anand Doshi
31d8e5618e Merge branch 'master' into dev 2012-07-13 08:24:28 +05:30
Anand Doshi
6c3b622c00 fixes in cms2 patch 2012-07-13 08:24:16 +05:30
Anand Doshi
1d2826d69d Merge branch 'master' into dev 2012-07-13 08:15:34 +05:30
Anand Doshi
665f6048f1 do not delete web cache in refresh cache 2012-07-13 08:15:03 +05:30
Anand Doshi
72a824f483 do not delete web cache in refresh cache 2012-07-13 08:14:32 +05:30
Anand Doshi
91f731641c Merge branch 'master' into dev 2012-07-13 02:16:54 +05:30
Anand Doshi
4cf55c5a04 fixes in blog caching 2012-07-13 02:16:22 +05:30
Anand Doshi
46ac229edc Merge branch 'master' into dev 2012-07-13 01:45:33 +05:30
Anand Doshi
53bd49d46c fixes in blog cache logic 2012-07-13 01:45:19 +05:30
Anand Doshi
d738a2106d Merge branch 'master' into dev 2012-07-13 01:32:36 +05:30
Anand Doshi
51eb8a18ba fix in blog caching 2012-07-13 01:32:23 +05:30
Anand Doshi
0842fad927 Merge branch 'master' into dev 2012-07-13 01:22:32 +05:30
Anand Doshi
970988664a clear cache if home page 2012-07-13 01:22:19 +05:30
Anand Doshi
aa3ab5ec59 Merge branch 'master' into dev 2012-07-13 01:15:08 +05:30
Anand Doshi
200c443b72 fixes in blog list 2012-07-13 01:14:52 +05:30
Anand Doshi
8b8478178c Merge branch 'master' into dev 2012-07-13 00:47:17 +05:30
Anand Doshi
f01059fd3e fixes in blog list 2012-07-13 00:46:59 +05:30
Anand Doshi
4a56e996f1 Merge branch 'master' into dev 2012-07-12 23:38:45 +05:30
Anand Doshi
4659b1eb25 log error on saving doclist in cms2 patch 2012-07-12 23:38:31 +05:30
Anand Doshi
c97f780940 Merge branch 'master' into dev
Conflicts:
	erpnext/patches/patch_list.py
	erpnext/startup/js/complete_setup.js
	erpnext/stock/doctype/item/item.txt
	public/css/all-app.css
	public/js/all-app.js
	public/js/all-web.js
2012-07-12 22:16:19 +05:30
Anand Doshi
af1f437fad update in cms2 patch: delete html files 2012-07-12 22:06:27 +05:30
Anand Doshi
3d53e86755 fixes in log comment and web page saving 2012-07-12 20:12:40 +05:30
Anand Doshi
54e79bbfa7 updates in install_erpnext.py 2012-07-12 19:51:17 +05:30
Anand Doshi
1ebced2a95 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-12 19:37:06 +05:30
Rushabh Mehta
b165ee5acb latest patched master.sql file 2012-07-12 15:58:41 +02:00
Anand Doshi
c4eb9bf838 cms2 patch updates 2012-07-12 19:15:52 +05:30
Anand Doshi
c655f47fb1 fixed wnframework repository url to https one 2012-07-12 19:08:48 +05:30
Anand Doshi
1a51cc9ad0 fixes in cms2 updates 2012-07-12 19:03:58 +05:30
Anand Doshi
d68dceb791 Merge branch 'master' of github.com:webnotes/erpnext into cms2 2012-07-12 18:53:35 +05:30
Anand Doshi
9b88baa6f8 updates in install_erpnext.py 2012-07-12 18:52:59 +05:30
Anand Doshi
51146c07c3 cleaner web cache code 2012-07-12 18:41:12 +05:30
Rushabh Mehta
8cbbab2e75 Merge branch 'dev' of github.com:webnotes/erpnext into dev 2012-07-12 18:01:31 +05:30
Rushabh Mehta
357fb2640b sales bom fixes and mandatory in table fields 2012-07-12 18:00:21 +05:30
Nabin Hait
51f8a6d0d5 select employee based on joining and relieving date in salary maanger 2012-07-12 16:25:13 +05:30
Rushabh Mehta
4feae61b62 fixes to taxes and charges master and naming_series 2012-07-12 16:01:20 +05:30
Nabin Hait
70db682a9a fixed conflict in setup control 2012-07-12 11:47:40 +05:30
Rushabh Mehta
5faf37f312 item group cleanup 2012-07-12 11:33:00 +05:30
Nabin Hait
179f01af17 hong kong added in country list 2012-07-12 11:03:39 +05:30
Nabin Hait
e9c19369a9 salary slip will not submitted through salary manager if Send email checked and invalid email id 2012-07-12 10:33:45 +05:30
Rushabh Mehta
cf969143f2 cleaned up customer group 2012-07-12 09:54:43 +05:30
Anand Doshi
8790188fc8 fixes in web cache record insert for exceptional pages like 404, login-page, index etc. 2012-07-11 20:04:32 +05:30
Rushabh Mehta
b9fabf8e16 sales bom cleanup 2012-07-11 19:18:50 +05:30
Anand Doshi
be59e7cc10 fixes in web cache 2012-07-11 19:12:01 +05:30
Anand Doshi
f7765a899b Show Brand as ERPNext if brand not specified 2012-07-11 19:05:27 +05:30
Anand Doshi
51fc20be5b fixes in index page logic 2012-07-11 18:56:13 +05:30
Nabin Hait
4b8b19a281 Merge branch 'master' of github.com:webnotes/erpnext 2012-07-11 18:41:20 +05:30
Anand Doshi
8c7e76ba44 RSS for blog
Comment addition into blog page's dom
2012-07-11 18:40:57 +05:30
Nabin Hait
548a45d550 Hong kong timezone added 2012-07-11 18:40:48 +05:30
Nabin Hait
0cd057ce94 Hong kong timezone added 2012-07-11 18:39:28 +05:30