Commit Graph

3308 Commits

Author SHA1 Message Date
Rushabh Mehta
beb3a872ce Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-10-01 14:47:06 +05:30
Rushabh Mehta
2d700dd90d added query report and cleaned up wn.ui.Dialog 2012-10-01 14:46:37 +05:30
Anand Doshi
3245a15cb7 added future imports 2012-10-01 11:35:49 +05:30
Anand Doshi
fdbc730821 merged deprecate account balance 2012-10-01 11:30:00 +05:30
Anand Doshi
1e6989c3a5 fixed merge conflict 2012-10-01 11:04:05 +05:30
Rushabh Mehta
3c04193afb form, appframe ui fixes 2012-09-28 18:47:47 +05:30
Anand Doshi
5b553b2709 allow deletion of profile 2012-09-28 16:45:05 +05:30
Rushabh Mehta
90f4d9a608 Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 16:12:31 +05:30
Rushabh Mehta
b0d32b7a25 form toolbar ui fixes and added themes 2012-09-28 16:11:57 +05:30
Anand Doshi
440c1eb465 deprecated account balance and fixed expiry msg 2012-09-28 16:04:10 +05:30
Anand Doshi
9e9996dbc9 fixed patch after merge 2012-09-28 12:41:18 +05:30
Anand Doshi
b83307823b Merge branch '1209' of github.com:webnotes/erpnext into 1209 2012-09-28 12:39:37 +05:30
Anand Doshi
8bde7cb8db Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-28 12:36:22 +05:30
Rushabh Mehta
534a7a92fe updated shortcuts 2012-09-28 12:33:42 +05:30
Nabin Hait
133c9c60f5 Default category in purchase taxes and charges 2012-09-28 12:26:11 +05:30
Rushabh Mehta
cebb02753c added shortcuts 2012-09-28 12:18:43 +05:30
Nabin Hait
7291ec7147 Event in Lead fixed 2012-09-28 10:58:58 +05:30
Rushabh Mehta
224714c248 no role access for financial analytics 2012-09-28 10:23:27 +05:30
Rushabh Mehta
b02744de8f updates to form comment (post on enter) and global defaults 2012-09-28 09:56:55 +05:30
Rushabh Mehta
294778a83c messages.js: allow user to task messages 2012-09-27 15:43:06 +02:00
Rushabh Mehta
dd46b52467 updated messages 2012-09-27 19:01:52 +05:30
Rushabh Mehta
7f9c369266 updated messages 2012-09-27 18:48:43 +05:30
Rushabh Mehta
6e04ef7989 updated messages 2012-09-27 18:41:46 +05:30
Rushabh Mehta
901af83f48 lead.js, bugfix 2012-09-27 17:17:23 +05:30
Anand Doshi
4bfbee8281 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-27 13:06:23 +05:30
Anand Doshi
4487e47233 fixed nested set model - group move, deletion 2012-09-27 13:05:25 +05:30
Rushabh Mehta
b0f1d71950 fixed voucher import tool 2012-09-26 16:22:03 +02:00
Rushabh Mehta
55fd5f3ed6 added voucher import tool 2012-09-26 19:00:02 +05:30
Nabin Hait
7f59913286 shipping address hidden in SO 2012-09-26 13:10:37 +05:30
Nabin Hait
f0d07b31d6 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-26 12:47:20 +05:30
Nabin Hait
29bd66e9e0 fixed stock reco cancellation 2012-09-26 12:46:57 +05:30
Anand Doshi
47ee285ff9 Merge branch 'master' of github.com:webnotes/erpnext into 1209 2012-09-26 12:44:44 +05:30
Anand Doshi
b1a07b1f04 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-26 12:43:36 +05:30
Anand Doshi
2a099dcc17 email digest - ordered accounts by lft and removed padding for each item 2012-09-26 12:41:49 +05:30
Anand Doshi
3c4238fc9c Merge branch 'master' of github.com:webnotes/erpnext into 1209
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
2012-09-26 12:24:28 +05:30
Nabin Hait
0baf74a139 fixes in gross profit report 2012-09-26 11:38:48 +05:30
Nabin Hait
e89379f8a2 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-26 11:30:59 +05:30
Nabin Hait
9be5717f6c fixes in gross profit report 2012-09-26 11:30:30 +05:30
Nabin Hait
052a5e85e0 fixes in gross profit report 2012-09-26 11:27:23 +05:30
Anand Doshi
bbab0e4957 build.json: changed path of startup.js 2012-09-26 11:21:36 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Anand Doshi
dcbeec1407 fix in bin.py msgprint 2012-09-25 16:07:52 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Anand Doshi
ab3764257c fixes in check required 2012-09-24 19:02:50 +05:30
Anand Doshi
5ca167bcbc in mandatory check, call refresh_label_icon only if that function exists 2012-09-24 18:48:44 +05:30
Anand Doshi
da3d9a3ee0 Merge branch 'master' of github.com:webnotes/erpnext 2012-09-24 18:26:17 +05:30
Anand Doshi
4627867786 fix in general ledger report: account filter options to be filtered by company 2012-09-24 18:16:52 +05:30
Anand Doshi
bc243dee81 fix in general ledger report: account filter options to be filtered by company 2012-09-24 18:03:35 +05:30