tundebabzy
11d23f84d7
Can't set Start and End Dates in Salary Slip ( #9513 ) ( #9944 )
...
* remove trigger from end_date
* adds new function `get_end_date`:
- it tries to calculate the appropriate end date for a given frequency
- returns an empty string if frequency is 'biweekly'
- adds test cases
* changes logic in `set_start_end_dates`:
- if start_date is empty in form, call process_payroll.get_start_end_dates
- else, call process_payroll.get_end_date
* `get_end_date` should return a dict
* changed "biweekly" to "bimonthly"
* change the behaviour of process payroll start and end date:
- when payroll frequency is changed, change start/end date as usual
- if start date is manually changed, use the frequency to calculate the end date
* clean up
* further cleanup
* in `get_end_date`, if `frequency` isn"t given, "monthly"
* remove end_date from cscript and introduce `set_end_date`
* fix tests
* removed whitespaces
2017-07-20 10:33:03 +05:30
rohitwaghchaure
f86100a734
[Fix] Calendar view not working for leave application ( #9963 )
2017-07-19 17:09:30 +05:30
Makarand Bauskar
c446bf6117
Merge branch 'develop' into rejected_expense_claim_issue
2017-07-18 10:54:13 +05:30
Rushabh Mehta
660de515b5
[fix] filters for calendars frappe/erpnext#9850 ( #9870 )
2017-07-18 10:50:30 +05:30
Rohit Waghchaure
0e376a464b
test cases
2017-07-17 16:47:01 +05:30
Rohit Waghchaure
8333b5754b
[Fix] Expense claim status issue
2017-07-17 16:38:20 +05:30
rohitwaghchaure
b994b3dcda
Allow to select asset account in the payable in the expense claim for imprest management ( #9891 )
2017-07-17 14:33:33 +05:30
mbauskar
ed89a83584
[minor] don't trigger the expense type trigger if value is not set
2017-07-14 11:21:27 +05:30
Faris Ansari
2c5b3e83f5
New design for daily work summary ( #9844 )
...
* New design for daily work summary
* Update tests
2017-07-13 18:37:18 +05:30
Rushabh Mehta
4a7b4efbec
[tests] update travis.yml to run ui-tests ( #9748 )
...
* [tests] update travis.yml to run ui-tests
* [tests] update travis.yml to run ui-tests
* [test] fix item_group.py
* [test] fix item_group.py
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] daily work summary fails?
* [check] no scheduled jobs for tests
* [check] daily work summary fails?
* [check] daily work summary fails?
2017-07-10 23:00:01 +05:30
Makarand Bauskar
cdfccffc0d
Merge pull request #9341 from manassolanki/training-event
...
send email on update and on update after submit
2017-06-21 19:09:21 +05:30
Rushabh Mehta
b7b49f6da7
[fixes] fix message and type conversion;
2017-06-19 09:59:09 +05:30
Manas Solanki
9936100a6a
send email on update and on update after submit fixes #8898
2017-06-16 22:18:20 +05:30
Vishal Dhayagude
2510d1c86a
Training Events/Results link added to Employee ( #9313 )
2017-06-16 11:58:08 +05:30
Manas Solanki
b07535bb64
bug in training result module ( #9314 )
2017-06-16 11:20:42 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
KanchanChauhan
1dc26b127b
Salutation and Gender in Lead and Customer ( #9199 )
2017-06-13 15:26:35 +05:30
Nabin Hait
a128b21baa
Fixed merge conflict
2017-06-07 12:17:17 +05:30
tundebabzy
f981eee221
fixes issue #9013 : Salary calculation Error. ( #9044 )
...
* fixes issue #9013 :
Salary calculation Error.
* adds test case for scenario as in #9013
2017-06-07 12:05:00 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
rohitwaghchaure
7f2513f7a1
[Fix] Employees working on a holiday report's date filter not working ( #9108 )
2017-06-01 18:57:34 +05:30
Manas Solanki
5995010007
Correction in the validation message ( #9079 )
2017-05-30 15:56:48 +05:30
bcornwellmott
0d38a6b495
Fix grammar error in HR Training Results ( #9076 )
...
* Fix Typo in message
Issue #9074
* Added condition for notifying user of grade.
2017-05-30 15:56:02 +05:30
Manas Solanki
ca31425bb4
field for the naming series should have no copy attribute ( #9067 )
2017-05-30 15:36:50 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Makarand Bauskar
157c334737
[minor] added get_terms methods to erpnext.utils so that it can be used in non transactional documents ( #9037 )
2017-05-26 21:32:33 +05:30
Manas Solanki
c2bf50042f
validate email id only if provided ( #9020 )
2017-05-25 14:14:42 +05:30
Francisco Roldán
85bfc05efa
Fix missing translations ( #8871 )
...
* Fix missing translations
* Fix
2017-05-17 19:42:04 +05:30
Ayush Shukla
c55b805b66
[minor] process_payroll_create salary fixed, fixes frappe/erpnext#8853 ( #8881 )
...
* [minor] process_payroll_create salary fixed
* [minor] indentation fix
2017-05-17 19:18:26 +05:30
Makarand Bauskar
3e2c9d00f1
[minor] Corrected field label & placed Expense Claim button in Next Step ( #8828 )
2017-05-16 08:22:45 +05:30
KanchanChauhan
f74010d379
Calculations based on working and payment days should be made if salary structure exists ( #8770 )
2017-05-11 11:42:35 +05:30
KanchanChauhan
323e46ba5a
Added parent filter to the Salary Structure Employee since it was getting base and variable value from first found Salary Structure Employee ( #8756 )
2017-05-10 17:46:32 +05:30
Makarand Bauskar
486045e1d1
[minor] check if date of joining is available before creating Salary Slip ( #8700 )
2017-05-06 12:47:42 +05:30
Nabin Hait
3ce41d6b1f
Fixed related to auto fetching batch nos and date valiation in salary structure ( #8666 )
...
* Fixed related to auto fetching batch nos and date valiation in salary structure
* Update get_item_details.py
2017-05-03 18:22:24 +05:30
Nabin Hait
504eba7fb2
Test case fixed for Employee Loan Application
2017-05-02 18:19:48 +05:30
Nabin Hait
e15721df48
Caluculate total interest and payable amount in Loan Application if fixed amount per period
2017-05-02 18:19:48 +05:30
Nabin Hait
2afb9b96cd
pricing rule fix
2017-04-28 15:20:49 +05:30
mbauskar
9cf6d630e9
[minor] fixes for expense claim status
2017-04-25 13:15:50 +05:30
ibi
83c1c3a171
fleet_management: replace references to fleet_management by hr in vehicle_log doctype
2017-04-21 17:57:07 +05:30
mbauskar
5123a8519b
[minor] check if joining date is available before validating attandance date
2017-04-18 11:08:57 +05:30
Rushabh Mehta
e3c117e32c
[fix] validate preferred email if set in employee.py
2017-04-15 16:59:39 +05:30
Nabin Hait
f6149f1507
Merge pull request #8429 from ckosiegbu/payroll_updates
...
Statistical Components for Salary Structure
2017-04-13 18:48:47 +05:30
Nabin Hait
2f3585f949
Update salary_slip.js
2017-04-13 18:47:25 +05:30
ckosiegbu
a236f4e586
Space to Tabs on salary_slip.py
2017-04-13 10:28:10 +01:00
ckosiegbu
64f29f819a
Introduce the ability to specify in a Salary Structure that a component is statistical. This allows components to be used in calculations without being added/deducted from earnings deductions.
2017-04-13 00:00:37 +01:00
Khairil Zhafri
417145bec5
Update employee.json
...
Less binary gender options for Employee
2017-04-11 18:55:20 +05:30
Rohit Waghchaure
1ff1368280
[fix] Vehicle expense report not working
2017-04-11 18:54:32 +05:30
mbauskar
236f7aac7f
[minor] track changes for transaction documents
2017-04-10 14:48:54 +05:30
Rushabh Mehta
9365641777
[added] frappe.safe_eval
2017-04-06 18:24:34 +05:30
Kanchan Chauhan
aa6f00c403
Added default 'All' option to filters to differentiate all and empty filter
2017-04-06 15:22:18 +05:30
Rushabh Mehta
08a42e00ae
[fix] salary slip eval, remove access to globals, #8313
2017-04-05 14:52:22 +05:30
Rushabh Mehta
cc8b2b2fdb
[fix] [refactor] demo for v8 and remove purchase common
2017-03-31 17:36:48 +05:30
Rushabh Mehta
dc89916aa9
[fix] salary component fix for abbr
2017-03-31 17:20:57 +05:30
Nabin Hait
eb6fa5b70c
Update attendance.py
2017-03-30 14:11:47 +05:30
Nabin Hait
1f6bd0ad37
Fixed merge conflict
2017-03-30 13:15:22 +05:30
Nabin Hait
a24f8dbb8f
Merge branch 'develop' into update-disbursment-date
2017-03-30 13:06:28 +05:30
Kanchan Chauhan
37d8f643cc
Read permissions to Employee on Employee Loan and Loan Type
2017-03-30 13:05:49 +05:30
Kanchan Chauhan
400c6f5aef
Disbursement Date fetched from JV - Employee Loan
2017-03-30 13:04:05 +05:30
mbauskar
07e6bdd4f2
[minor] check employee date of joining before marking the employee attendance
2017-03-30 12:52:29 +05:30
Kanchan Chauhan
b87c174898
Employee Loan Dashboard
2017-03-30 12:51:46 +05:30
Kanchan Chauhan
5ac740b3cb
[Fix] From Date and To Date not to be auto calculated for Timesheet Salary
2017-03-30 12:44:28 +05:30
Kanchan Chauhan
35b12e2ea6
Company in Leave Control Panel
2017-03-29 17:30:56 +05:30
Nabin Hait
8de911b5b4
Merge pull request #8086 from KanchanChauhan/read-perm-to-guest
...
[Minor] Guest should have read permissions on Job Openings
2017-03-23 16:50:45 +05:30
Kanchan Chauhan
076e9d6af8
[Minor] From date, To date based on Payroll Frequency
2017-03-22 16:07:03 +05:30
Kanchan Chauhan
730ad5a507
[Minor] Guest should have read permissions on Job Openings
2017-03-22 12:37:38 +05:30
Nabin Hait
ee7b4f2882
Merge pull request #8016 from rmehta/posting-date-option
...
[feature] posting date, time is always current unless explicitly set
2017-03-15 11:22:04 +05:30
Nabin Hait
3d731df7e3
Field order changed for 'Qty as per Stock UOM'
2017-03-14 17:24:57 +05:30
Rushabh Mehta
6d4a52562b
[fix] posting date, time is always current unless explicitly set
2017-03-14 17:06:51 +05:30
Nabin Hait
6923397ef6
Show net total in salary slip log in Process Payroll. Fixed #7986
2017-03-12 16:55:05 +05:30
Nabin Hait
c5204f56e2
Merge pull request #7909 from KanchanChauhan/employee-loan-jv
...
JV on submitting Employee Loan
2017-03-12 16:50:48 +05:30
Nabin Hait
132193309c
Merge pull request #7952 from KanchanChauhan/multiple-salary-fixes
...
Multiple Salary Fixes
2017-03-12 16:48:11 +05:30
Kanchan Chauhan
37a57813fa
Multiple Salary Fixes
2017-03-09 13:00:35 +05:30
Kanchan Chauhan
ffd1f112e6
JV on submitting Employee Loan
2017-03-09 12:21:37 +05:30
Kanchan Chauhan
a64f53801b
[Minor] Label change in Expense Claim
2017-03-08 16:59:49 +05:30
Abdulla P I
cbe035b08a
Only enabled user to be fetched
2017-03-07 13:34:08 +05:30
Nabin Hait
b3ffd6b282
Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles
...
Changed userrole to has role, commonify role editor of the user
2017-03-06 18:44:53 +05:30
Kanchan Chauhan
8411be7720
[Fix] Candidate can apply to multiple jobs
2017-03-06 14:40:43 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Rohit Waghchaure
312498060f
changed doctype name userrole to has role
2017-03-06 14:24:39 +05:30
Rohit Waghchaure
d59f8b32cd
changed user_roles to roles
2017-03-06 14:24:39 +05:30
Rohit Waghchaure
f8aa6ed46b
removed fiscal year and month from the print
2017-03-02 17:51:15 +05:30
Nabin Hait
a0fb3e5128
Merge pull request #7888 from KanchanChauhan/payroll-fix
...
[Fix] JV entry for Employee Loan only if Loan exists
2017-03-02 14:15:59 +05:30
Kanchan Chauhan
cfb0adff98
[Minor] Removed Paid status from Salary Slip
2017-03-02 12:59:35 +05:30
Kanchan Chauhan
e6254b96c4
[Fix] JV entry for Loan only if Loan exists
2017-02-28 17:42:09 +05:30
Nabin Hait
631ecad985
Merge pull request #7875 from KanchanChauhan/employee-loan-fixes
...
[Fix] Multiple fixes in Employee Loan
2017-02-27 17:28:20 +05:30
Nabin Hait
3ddc26060a
Merge pull request #7876 from KanchanChauhan/salary-slip-fix
...
[Fix] Update totals on salary component deletion
2017-02-27 17:26:39 +05:30
Kanchan Chauhan
c02745c826
[Fix] Update totals on salary component deletion
2017-02-27 17:21:41 +05:30
Kanchan Chauhan
a13adc0e6b
[Fix] Multiple fixes in Employee Loan
2017-02-27 16:56:00 +05:30
Nabin Hait
c642f76a4d
Fixed merge conflict
2017-02-27 14:40:53 +05:30
Nabin Hait
697150f339
Leave application overlap validation for half day and test cases
2017-02-24 18:53:34 +05:30
Kanchan Chauhan
26b79f108a
Leave Application Enchancement
2017-02-24 15:13:06 +05:30
Nabin Hait
8ec1b565f5
Merge pull request #7823 from KanchanChauhan/payroll-currency
...
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 16:52:23 +05:30
Kanchan Chauhan
52a5cb9ae3
[Fix] Holiday Calendar Fix
2017-02-23 16:15:12 +05:30
Nabin Hait
60db08fd7f
Merge pull request #7817 from KanchanChauhan/loan-management-fix
...
[Minor] Field label rename
2017-02-23 16:09:11 +05:30
Kanchan Chauhan
951e31667b
[Minor] Company default currency in Salary Slip and Structure
2017-02-23 11:16:53 +05:30
Nabin Hait
97b3be6f9d
Update salary_structure_employee.json
2017-02-23 11:10:05 +05:30
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Kanchan Chauhan
6af7140763
[Minor] Field label rename
2017-02-22 14:58:34 +05:30
Nabin Hait
7056ce54d7
Update salary_structure.py
2017-02-20 23:28:47 +05:30
Nabin Hait
6a85752ead
Merge branch 'hotfix' into remove-joining-datep-validation
2017-02-20 19:31:38 +05:30
Nabin Hait
e17519accb
Update salary_structure.py
2017-02-20 19:30:44 +05:30
Nabin Hait
8bb69ff8bf
Fixed merge conflict
2017-02-20 19:01:04 +05:30
Nabin Hait
e49d901907
Update process_payroll.py
2017-02-20 18:36:12 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Kanchan Chauhan
1b204c8e4e
Accrual Payroll System
2017-02-16 16:30:51 +05:30
Nabin Hait
507e6fa46e
Merge pull request #7749 from KanchanChauhan/leave-application-cleanup
...
Rejected leave application can be submitted
2017-02-16 14:19:11 +05:30
Kanchan Chauhan
11f159193e
Rejected leave application can be submitted
2017-02-15 19:09:21 +05:30
Kanchan Chauhan
ecdcac1fdf
[Fix] Empty row in Goals of Appraisal fixed
2017-02-14 15:32:06 +05:30
Nabin Hait
6ff0caa87a
Fixed merge conflict
2017-02-08 11:33:33 +05:30
Kanchan Chauhan
842ad55235
[Fix] Employee Details in Salary Slip preview
2017-02-07 12:07:55 +05:30
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Nabin Hait
20d2d7548a
Update salary_component.js
2017-02-06 11:36:38 +05:30
KanchanChauhan
6575a0a7e2
[Minor]ROI fix in Employee Loan ( #7643 )
2017-02-02 16:01:43 +05:30
Kanchan Chauhan
3e2ecc3423
[Fix] Account filter in Process Payroll and Salary Component
2017-02-02 14:41:48 +05:30
Nabin Hait
c62362f064
Merge pull request #7649 from KanchanChauhan/salary-struct-fix
...
[Fix] Employee name fixes in Salary Structure
2017-02-02 13:30:05 +05:30
Kanchan Chauhan
a0314f19ca
[Fix] Employee name fixes in Salary Structure
2017-02-02 12:56:56 +05:30
KanchanChauhan
b499fe91fa
Revert "[Fix] Rate of Interest Fix"
2017-02-01 18:16:35 +05:30
KanchanChauhan
929c3890a4
Merge pull request #7641 from KanchanChauhan/employee-loan-fix
...
[Fix] Rate of Interest Fix
2017-02-01 18:06:32 +05:30
KanchanChauhan
0e995adc44
Salary Structure Employee custom field can be used in Formula and Condition ( #7615 )
2017-02-01 18:05:57 +05:30
Kanchan Chauhan
f01c1c2a9d
[Fix] Rate of Interest Fix
2017-02-01 18:05:26 +05:30
KanchanChauhan
3dc96cf71e
Merge pull request #7640 from KanchanChauhan/remove-date-validation-salary-structure
...
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:42:18 +05:30
Kanchan Chauhan
e67e2e6fee
[Minor] From Date validation removed from Salary Structure
2017-02-01 17:41:36 +05:30
rohitwaghchaure
ea092a7b24
[Enhancement] Booking of an employee's expense claim ( #7267 )
...
* [Enhancement] Auto book of an employee's expense claim
* test cases
* documentation
* fixes and changes
* removed payable from employee and added into the company
* Added party in account, patch to update party type for customer and supplier accounts
* added party type in erpnext, fix patch
* fixed travis
2017-02-01 12:02:08 +05:30
Rushabh Mehta
99ce531beb
[minor] css for team updates
2017-02-01 11:46:47 +05:30
Rushabh Mehta
7ec4b717ed
[feature] added team updates page
2017-01-31 11:42:58 +05:30
KanchanChauhan
fbaa6197f9
Employee Loan Management ( #7126 )
...
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
2017-01-30 15:15:58 +05:30
Kanchan Chauhan
e877ecfb7b
[Fix] Permissions to view Leave Balance Report
2017-01-27 11:53:56 +05:30
Nabin Hait
349d520ae2
Fixed merge conflict
2017-01-20 15:44:35 +05:30
robert schouten
e14e042f2f
[fix] remove invalid parameter from leave allocation
2017-01-20 15:02:00 +08:00
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Kanchan Chauhan
653303180a
[Minor] Payroll Fix
2017-01-17 13:54:55 +05:30
Nabin Hait
7c7b3c0ab4
Merge pull request #7465 from KanchanChauhan/attendance-enhancement
...
[Enhancement] Attendance Module
2017-01-17 11:47:02 +05:30
Nabin Hait
2dab8809e7
Merge pull request #7509 from kickapoo/develop
...
Add Full Name as option in HR Setting Employee creation option
2017-01-17 11:26:25 +05:30
Stavros Anastasiadis
241e478dc0
Add Full Name as option in HR Setting Employee creation option
2017-01-16 14:02:28 +02:00
Kanchan Chauhan
f80c2b9606
Fleet management moved to HR
2017-01-16 14:38:24 +05:30
Nabin Hait
ba2a76cfb7
Merge pull request #7453 from KanchanChauhan/salary-register-report
...
Changes to Salary Register
2017-01-13 11:51:48 +05:30
Nabin Hait
007c87ea63
Merge pull request #7440 from nabinhait/gle_repost_optimization
...
Optimization to reduce GLE reposting time for future stock transactions
2017-01-13 11:33:42 +05:30
Kanchan Chauhan
7933eb685c
[Enhancement] Attendance Module
2017-01-12 17:24:53 +05:30
Kanchan Chauhan
2f3ae914a6
Changes to Salary Register
2017-01-11 19:45:01 +05:30
RicardoJohann
7182de7684
allowed rename salary structure
2017-01-11 06:28:59 -02:00
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Kanchan Chauhan
2b41f9d548
[Fix] Payroll Frequency toggle fix
2017-01-09 18:43:52 +05:30
Rushabh Mehta
8b133ac087
[minor] [tests] fix, tests will fail on the 5th of a month!
2017-01-06 17:21:04 +05:30
Kanchan Chauhan
b7cc393eb8
Email ID renamed to Email Address
2017-01-03 16:45:38 +05:30
Nabin Hait
ab42fc006f
Merge branch 'master' into develop
2017-01-02 17:26:55 +05:30
Kanchan Chauhan
5594050104
[Fix] Attendance validation in Leave Application
2017-01-02 11:14:44 +05:30
KanchanChauhan
4601fdd98d
Better Salary Slip logs in Process Payroll ( #7322 )
2016-12-30 16:26:55 +05:30
Nabin Hait
9784d27317
Optimization to reduce GLE reposting time for future stock transactions
2016-12-30 16:21:35 +05:30
Nabin Hait
e97d40806f
Merge branch 'master' into develop
2016-12-30 14:56:20 +05:30
