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
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
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
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
