rohitwaghchaure
41b457076d
Merge branch 'develop' into enterprise_fix
2018-05-15 22:26:11 +05:30
rohitwaghchaure
043aae7293
Merge pull request #14058 from ESS-LLP/encashment
...
Leave Encashment
2018-05-15 22:24:52 +05:30
rohitwaghchaure
f9fa588ddc
Merge pull request #14061 from rohitwaghchaure/budget_validation_enhance_in_mr_po
...
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:18:17 +05:30
Rohit Waghchaure
4d4fb6dcbc
[Enhance] Budget validation on material request, purchase order
2018-05-15 22:12:44 +05:30
Ranjith
d43e068a5b
fix Leave Encashment unlink additional component, readonly encashed days
2018-05-15 20:11:30 +05:30
Ranjith
c60c6981a5
Merge remote-tracking branch 'frappe/develop' into encash
2018-05-15 20:00:26 +05:30
Jamsheer
3beeb7255f
Compensatory Leave Request - add link to leave allocation
2018-05-15 19:42:27 +05:30
Jamsheer
ebb68afecb
Leave Allocation - remove link to compensatory leave request
2018-05-15 19:41:25 +05:30
Jamsheer
a46ce11af9
Additional Salary Component - naming and date fix
2018-05-15 19:20:51 +05:30
Manas Solanki
70899f5a60
Update utils.py
2018-05-15 18:52:14 +05:30
Zlash65
b8bd6644fd
remove unused module import and error classes
2018-05-15 18:23:41 +05:30
anoop
504855e1a0
on submit: create additional salary component, revert on cancel
2018-05-15 18:11:49 +05:30
rohitwaghchaure
0e47837dab
Merge pull request #14051 from shreyashah115/min-fix
...
[Fix] Supplier Doctype
2018-05-15 17:55:32 +05:30
rohitwaghchaure
c3b9eabe5e
Merge pull request #14048 from shreyashah115/exchange-rate
...
[Enhancement] Buying and Selling checkboxes in Currency Exchange
2018-05-15 17:55:09 +05:30
Shreya
acc4ceceb7
Add Patch to update existing records
2018-05-15 17:54:10 +05:30
Shreya
da5163da2f
Fix Supplier Doctype
2018-05-15 17:43:50 +05:30
Zlash65
36cb8fb153
removed hard coded account_type from tree's add_child entry
2018-05-15 17:36:01 +05:30
Shreya
3f77852e93
Pass buying or selling as filter parameters
...
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Shreya
b547cdd8fa
Add buying or selling to filters in get_exchange_rate
2018-05-15 16:58:45 +05:30
Ranjith
4c721cbe0f
Leave Encashment - submit, cancel Additional Salary Component
2018-05-15 16:39:20 +05:30
rohitwaghchaure
c0b15cf41a
Merge pull request #14041 from manassolanki/deferred-account
...
Deferred account
2018-05-15 16:31:05 +05:30
rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix
...
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
Rohit Waghchaure
e0b515066e
[Fix] Employee mandatory validation issue
2018-05-15 16:18:05 +05:30
Shreya
8e386167b8
Set Mandatory from client-side
2018-05-15 16:09:53 +05:30
Rohit Waghchaure
e2a7f86636
Navigation added for Employee Separation, Onboarding
2018-05-15 16:04:39 +05:30
Shreya
f636503dc1
[minor] Fix customer doctype
2018-05-15 15:57:27 +05:30
rohitwaghchaure
6bcf48a70e
Merge pull request #14043 from Zlash65/fix-dept
...
[Minor] Remove duplicate from HR config file
2018-05-15 15:28:16 +05:30
rohitwaghchaure
66ece67d41
Merge pull request #14044 from shreyashah115/fix-promotion-doc
...
[Fix] Updation of new values in Employee Property History
2018-05-15 15:27:16 +05:30
Manas Solanki
2f4e5ee2c2
Update hooks.py
2018-05-15 15:25:14 +05:30
Zlash65
44146e0cda
remove duplicates
2018-05-15 15:21:49 +05:30
Manas Solanki
1879f08c7c
Merge branch 'develop' into deferred-account
2018-05-15 15:20:44 +05:30
Shreya
14069c9395
Fix updation of new values
...
While changing the property of an employee, if the new value is selected from the available values in the link field, it worked properly but on creation of a new linked field value, the new value didn't get updated in the child table.
2018-05-15 15:19:24 +05:30
Saurabh
ac2692711b
Merge branch 'master' into develop
2018-05-15 14:59:38 +05:30
Saurabh
78a0be666f
bumped to version 10.1.33
2018-05-15 15:29:36 +06:00
Saurabh
29160441bb
[fix] if UOM and Warehouse link is invalid then set blank values
2018-05-15 14:56:18 +05:30
Manas Solanki
183dc731c2
Update employee_onboarding.py
2018-05-15 14:32:37 +05:30
Zlash65
7f5ebbe494
call post company fixture after setting up company
2018-05-15 13:53:40 +05:30
Zlash65
667f846bdb
bifurcate data into pre & post company fixtures
2018-05-15 13:53:40 +05:30
Zlash65
99e72af089
skip abbr, reload doc, disable edit for root department node'
2018-05-15 13:53:40 +05:30
Manas Solanki
0b7f64924d
booking via the schedular
2018-05-15 13:04:01 +05:30
Manas Solanki
0393848f60
deferred account in the item and company master
2018-05-15 13:04:01 +05:30
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Saurabh
f8c26bb778
bumped to version 10.1.32
2018-05-15 13:28:15 +06:00
Shreya
0db85067b2
Add For Buying and For Selling checkboxes in Currency Exchange
2018-05-15 12:48:10 +05:30
Rohit Waghchaure
4a126947f5
Code cleaup
2018-05-15 12:43:21 +05:30
anoop
6119b7337c
updated get_leave_balance_on to consider encashed leaves by default.
2018-05-15 12:36:43 +05:30
anoop
1e1b7fc74f
13615 - Leave Encashment, creating Additional Salary Component on submit and validations pending
2018-05-15 12:36:43 +05:30
anoop
0780fd1e0b
helper method to get employees assigned salary structure
2018-05-15 12:36:42 +05:30
anoop
161b3b2979
added field Total Leaves Encashed
2018-05-15 12:35:51 +05:30
anoop
067b5574ce
duplicate field is_encash removed, fixed in install fixtures
2018-05-15 12:27:23 +05:30
