Stavros Anastasiadis
455c3ebb27
Add as optional field link Company ( #11068 )
2017-10-05 18:45:37 +05:30
Utkarsh Goswami
975d28307a
Payroll feature ( #10900 )
2017-10-05 15:59:51 +05:30
Stavros Anastasiadis
ea390effa5
Add multirows in Attendees selection ( #11067 )
2017-10-05 15:31:25 +05:30
Nabin Hait
34ad2e6a60
Use format_currency only if fieldtype is currency
2017-10-05 15:28:43 +05:30
Nabin Hait
f8ad0cbe70
Merge branch 'develop' of https://github.com/Helkyd/erpnext-1 into Helkyd-develop
2017-10-05 15:02:50 +05:30
Doridel Cahanap
25db832be1
[minor] Add "Attendance" in grid view for Training Event Employee ( #11063 )
2017-10-05 14:20:43 +05:30
Nabin Hait
fc712aea32
Merge branch 'master' into develop
2017-10-04 18:05:20 +05:30
tundebabzy
65dfd09947
fix wrong variable name ( #11050 )
2017-10-04 17:51:44 +05:30
KanchanChauhan
d3e21fff66
[Minor] Employee name as standard filter ( #11043 )
2017-10-04 15:20:34 +05:30
Revant Nandgaonkar
4d68e03a97
[Fix] Job Opening Web Form breadcrumb ( #11029 )
2017-10-04 14:35:21 +05:30
Helkyd
4c58588d25
Improve Salary Register
...
Check if fieldname is a number to format.
Start the Html Salary with hidden fields and check if they not empty and increase the width...
This will remove Blank fields from the report.
2017-10-01 20:20:57 +01:00
tunde
c49e748c85
Merge branch 'develop' into payment-terms
2017-09-29 13:30:22 +01:00
Rushabh Mehta
2b87d100fa
[fix] https://github.com/frappe/erpnext/issues/10956
2017-09-28 15:21:36 +05:30
tunde
25cda29007
fix test Employee
2017-09-21 14:33:39 +01:00
Faris Ansari
aebcb17daf
Show thumbnail image in daily work summary ( #10605 )
...
* Show thumbnail image in daily work summary
* Crop thumbnail image into square
* fix codacy
2017-09-18 16:58:24 +05:30
Nabin Hait
628ca2a2ec
Minor fix for ui tests
2017-09-15 19:35:12 +05:30
Nabin Hait
46941e8b35
Time out increased for appraisal template
2017-09-15 18:56:49 +05:30
Nabin Hait
43268bd350
Fixed salary structure tests
2017-09-14 19:39:10 +05:30
Nabin Hait
2f64f0f5fa
Fixed salary structure tests
2017-09-14 19:08:15 +05:30
Nabin Hait
427172c941
Update test_salary_structure.js
2017-09-14 17:57:21 +05:30
Nabin Hait
092f6d3739
Fixes ui tests
2017-09-14 16:45:47 +05:30
Nabin Hait
de9eebe51c
Fixed multiple ui tests
2017-09-12 15:40:33 +05:30
Rushabh Mehta
2e8e5354e9
[fix] trainig_feedback.py
2017-09-07 10:43:36 +05:30
Rushabh Mehta
290e066633
[rename] /test_training_event_attendance.js
2017-09-07 09:07:15 +05:30
Nabin Hait
baacf51a00
Fixed merge conflict
2017-09-04 10:13:29 +05:30
Nabin Hait
d7ff9dca1d
Fixed rounding issue in Process Payroll, fixes #9300 ( #10586 )
2017-08-31 15:17:01 +05:30
Aditya Hase
6ccb6562f1
Python 3 compatibility syntax error fixes ( #10519 )
...
* Use Python 3 style print function
* Use 'Exception as e' instead of 'Exception, e'
* Unpack tuple arguments explicitly in instead of relying on auto unpacking
* Use consistent indentation
* Use 0 if stock_frozen_upto_days is None
2017-08-28 18:17:36 +05:30
Utkarsh Goswami
7ba2a83182
Tests for Loan ( #10557 )
2017-08-28 11:13:16 +05:30
Utkarsh Goswami
579c8e68f9
Tests for Expense Claims [HR] ( #10514 )
2017-08-25 16:12:49 +05:30
Utkarsh Goswami
9a04da27b0
Test for training ( #10545 )
2017-08-25 12:01:04 +05:30
Utkarsh Goswami
3da5574d79
Test for appraisal ( #10525 )
2017-08-24 15:48:57 +05:30
mbauskar
62f0722325
resolved merge conflicts
2017-08-21 08:58:42 +05:30
Vishal Dhayagude
8fd5b325e0
[UI Test] travis.yml modified for fresh UI Test ( #10446 )
...
* [UI Test] travis.yml modified for fresh UI Test
* [fix] travis
* Update test_production_order.js
* Update test_production_order.js
* Update test_purchase_order_receipt.js
* Update tests.txt
* Update test_purchase_order_receipt.js
2017-08-20 10:59:48 +05:30
Utkarsh Goswami
5a27aead06
Test for Process Payroll ( #10447 )
2017-08-18 13:12:53 +05:30
Utkarsh Goswami
ca63cc6439
[UI Test Recruitment] To test Recruitment in HR module ( #10441 )
...
* Tests for Recruitment
* Codacy fix
2017-08-18 11:57:01 +05:30
Makarand Bauskar
446c2b0e91
[hotfix] fixes for https://github.com/frappe/erpnext/issues/9782 calculate leave without pay before subtracting holidays ( #10355 )
2017-08-17 12:39:35 +05:30
Utkarsh Goswami
44b088c6b3
[UI Test Salary] To test the salary structure and the salary slip ( #10407 )
...
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Test for salary structure and salary slip
* Travis CI fixes
* Updated
* Updated
* travis fixes
* Travis fixes
2017-08-16 11:32:04 +05:30
Rushabh Mehta
683b015951
[fix] email alert
2017-08-14 15:03:33 +05:30
Makarand Bauskar
e5ae4d3bd3
send email via the background jobs ( #10374 ) ( #10393 )
...
* send the email via the background worker in the payment request (#10350 )
* send email via the background jobs (#10374 )
2017-08-14 12:22:50 +05:30
Rushabh Mehta
1132502e14
[fix] test
2017-08-14 12:09:30 +05:30
Rushabh Mehta
ea573e2421
[training] update names
2017-08-14 11:53:34 +05:30
Rushabh Mehta
550b0fab84
[fixes] email notifications by email alert on training event and result
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
35a4e587ee
Fixes for camel_case and translations
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e92b4737e3
codacy fixes
2017-08-14 11:53:34 +05:30
Ben Cornwell-Mott
e9dbafcc10
Improve email format for training event, add ui test
2017-08-14 11:53:34 +05:30
Manas Solanki
a5cb9ae8bd
send email via the background jobs ( #10374 )
2017-08-14 09:50:15 +05:30
mbauskar
2fa8af3b02
Merge branch 'master' into develop
2017-08-14 09:31:01 +05:30
Makarand Bauskar
aac8349391
[hotfix] remove the white spaces from condition and formula fields ( #10331 )
...
* [hotfix] remove the white spaces from condition and formula fields
* [tests] added tests cases for whitespaces in formula and condition fields
2017-08-10 11:25:49 +05:30
Manas Solanki
a854ea00a5
mark holiday in the employee monthly attendance sheet ( #10349 )
2017-08-10 11:20:58 +05:30
mbauskar
cce79255fe
resolved merge conflicts
2017-08-04 11:07:49 +05:30
Nabin Hait
21045c456e
Update process_payroll.py
2017-08-03 10:20:10 +05:30
tunde
919c9db1b0
indicator should be red
2017-08-02 15:19:24 +01:00
tunde
3b8b3fe766
Merge branch 'hotfix' into issue-10215
2017-08-02 14:27:56 +01:00
tunde
85adbd7eae
show message if there's no submitted salary slip
2017-08-02 14:20:24 +01:00
tunde
c697526382
except in python 3 compatible style
2017-08-02 14:20:23 +01:00
Nabin Hait
9641d5b1f4
Make payment entry button in expense claim and some minor cleanup
2017-08-01 17:38:48 +05:30
Ben Cornwell-Mott
38d4be8325
Update manuals. Fix codacy issues
2017-08-01 17:38:47 +05:30
Ben Cornwell-Mott
118ceda46f
Add Payment Entry for Expenses
2017-08-01 17:35:50 +05:30
Utkarsh Yadav
8990af458b
[ui test] leave application in HR ( #10151 )
...
* added test for leave application
* minor changes and path added
* travis fixes
* minor changes
2017-07-28 19:37:15 +05:30
Utkarsh Yadav
1c8d8a9720
[ui test] leave type,leave control panel and leave allocation in HR ( #10136 )
...
* changes in attendance
* added test for leave type
* added test for leave control panel
* added test for leave allocation
* codacy fixes
2017-07-28 11:40:29 +05:30
Saurabh
c07741d36f
Merge branch 'master' into staging
2017-07-27 17:50:28 +05:30
mbauskar
7b764d03c2
Merge branch 'master' into develop
2017-07-27 12:18:15 +05:30
Utkarsh Yadav
b8b01928d3
[ui test] employee attendance tool and attendance in HR ( #10112 )
...
* added test for attendance tool
* added test for attendance
* minor changes
* minor changes
* path added in tests.txt
* codacy fixes
2017-07-27 11:49:10 +05:30
tundebabzy
84227a6c54
Employee Loan Should Be Limited To Employee Company ( #10039 ) ( #10093 )
...
* filter employee drop down by company name
* codacy fix
2017-07-27 11:47:03 +05:30
tundebabzy
87ec6a12ef
adds options to currency fields ( #10118 )
2017-07-27 11:38:17 +05:30
cclauss
6848708377
old style exception, raise --> new style for Python 3 ( #10082 )
...
* old style raise --> raise() for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style exception --> new style for Python 3
* old style raise --> raise() for Python 3
* old style raise --> raise() for Python 3
* old style exception, raise --> new style for Python 3
2017-07-27 10:38:35 +05:30
Utkarsh Yadav
53b877bd8f
[ui test] Employee in HR ( #10103 )
...
* added test for employee
* names changed
* path added in tests.txt
2017-07-26 16:32:16 +05:30
Utkarsh Yadav
b8a4a584e6
[ui test] test for department, designation, company and leave block list ( #10085 )
...
* added test for required items
* minor fixes for travis
* name changed
* added test for employment type
* travis fixes
2017-07-26 13:14:34 +05:30
Utkarsh Yadav
20a862a6b9
[ui test] holiday list and branch in HR ( #10045 )
...
* added test for holiday list
* codacy fixes
* added check for all days in list
* added test for branch
* codacy fixe
* minor fixes
2017-07-24 14:33:42 +05:30
mbauskar
0e6933a1e8
resolved merge conflicts
2017-07-20 14:19:47 +05:30
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
