Anand Doshi
|
42907ffb43
|
Merge branch 'stable' into latest
|
2012-01-20 13:23:04 +05:30 |
|
Anand Doshi
|
ff54778418
|
Fix in sales_common
|
2012-01-20 13:20:21 +05:30 |
|
Rushabh Mehta
|
764fdb942e
|
updated account url and js version
|
2012-01-20 12:07:56 +05:30 |
|
Rushabh Mehta
|
b7d831b734
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-20 10:53:35 +05:30 |
|
Rushabh Mehta
|
0a5657809a
|
fixes to add user
|
2012-01-20 10:52:53 +05:30 |
|
Anand Doshi
|
869c7bcbb2
|
Validate if another GRN exists having same supplier and challan no. - then throw exception
|
2012-01-19 18:31:21 +05:30 |
|
Anand Doshi
|
8c36f47ea6
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
|
2012-01-19 17:13:43 +05:30 |
|
Anand Doshi
|
6c7e54d373
|
Merge branch 'master' into latest
|
2012-01-19 17:13:05 +05:30 |
|
Anand Doshi
|
edb45c6ce5
|
Purchase Rcpt in Feed, Grand Total fixed to 2 decimals in sales_common.js
|
2012-01-19 17:12:17 +05:30 |
|
Rushabh Mehta
|
f2c4c4231f
|
minor bugfixes
|
2012-01-19 11:43:34 +01:00 |
|
Rushabh Mehta
|
3a32478db9
|
confict fix
|
2012-01-19 15:11:07 +05:30 |
|
Rushabh Mehta
|
d31bf62c9a
|
fixed patches, small bugs
|
2012-01-19 15:09:49 +05:30 |
|
Anand Doshi
|
20274a0069
|
Merge branch 'master' into latest
|
2012-01-19 15:00:56 +05:30 |
|
Anand Doshi
|
39eff71864
|
remove get tds button
|
2012-01-19 14:57:23 +05:30 |
|
Anand Doshi
|
28ac0b0c88
|
Merge branch 'master' into latest
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 14:31:03 +05:30 |
|
Anand Doshi
|
26814e7bad
|
Remove Get TDS button, which appears twice in JV
|
2012-01-19 14:26:25 +05:30 |
|
Anand Doshi
|
ad2f5d1270
|
Merge branch 'stable'
|
2012-01-19 12:42:11 +05:30 |
|
Anand Doshi
|
f343a8bc75
|
remove extra buttons labelled Make Maintenance Visit
|
2012-01-19 12:41:54 +05:30 |
|
Anand Doshi
|
4b0b4a7fdc
|
Merge branch 'stable'
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:35:54 +05:30 |
|
Anand Doshi
|
b5bc54dd00
|
Merge branch 'stable' into latest
Conflicts:
erpnext/patches/patch_list.py
|
2012-01-19 12:34:30 +05:30 |
|
Anand Doshi
|
5f72836f11
|
Patch to change allocated_to options to 'Profile'
|
2012-01-19 12:32:15 +05:30 |
|
Anand Doshi
|
06c1050863
|
Merge branch 'master' into latest
|
2012-01-19 11:51:28 +05:30 |
|
Anand Doshi
|
367357fafd
|
utf-8 encode response message while sending email response message
|
2012-01-19 11:48:43 +05:30 |
|
Anand Doshi
|
d94d1c6dff
|
Merge branch 'master' into latest
|
2012-01-19 11:38:23 +05:30 |
|
Anand Doshi
|
32fd59b3ff
|
resolved utf-8 issue in 'In Reply To' part of support ticket response
|
2012-01-19 11:37:32 +05:30 |
|
Anand Doshi
|
a7d632db99
|
Merge branch 'latest' of github.com:webnotes/erpnext into latest
Conflicts:
index.html
version.num
|
2012-01-18 12:33:16 +05:30 |
|
Anand Doshi
|
165fe9e122
|
Merge branch 'stable' into latest
|
2012-01-18 12:31:51 +05:30 |
|
Anand Doshi
|
2cb3cef064
|
Merge branch 'stable'
|
2012-01-18 12:31:32 +05:30 |
|
Anand Doshi
|
9c6db1482d
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-01-18 12:25:47 +05:30 |
|
Anand Doshi
|
890aa0f51d
|
fix: interface error due to use of sql instead of webnotes.conn.sql
|
2012-01-18 12:25:20 +05:30 |
|
Rushabh Mehta
|
94b88b9e22
|
added patch for subdomain
|
2012-01-18 10:55:39 +05:30 |
|
Rushabh Mehta
|
0a29975bfe
|
fixed conflicts
|
2012-01-18 10:54:55 +05:30 |
|
Rushabh Mehta
|
88ba7b86dc
|
fixes to login check
|
2012-01-18 06:18:52 +01:00 |
|
Anand Doshi
|
029fae99ed
|
Merge branch 'master' of github.com:webnotes/erpnext
|
2012-01-17 18:47:10 +05:30 |
|
Anand Doshi
|
d3a23b5e8c
|
Item Manufacturer/Supplier Details in item doctype
|
2012-01-17 18:46:43 +05:30 |
|
Rushabh Mehta
|
04a5f7767a
|
Merge branch 'stable'
|
2012-01-17 18:36:35 +05:30 |
|
Rushabh Mehta
|
d6269be0b1
|
grid height to 35%
|
2012-01-17 18:34:16 +05:30 |
|
Rushabh Mehta
|
16a7807005
|
confict fix
|
2012-01-17 18:29:52 +05:30 |
|
Rushabh Mehta
|
f4e26fc095
|
new changes for login
|
2012-01-17 18:18:10 +05:30 |
|
Rushabh Mehta
|
bedc1fe534
|
new login authentication
|
2012-01-17 18:17:06 +05:30 |
|
Anand Doshi
|
2cda80259c
|
Merge branch 'latest'
|
2012-01-17 14:50:25 +05:30 |
|
Anand Doshi
|
2e7273118f
|
Merge branch 'stable' into latest
|
2012-01-17 14:50:08 +05:30 |
|
Anand Doshi
|
40e26d6f94
|
Merge branch 'stable'
|
2012-01-17 14:49:39 +05:30 |
|
Anand Doshi
|
16c4e72199
|
Merge branch 'stable' into latest
|
2012-01-17 14:25:30 +05:30 |
|
Rushabh Mehta
|
1019eff2af
|
Merge branch 'stable' of github.com:webnotes/erpnext into stable
|
2012-01-17 14:23:26 +05:30 |
|
Rushabh Mehta
|
1e728cfa9c
|
version update for grid height fix in framework
|
2012-01-17 14:23:15 +05:30 |
|
Anand Doshi
|
f1d99ed2d5
|
Merge branch 'stable'
|
2012-01-17 14:22:25 +05:30 |
|
Anand Doshi
|
97bd3663f2
|
Show full name in contact_display
|
2012-01-17 14:22:09 +05:30 |
|
Anand Doshi
|
66df8ac34c
|
Merge branch 'stable'
|
2012-01-16 17:55:01 +05:30 |
|
Anand Doshi
|
34561e73dd
|
Merge branch 'stable' into latest
|
2012-01-16 17:53:45 +05:30 |
|