Nabin Hait
38b05a1296
fix: Set default cost center in payroll entry
2019-02-05 10:46:41 +05:30
Nabin Hait
294319e71b
fix: Don't force fetch cost center from company in payroll entry
2019-02-05 10:37:41 +05:30
Nabin Hait
ff05ee50e0
fix: Allow-on-submit enabled for formula and condition in salary structure
2019-02-04 14:42:57 +05:30
Sagar Vora
7ea2497b9a
Fix salary patch ( #16531 )
...
fix: salary structure assignment patch, add .vscode to gitignore
2019-01-31 09:17:29 +05:30
rohitwaghchaure
25e63e806c
fix: modified date ( #16520 )
2019-01-30 11:46:34 +05:30
Sagar Vora
51a27b3524
fix: unsaved merge conflict
2019-01-29 17:52:47 +05:30
Sagar Vora
f3cfad7595
Merge branch 'master' into staging-fixes
2019-01-29 17:20:46 +05:30
Navdeep Ghai
ec570026e1
Merge branch 'hotfix' into salary-slip-net-pay-fixes
2019-01-29 09:12:37 +04:00
Nabin Hait
385e3bb284
Merge pull request #16446 from Zlash65/jv-fix
...
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
2019-01-29 10:41:15 +05:30
navdeepghai1
92bb84aa70
Changed static precision(2) value to system setting currency_precision value
2019-01-28 16:54:58 +04:00
navdeepghai1
aac404a155
Fixed net_pay calculation issue
2019-01-28 10:42:16 +04:00
Nabin Hait
06607fda4e
fix: removed print statement
2019-01-23 12:15:48 +05:30
Aditya Hase
f3c22f342c
fix(unicode): Import unicode_literals in every file
2019-01-22 18:36:10 +05:30
Zlash65
c8d632ddff
fix: add set query for payroll entry in JV
2019-01-22 12:46:13 +05:30
Rohit Waghchaure
425dff93d7
fix: Project update status code and design refactored
2019-01-17 19:21:44 +05:30
Nabin Hait
c13b0562ba
Merge pull request #16337 from Anurag810/Employee
...
fix: Employee Onboarding/Seperation task Assignment
2019-01-08 20:27:43 +05:30
scmmishra
e2762df90b
Fix: Naming series not reflecting in leave application
2019-01-08 17:38:28 +05:30
Sagar Vora
26e5c9480b
Merge branch 'staging-fixes' into fixed_salary_structure_employee_reqd
2019-01-07 14:30:23 +05:30
Sagar Vora
3c74266763
fix: PEP8 recommended whitspace
2019-01-07 13:13:16 +05:30
Sagar Vora
23a1b98957
fix: remove unnecessary code
2019-01-07 13:10:18 +05:30
Sahil Khan
3ac57c756b
fix: remove print statement from test case
2019-01-04 12:57:34 +05:30
Anurag Mishra
bb6a7eb9d3
refractor
2019-01-04 12:32:51 +05:30
Anurag Mishra
add6bf35a3
Fix: Employee Onboarding/Seperation task Assignment
2019-01-04 11:36:30 +05:30
Rohit Waghchaure
8bac5b6e73
[minor] Employee is reqd to preview salary slip from salary structure
2019-01-03 16:20:35 +05:30
Sagar Vora
c14c7c84e3
fix: leave application and timesheet tests
2019-01-02 21:28:11 +05:30
Rohit Waghchaure
c186f153ff
Added test cases
2019-01-01 15:03:56 +05:30
sahil28297
50f0a99330
fix: Checks for status in employee and for date range in upload attendance. ( #16279 )
...
* fix: checks for status in employee and for date range in upload attendance.
1. Earlier the status of an amployee can be set to 'Left' even though other employees are reporting to this employee, added checks to prevent this behaviour.
2. Earlier the range of dates added to the template were not checked for date of joining and relieving date. Now the range of dates added in the template are between the date of joining and relieving date.
* remove "import erpnext"
* fix: replace frappe.db.sql with frappe.db.get_all
* fix: refactored using list comprehension
* fix: query refactoring
* fix: combining list comprehensions
* travis debugging
* fix: doc.save
2018-12-28 17:15:56 +05:30
Frappe Bot
e8c2fdfb8c
Merge branch 'master' into staging-fixes
2018-12-26 11:44:09 +00:00
rohitwaghchaure
53a38e8edc
Merge pull request #16257 from surajshetty3416/permission-fixes
...
Fix user permission checks
2018-12-26 14:49:01 +05:30
rohitwaghchaure
deb96dab3e
[Fix] Salary structure not saving ( #16275 )
2018-12-25 13:58:20 +05:30
Navdeep Ghai
c4d38c0afc
Fix the disappears of image bug after uploading and saving the employee ( #16217 )
...
* Fix image disappears of image after uploading and saving the employee
* Fix the codacy issue
2018-12-24 14:53:19 +05:30
Suraj Shetty
7ae2d59ffd
Merge branch 'staging-fixes' into permission-fixes
2018-12-18 15:41:03 +05:30
shreyashah115@gmail.com
0543f03b58
fix: Remove date_of_joining from field list
2018-12-17 15:02:30 +05:30
Zlash65
c8337c6d83
fix check for leave on holiday for half day
2018-12-15 21:15:45 +05:30
Rushabh Mehta
eeab3ee5d3
fix(test): use frappe.db.rollback to revert deletion of fixture data ( #16192 )
...
* debug(test): test_payroll_entry
* debug(test): test_payroll_entry
* debug(test): use frappe.db.rollback to undelete fixture data
2018-12-11 22:37:29 +05:30
Suraj Shetty
07e5786e1b
Fix user permission checks
2018-12-10 19:10:18 +05:30
Nabin Hait
dde952d591
Merge pull request #16092 from deepeshgarg007/salary_slip
...
Salary slip earnings and deductions table bug fix
2018-11-27 11:39:10 +05:30
Nabin Hait
9a06543453
Merge branch 'staging-fixes' into indicators-in-leave-applications
2018-11-27 11:38:29 +05:30
Kanchan Chauhan
2d0b788105
[Minor] Indicators in Leave Application
2018-11-27 10:37:23 +05:30
Nabin Hait
36f266355d
Merge branch 'staging-fixes' into fixed_holiday_list_not_working
2018-11-26 19:44:11 +05:30
deepeshgarg007
bd87903b56
Added condition for default amount
2018-11-26 17:13:59 +05:30
deepeshgarg007
533066eb87
Salary slip bug fix
2018-11-26 15:04:21 +05:30
Nabin Hait
48e0e19b03
fix(test): Fixed salary slip and sales analytics test cases
2018-11-26 11:05:28 +05:30
Rohit Waghchaure
037a151ef5
[Fix] New holiday list form is not working
2018-11-22 12:57:34 +05:30
Frappe Bot
98b4a1bc81
Merge branch 'master' into staging-fixes
2018-11-15 09:12:04 +00:00
Rohit Waghchaure
047a7123eb
Claimed amount is not reset on cancel
2018-11-14 13:20:00 +05:30
alsum
e04a753d53
assign-sa-to-group-of-employees
2018-11-13 11:43:58 +02:00
Ameya Shenoy
4a75d58d89
Merge branch 'master' into staging-fixes
2018-11-05 06:45:04 +00:00
Rohit Waghchaure
598d34445f
[Fix] Column ‘claimed_amount’ cannot be null
2018-11-02 16:02:33 +05:30
deepeshgarg007
78b273af43
[Bug-Fix] Cannot Save Bank Statement Transaction Entry ( #15793 )
...
* Create bank settings only if bank name is available
* Minor bug-fix in validate_overlap
2018-10-31 18:12:03 +05:30
