Zarrar
24b8aa2e80
set field dependent on link field fix ( #11580 )
2017-11-15 14:27:00 +05:30
Nabin Hait
6fd163bc55
Merge branch 'master' into develop
2017-11-15 14:08:17 +05:30
rohitwaghchaure
43edd5d03c
Employee loan fixes ( #11495 )
...
* Employee loan fixes
* Update update_employee_loan_details.py
2017-11-14 17:59:20 +05:30
Rushabh Mehta
d8bc8de6ca
[minor] remove unnecessary description in upload attendance, fixes #10603
2017-11-14 12:52:53 +05:30
Prateeksha Singh
17b7209032
remove erroneous column breaks ( #11522 )
2017-11-10 18:54:03 +05:30
Prateeksha Singh
731b66b788
remove erroneous column breaks ( #11523 )
2017-11-10 18:53:52 +05:30
rohitwaghchaure
cc97ec9202
[hotfix] Salary slip, leave considered in amount calculation even if depends on lwp is disabled in salary slip ( #11507 )
2017-11-10 15:06:58 +05:30
Saurabh
62fd4007b0
Merge branch 'master' into staging
2017-11-02 12:14:42 +05:30
tunde
31287b00a6
call get_employee_loan_application only when appropriate
2017-10-31 18:10:17 +01:00
Doridel Cahanap
49a7bde6e2
[minor] Label for Training Event in Training Program Dashboard ( #11280 )
2017-10-25 12:15:17 +05:30
Manas Solanki
a5eee4629f
Fix UI tests ( #11309 )
...
* decrease the timeout
* delete the duplicate test
2017-10-25 11:42:22 +05:30
Doridel Cahanap
b06f155ceb
[minor] Set Quick Entry to False in Training Event ( #11279 )
2017-10-23 11:35:12 +05:30
Doridel Cahanap
5a4d5bfaf2
Add Training Program DocType, Script, Path and Doc ( #11181 )
...
* Add Training Program Doctype, Script, Config and documentation
* Add Training Program to Training Event
* [Test Case] Training Event in a Training Program
2017-10-20 11:31:15 +05:30
Nabin Hait
b4f5f14438
Timeout increased for setting __newname ( #11252 )
...
* Timeout increased for setting __newname
* UI test fixes
* fixed ui test for PO
* ui tests
* ui tests
* ui tests
* ui tests
* ui tests
2017-10-20 11:26:17 +05:30
Helkyd
7ec7a45f05
Salary Detail Abbr ( #11165 )
...
When processing via Process Salary Abbr is not filled unless if Hourly pay ... this is required for later check what Component is or was added for Employee
2017-10-18 11:16:24 +05:30
KanchanChauhan
44734049f5
[Minor] Populate Expense Claim Description from Expense Claim Type ( #11156 )
2017-10-17 17:23:26 +05:30
Rushabh Mehta
bc4e2cd9c1
[added] hospitality domain ( #11020 )
...
* [added] hospitality domain
* [tests] wip
* [tests] for restaurant
* [fix] tests for new naming
* [docs] added restaurant docs
* [docs] added restaurant docs
2017-10-17 12:30:34 +05:30
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