Meatechsupport
145227e4ec
Edited the Test case
2015-07-28 18:39:04 +04:00
Meatechsupport
8b96fdac12
Indentation Error
...
realligned
2015-07-27 16:55:54 +04:00
Meatechsupport
e319598c51
IndentationError
...
alligned code
2015-07-27 16:42:22 +04:00
Meatechsupport
5c73bafeaa
Modifying the number of leave days calculation part.
...
we don't need to exclude the Holiday list (that comes in between) from the total number of leaves applied.
Add option in the leave type
added a field in the leave type to include and exclude the holidays from
the tolal leave applied days
Added the field
Added a field Include Holiday to leave Type doctype
changed the lable
changed the lable from "Include Holiday" to "Include holidays within leaves
as leaves"
Rearranged the function
moved holidays = leave_app.get_holidays() under if
Corrected 'total_leave_days' : flt(tot_days)-flt(holidays)
Adding test case
added the test case
Added test case
Added test case to test_leave_application.py
adding default value
added default value and corrected the syntax.
IndentationError
removed extra tabs after
2015-07-27 13:46:00 +04:00
Neil Trini Lasrado
82cc2921d1
Validation added to prevent user from creating salary structure with 'From Date' before employee 'Date of joining'
2015-06-12 18:34:08 +05:30
Nabin Hait
0b18a2d347
Reset values in tools like Payment Tool
2015-06-05 12:01:29 +05:30
Nabin Hait
3ebfad7115
minor fixes
2015-06-01 14:01:56 +05:30
Nabin Hait
e2c200a91e
Make gl entry for rounded-off amount
2015-05-29 10:39:09 +05:30
Nabin Hait
2eba53f763
test case fixes
2015-05-22 16:55:55 +05:30
Rushabh Mehta
9dd8aab211
[fix] status updater
2015-05-18 11:19:10 +05:30
Neil Trini Lasrado
2edc91bc52
Leave Type - LWP changed to Leave Without Pay
2015-05-11 14:38:21 +05:30
Neil Trini Lasrado
ec2f3d6e63
leave_allocation layout changed
2015-05-11 14:38:20 +05:30
Rushabh Mehta
82ee5fdba6
[email] changes in email_account api
2015-05-04 18:17:22 +05:30
Nabin Hait
fb1f4a5c58
User permissions for Expense Claim
2015-05-02 18:46:29 +05:30
Rushabh Mehta
5e13799704
[fixes] leave approver selection and cleaned up layout
2015-04-30 12:55:10 +05:30
Nabin Hait
4669fe3e85
minor fix
2015-04-22 15:34:44 +05:30
Neil Trini Lasrado
ecb5d11e2d
Today added as default date for posting date in expense claim
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
5e317d2b72
fixes in Expense Claim and get_avtivity_cost function
2015-04-22 11:26:00 +05:30
Neil Trini Lasrado
d4b33d3c14
Costing added in Time log Batch, Sales Order added to Project + more fixes
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
4e6e4726a4
filters added, ui change, update project moved to project.py
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
ec5c66f8f0
Title Feild added to Expense Claim
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
05f15bbb88
fixes in Test Cases
2015-04-22 11:25:59 +05:30
Neil Trini Lasrado
2679b247b3
fixes in Expense Claim
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
7f9ea3bf6a
expense claim test records
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
a11770f06f
in Time Log - Server side validations added to recalculate cost on save
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
50234cb0fe
Task added to expense claim
...
all cost (expense claim and time log) against Task; task updates project cost.
2015-04-22 11:25:58 +05:30
Neil Trini Lasrado
458b8885f0
New Document Activity Cost created.
...
In TL - billing rate and internal rate added
In Project - total expense claim and total activity cost. Buttons addded - show time logs and show expense claims.
In Expense Claim - Employee and project link added. update cost in project on submit and on trash. Validation added to check sanctioned amount is not greater than claim amount.
2015-04-22 11:25:57 +05:30
Rushabh Mehta
80f8b7be2f
[minor] [perms] Expense Claim Type
2015-04-19 16:18:15 +05:30
Rushabh Mehta
2dea40f7be
[leave-allocation] can cancel and re-submit or make a new one, fixes frappe/erpnext#3042
2015-04-15 15:08:48 +05:30
Anand Doshi
00a07de426
fixed test earning type
2015-04-08 21:49:11 +05:30
Anand Doshi
2f87fb41fa
Merge pull request #3069 from neilLasrado/dob
...
validation added - dob cannot accept a future date
2015-04-08 13:25:01 +05:30
Anand Doshi
a1a3468704
Merge pull request #3068 from neilLasrado/leaves
...
Bug Fixes
2015-04-08 13:20:18 +05:30
Neil Trini Lasrado
4b29ccc2b0
Salary Structure - Earnings made mandatory
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
4ba4d9dbef
fix - update button didnt work in leave allocation after submit
2015-04-08 12:29:40 +05:30
Neil Trini Lasrado
20f0ef2515
validation added - dob cannot accept a future date
2015-04-08 12:29:01 +05:30
Neil Trini Lasrado
28b0cc4d0b
fixes in offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
496e277d8a
print format added
2015-04-08 12:28:21 +05:30
Rushabh Mehta
aca5cb6513
[fixes] offer letter
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
8ca547b7f2
terms view added
2015-04-08 12:28:21 +05:30
Neil Trini Lasrado
e1d620b168
Offer Letter - New Doctype added and job_applicant naming changed
2015-04-08 12:28:20 +05:30
Rushabh Mehta
ffc190d34d
Merge pull request #3013 from neilLasrado/expense
...
Expense Claim - 'Total Amount Reimbursed' feild added
2015-04-02 14:29:29 +05:30
Anand Doshi
7b6daafbb9
[minor] left aligned email footer, raise duplicate entry error for common email id in Employee and Sales Person
2015-04-01 16:26:59 +05:30
Anand Doshi
ee57a8d2a4
[hotfix] unique job applicant
2015-04-01 12:29:30 +05:30
Anand Doshi
d6a360b51b
[fix] check job application unique email id
2015-03-30 21:11:34 +05:30
Neil Trini Lasrado
a6b3415cdd
Expense Claim - 'Total Amount Reimbursed' feild added
2015-03-26 14:13:44 +05:30
Rushabh Mehta
04f907efcf
[fix] job applicant (test via import)
2015-03-23 15:44:54 +05:30
Rushabh Mehta
c2eae25d0e
[cleanup] validate_email_add
2015-03-23 14:10:51 +05:30
Anand Doshi
9d8154dd40
fixed test cases
2015-03-18 16:22:13 +05:30
Anand Doshi
ec5ec60764
Fixed Test Cases
2015-03-05 19:31:40 +05:30
Rushabh Mehta
2cc585f180
[git fixes] salary manager, time log title, notificaitons
2015-03-03 16:06:54 +05:30
