Commit Graph

9880 Commits

Author SHA1 Message Date
Rushabh Mehta
c5bf642c7d version 2012-01-23 16:18:34 +05:30
Anand Doshi
4d22ce96d1 Fix: is_default of BOM 2012-01-23 14:51:00 +05:30
Anand Doshi
cfdd827a84 Merge branch 'master' into latest 2012-01-23 14:09:50 +05:30
Anand Doshi
a170418ed0 Fixes in floating point issues 2012-01-23 14:09:06 +05:30
Anand Doshi
1546cd1bb4 Fix in width of time field 2012-01-23 11:11:27 +05:30
Anand Doshi
0529bc1e53 Doc's name in subject of auto notifications 2012-01-23 10:54:53 +05:30
Rushabh Mehta
843db59fcb version fixes 2012-01-20 17:43:37 +05:30
Rushabh Mehta
49ebfb6a30 version 2012-01-20 15:32:18 +05:30
Anand Doshi
6840ef67df Merge branch 'stable' into latest 2012-01-20 15:03:23 +05:30
Anand Doshi
da68ce8b84 Fix to other charges total 2012-01-20 15:02:41 +05:30
Anand Doshi
af4b0a9e90 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 14:50:45 +05:30
Anand Doshi
12b1db4e8a Merge branch 'stable' into latest 2012-01-20 14:50:15 +05:30
Anand Doshi
60c42d2e1c Fix to other charges total 2012-01-20 14:44:14 +05:30
Anand Doshi
4c92390972 Fix to other charges total 2012-01-20 14:32:01 +05:30
Anand Doshi
10393b39d3 Other Charges total fixed to 2 decimals 2012-01-20 14:29:40 +05:30
Rushabh Mehta
3cdceddeb5 version 2012-01-20 14:21:09 +05:30
Rushabh Mehta
8c7b4060cb version update 2012-01-20 13:56:15 +05:30
Rushabh Mehta
c071af73e2 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:51:44 +05:30
Rushabh Mehta
8c309bee53 bootstrap toolbar 2012-01-20 13:47:16 +05:30
Anand Doshi
821b6544f8 Merge branch 'latest' of github.com:webnotes/erpnext into latest 2012-01-20 13:23:37 +05:30
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