Faris Ansari
175709ed50
fix: Update Training Level
...
- Rename Expert to Intermediate, since it was ambiguous with Advance
2019-03-12 10:55:39 +05:30
Himanshu Warekar
219b9f4150
Salary Component can be equal to zero
2019-03-05 17:44:07 +05:30
Rushabh Mehta
fcd0556119
Merge pull request #16709 from rmehta/project-template
...
feat: Project Template
2019-02-27 09:22:12 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
Rushabh Mehta
b94c8b1c77
fix(tests): add test for bulk complete / cancellation of project
2019-02-26 14:30:38 +05:30
Rushabh Mehta
e2de8e0fa5
fix: expense claim type ( #16760 )
2019-02-25 11:56:30 +05:30
Saurabh
3dd7ddd838
Merge branch 'master' into develop
2019-02-21 18:25:29 +05:30
Nabin Hait
40c15d2e74
fix: Calendar events for leaves considering user permissions
2019-02-20 18:55:38 +05:30
Sagar Vora
cc6e51c62d
Merge branch 'master' into develop
2019-02-19 18:09:49 +05:30
deepeshgarg007
de0f59b818
fix: Removed precision from multiple doctypes
2019-02-19 08:40:16 +05:30
Tropicalrambler
3a88bc43dc
fix: typo in salary register report field name ( #16670 )
...
When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.
2019-02-15 13:40:44 +05:30
Sagar Vora
551f52fd25
Merge branch 'master' into develop
2019-02-12 16:41:24 +05:30
Nabin Hait
fdefbdb23b
Merge pull request #16609 from nabinhait/multipel_fixes
...
Multiple fixes
2019-02-12 13:56:06 +05:30
Zlash65
fd3998cfc9
fix: make branch as link field
2019-02-12 11:27:23 +05:30
Nabin Hait
e3b0f4f9f6
fix: removed account type filter on employee advance account
2019-02-08 16:56:26 +05:30
Sagar Vora
da1dc7fa52
Merge branch 'master' into develop
2019-02-05 18:40:39 +05:30
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
56cbfe4bb0
Merge branch 'master' into develop
2019-01-31 13:34:32 +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
Saurabh
a342138625
Merge branch 'master' into develop
2019-01-30 12:38:58 +05:30
rohitwaghchaure
25e63e806c
fix: modified date ( #16520 )
2019-01-30 11:46:34 +05:30
Sagar Vora
f97c5dad82
Merge branch 'staging' into develop
2019-01-29 18:39:14 +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
Sagar Vora
4d1a9b10ed
Merge branch 'staging' into develop
2019-01-22 15:56:39 +05:30
Zlash65
c8d632ddff
fix: add set query for payroll entry in JV
2019-01-22 12:46:13 +05:30
Nabin Hait
bef2c22d23
Fix: merge conflict
2019-01-18 10:15:47 +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
Saurabh
afec3ca89a
Merge branch 'staging' into develop
2019-01-08 17:09:36 +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
Frappe Bot
fdd5d54d41
Merge branch 'staging' into develop
2019-01-05 09:11:15 +00:00
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
