Commit Graph

7598 Commits

Author SHA1 Message Date
Nabin Hait
60e81ce8f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 15:29:09 +05:30
Rushabh Mehta
7c76f80966 gateway patch 2012-02-16 10:58:45 +01:00
Nabin Hait
195b620787 callback issue in packing slip 2012-02-16 15:21:39 +05:30
Rushabh Mehta
1b1179477b added patch 2012-02-16 15:11:28 +05:30
Rushabh Mehta
7b0502f9d3 build 2012-02-16 15:09:14 +05:30
Rushabh Mehta
8425c87d5f fixed old style file names 2012-02-16 13:01:28 +05:30
Anand Doshi
761a044cd7 fix in user addition email sending.. 2012-02-16 12:47:11 +05:30
Anand Doshi
ec1af179cb Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-16 12:08:10 +05:30
Anand Doshi
f8395343f7 fix in password not copied to server database during company creation 2012-02-16 12:07:38 +05:30
Nabin Hait
da1f48b96e mentioed account type for some tax/chargeable account 2012-02-16 10:55:05 +05:30
Nabin Hait
470e18a380 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 17:31:56 +05:30
Nabin Hait
2d8ac7f3f9 fixed asynchronus issue 2012-02-15 17:31:23 +05:30
Anand Doshi
2c2991c3b7 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 15:42:34 +05:30
Anand Doshi
65bc9db85e File Data rename 2012-02-15 15:42:18 +05:30
Rushabh Mehta
f27b67b474 fix in change password 2012-02-15 10:45:29 +01:00
Nabin Hait
237ac638f5 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 14:28:57 +05:30
Nabin Hait
ab90ee04f5 callback issues and item default get most priority 2012-02-15 14:28:02 +05:30
Rushabh Mehta
3bc56fa662 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-15 09:35:57 +01:00
Rushabh Mehta
533bc77976 rolling back gateway changes 2012-02-15 09:35:42 +01:00
Rushabh Mehta
9049117ede added error console 2012-02-15 14:02:20 +05:30
Nabin Hait
0e14191163 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 18:55:34 +05:30
Nabin Hait
13e62ccbc9 clear cache patch 2012-02-14 18:55:01 +05:30
Rushabh Mehta
c9b10fd8d4 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 17:25:40 +05:30
Rushabh Mehta
eec8e92604 login, analytics fix 2012-02-14 17:25:31 +05:30
Anand Doshi
518202f9f2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 16:16:42 +05:30
Anand Doshi
737c2f9432 fix in login as 2012-02-14 16:16:13 +05:30
Nabin Hait
75ef7c7a89 def val of is_subcontracted is NO 2012-02-14 16:08:22 +05:30
Nabin Hait
3d794a682d required by date should be mapped in indent-po 2012-02-14 15:25:11 +05:30
Nabin Hait
461a071dfa Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 15:13:52 +05:30
Nabin Hait
84d73103f8 sales team mapping issue in SO-DN and SO-RV 2012-02-14 15:13:21 +05:30
Anand Doshi
ec6f9fedd6 Fix in smtplib import issue 2012-02-14 13:54:04 +05:30
Anand Doshi
507cb3c592 add website manager patch 2012-02-14 12:58:47 +05:30
Anand Doshi
04d47aae6f Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
	version.num
2012-02-14 12:46:44 +05:30
Anand Doshi
b2be11cad1 error due to old packing slip hide fields in feature setup 2012-02-14 12:45:55 +05:30
Rushabh Mehta
05f4c290ec added tinymce to all-app.js 2012-02-14 12:12:13 +05:30
Rushabh Mehta
868e084322 added jquery-ui to all-app.js 2012-02-14 12:03:02 +05:30
Rushabh Mehta
56c5ae5bc8 version 2012-02-14 11:47:05 +05:30
Rushabh Mehta
afaac60982 made all.js and all.css and all guests share same session 2012-02-14 11:44:13 +05:30
Anand Doshi
d758a83791 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 11:40:41 +05:30
Nabin Hait
5bd88d99b5 fixes 2012-02-14 11:39:42 +05:30
Anand Doshi
afc5079aa0 fix in grid toolbar issue 2012-02-14 11:31:47 +05:30
Nabin Hait
7eda1cac27 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-14 09:57:57 +05:30
Anand Doshi
2c582d5f65 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 19:00:24 +05:30
Anand Doshi
d7ddea1e2a domain list patch 2012-02-13 18:59:43 +05:30
Nabin Hait
c45337bf97 Merge branch 'stable' of github.com:webnotes/erpnext into stable 2012-02-13 18:25:52 +05:30
Nabin Hait
409612457b error fixed in trash control 2012-02-13 18:24:14 +05:30
Rushabh Mehta
bfc03cf8bd Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 13:41:51 +01:00
Rushabh Mehta
a9bd79487d company whitelist fix 2012-02-13 13:41:45 +01:00
Anand Doshi
ce0c65f173 Merge branch 'stable' into latest 2012-02-13 18:01:23 +05:30
Anand Doshi
5fe5df370f Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-02-13 17:57:45 +05:30