Commit Graph

4303 Commits

Author SHA1 Message Date
Anand Doshi
a92dc07832 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 18:04:53 +05:30
Rushabh Mehta
bf24581eb2 leave application fix, print_table Sr fix 2012-12-05 18:02:13 +05:30
Rushabh Mehta
2d05732589 kb - error fixed 2012-12-05 17:32:52 +05:30
Anand Doshi
4f29be2948 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 17:32:32 +05:30
Rushabh Mehta
c09128ab47 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:27:48 +05:30
Anand Doshi
666a8d50d5 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 17:17:51 +05:30
Rushabh Mehta
ea025d50a1 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:17:00 +05:30
Anand Doshi
7f0cf557ba Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 17:13:03 +05:30
Rushabh Mehta
7e5c5aa9f3 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:10:18 +05:30
Rushabh Mehta
ed29af98a9 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:06:07 +05:30
Anand Doshi
bfc6612979 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 16:51:37 +05:30
Anand Doshi
0a32ed3219 allow changing the uom conversion factor in purchase cycle 2012-12-05 16:50:49 +05:30
Rushabh Mehta
38f19104d8 merge 2012-12-05 16:49:58 +05:30
Rushabh Mehta
a69a3c01b5 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 11:29:43 +01:00
Nabin Hait
598dd99144 repost projected qty 2012-12-05 15:58:57 +05:30
Rushabh Mehta
ffe99531e5 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 11:22:28 +01:00
Rushabh Mehta
ba9e034069 added patch for expense and leave 2012-12-05 15:51:17 +05:30
Nabin Hait
ec83e0abee repost ordered qty 2012-12-05 15:51:05 +05:30
Rushabh Mehta
071dc7f164 added patch for expense and leave 2012-12-05 15:45:48 +05:30
Rushabh Mehta
b4be22b3a4 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 15:38:13 +05:30
Rushabh Mehta
f5d0d08bd3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 10:07:40 +01:00
Nabin Hait
abe9d7be0b fixes in employee leave balance report 2012-12-05 14:36:39 +05:30
Rushabh Mehta
a112981ca2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 14:34:51 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Anand Doshi
69e9620609 fix in purchase order list 2012-12-05 13:04:14 +05:30
Rushabh Mehta
51bf088f5c Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 08:07:02 +01:00
Nabin Hait
1ad42f09df bom fixes: item selection before server call 2012-12-05 12:36:19 +05:30
Rushabh Mehta
0ea88cd3d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 06:42:02 +01:00
Nabin Hait
ff4d616133 latest update 2012-12-05 11:11:22 +05:30
Nabin Hait
247a8f2693 latest updates page 2012-12-05 11:06:19 +05:30
Nabin Hait
9e95f8c201 fixes in bom 2012-12-05 11:06:00 +05:30
Rushabh Mehta
ce7cc74033 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 06:02:28 +01:00
Nabin Hait
e2639197de deprecate tds patch 2012-12-05 10:18:49 +05:30
Nabin Hait
b24e783aef deprecated tds 2012-12-04 18:58:15 +05:30
Anand Doshi
c80459bb6a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 18:02:20 +05:30
Anand Doshi
dbb9759002 fix in tax calc in tax_controller 2012-12-04 18:02:03 +05:30
Rushabh Mehta
af423a25ce added client side functions and mode_of_payment defaults 2012-12-04 16:35:27 +05:30
Rushabh Mehta
535d6c4d91 added client side functions and mode_of_payment defaults 2012-12-04 16:34:26 +05:30
Rushabh Mehta
586ac7c977 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 16:32:28 +05:30
Rushabh Mehta
bbd5ea32d1 added client side functions and mode_of_payment defaults 2012-12-04 16:31:54 +05:30
Rushabh Mehta
a399c78eb0 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 11:52:09 +01:00
Anand Doshi
206bd53b35 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 16:19:06 +05:30
Anand Doshi
188f977f73 fixes in tax controller and tests 2012-12-04 16:17:48 +05:30
Anand Doshi
cca5fc8c74 fix in authorization rule 2012-12-04 16:17:08 +05:30
Rushabh Mehta
4ee4dde099 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 09:41:37 +01:00
Rushabh Mehta
705fed3df9 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 13:11:11 +05:30
Rushabh Mehta
6d203b6356 fixed permissions in report / filters 2012-12-04 13:10:38 +05:30
Rushabh Mehta
39cb551bfc Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 08:10:49 +01:00
Anand Doshi
6494896cff Merge branch 'master' of github.com:webnotes/erpnext 2012-12-04 12:38:45 +05:30
Anand Doshi
e00244628a fixed naming series form 2012-12-04 12:38:00 +05:30