Commit Graph

5062 Commits

Author SHA1 Message Date
Nabin Hait
46043f2d94 messages updated in voucher import tool 2013-03-05 18:23:34 +05:30
Anand Doshi
f1dfc914af Merge branch 'master' into edge 2013-03-05 17:36:34 +05:30
Anand Doshi
b343a4895c fix in empty col check in voucher import tool 2013-03-05 17:24:15 +05:30
Anand Doshi
8361179d4c Merge branch 'master' into edge 2013-03-05 17:11:37 +05:30
Anand Doshi
ffd190ff3c fix in patch list 2013-03-05 17:10:33 +05:30
Anand Doshi
95bba2e492 Merge branch 'master' into edge 2013-03-05 17:06:36 +05:30
Nabin Hait
a0accd9f67 fixed conflict 2013-03-05 15:58:04 +05:30
Nabin Hait
dae20d87dc refactored upload attendace tool 2013-03-05 15:52:07 +05:30
Rushabh Mehta
c4529ebb0d Merge pull request #300 from mayur-patel/master
Allow user to add leave application which may results in negative balance.
2013-03-05 01:27:26 -08:00
Anand Doshi
53aba86dd8 Merge branch 'master' into edge 2013-03-05 14:49:57 +05:30
Anand Doshi
bec17f078c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:44:28 +05:30
mayur-patel
c7e28c7e5d changed the logic to be more elegant. 2013-03-05 20:14:05 +11:00
Anand Doshi
18c1980e38 voucher import tool - throw message if empty columns are found 2013-03-05 14:44:05 +05:30
Rushabh Mehta
ba7ed4c27c Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 14:20:24 +05:30
Rushabh Mehta
07287e8b93 removed colour fields from txt files 2013-03-05 14:19:48 +05:30
Rushabh Mehta
5640a69e78 updated sync 2013-03-05 14:12:34 +05:30
mayur-patel
547604cf5a Added a new field called allow_negative. This field was added for allowing a negative balance for a particular leave type. 2013-03-05 19:11:53 +11:00
Anand Doshi
94f44b4073 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-05 13:40:07 +05:30
Anand Doshi
9e69dc5ad8 fix in material request test case 2013-03-05 13:39:28 +05:30
mayur-patel
f10f2513fa Added checks to see if the selected leave type allows negative balance. If it does then warn the user and continue with saving the form else just warn the user and don't save the form data. 2013-03-05 18:20:57 +11:00
mayur-patel
bc8ac8b532 Merge branch 'master' of https://github.com/webnotes/erpnext 2013-03-05 18:09:38 +11:00
Anand Doshi
1f3a5c3798 use validate value method to validate valuation rate should be greater than 0 in stock entry 2013-03-05 12:25:15 +05:30
Nabin Hait
37731471fd lead organization added in quotation classic/spartan/modern print format 2013-03-05 11:59:20 +05:30
mayur-patel
639392a0b1 Allowing user to add leaves which may results in negative leave balance. 2013-03-05 16:21:00 +11:00
Anand Doshi
071a1f548a Merge branch 'master' into edge 2013-03-04 17:51:33 +05:30
Anand Doshi
9bba9ed4d2 fixes in cform 2013-03-04 17:48:31 +05:30
Rushabh Mehta
72f76cb403 Merge branch 'edge' of github.com:webnotes/erpnext into edge 2013-03-04 17:37:11 +05:30
Rushabh Mehta
fcafcefaef Merge branch 'master' into edge 2013-03-04 17:35:28 +05:30
Rushabh Mehta
986d48b424 timesheet patch update 2013-03-04 16:29:48 +05:30
Rushabh Mehta
3e712f212a timesheet patch update 2013-03-04 16:21:54 +05:30
Rushabh Mehta
040e599e99 fixed to timesheet patch 2013-03-04 15:47:42 +05:30
Rushabh Mehta
d2b91bc644 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-04 15:46:03 +05:30
Rushabh Mehta
5423c96bef fixed to timesheet patch 2013-03-04 15:45:46 +05:30
Nabin Hait
4c5af2f33d Merge branch 'master' of github.com:webnotes/erpnext 2013-03-04 15:36:27 +05:30
Nabin Hait
0d20d6fdd2 fixes for purchase price list 2013-03-04 15:35:45 +05:30
Rushabh Mehta
ac46aac46e Merge branch 'master' of github.com:webnotes/erpnext 2013-03-04 15:35:16 +05:30
Rushabh Mehta
f934a240ba refactored get_value and added backlink check in 'cancel' 2013-03-04 15:34:45 +05:30
Anand Doshi
28cd1ca283 Merge branch 'master' into edge 2013-03-04 14:31:00 +05:30
Anand Doshi
91484391ce invalidate cache if 'show in website' is unchecked for item and item group 2013-03-04 14:28:38 +05:30
Rushabh Mehta
ba0e1ea194 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 19:09:38 +05:30
Rushabh Mehta
213b180060 merge, update bean validations 2013-03-01 19:09:06 +05:30
Nabin Hait
d191e2fa64 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 18:52:40 +05:30
Nabin Hait
54d209ffb0 sub-contracting code refactored for po 2013-03-01 18:51:10 +05:30
Rushabh Mehta
f559a437a1 completed Time Log / Time Log Batch 2013-03-01 18:25:55 +05:30
Rushabh Mehta
fee642d547 completed Time Log / Time Log Batch 2013-03-01 18:24:52 +05:30
Anand Doshi
976f3b5adb Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 18:05:58 +05:30
Anand Doshi
3e157ec2ea show pin code after state instead of after city in address display 2013-03-01 17:55:37 +05:30
Nabin Hait
73b2bb6f91 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-01 17:40:31 +05:30
Nabin Hait
37ef553f6b fixes for sub_contracting 2013-03-01 17:39:41 +05:30
Anand Doshi
d88a49baa8 Merge branch 'master' into edge 2013-03-01 16:21:26 +05:30