Saurabh
9893a2d608
Merge branch 'master' into develop
2017-10-10 11:22:39 +05:30
Saurabh
f347e23556
[fix] upload attendacne with with no_socketio param
2017-10-09 16:13:21 +05:30
Doridel Cahanap
5ba39f3f83
Add has_certificate and level fields in Training Event ( #11093 )
2017-10-09 12:45:28 +05:30
Doridel Cahanap
5cb6c38a34
Add Calendar in Training Event Doctype ( #11090 )
2017-10-06 11:50:05 +05:30
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
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
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
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
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
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
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
