rohitwaghchaure
9a0aea8abc
Merge pull request #14046 from shreyashah115/min-fix
...
[Minor] Fixes for Customer DocType
2018-05-15 16:30:46 +05:30
rohitwaghchaure
9cf250ccba
Merge pull request #14047 from rohitwaghchaure/enterprise_s_minor_changes
...
HR Fixes
2018-05-15 16:30:18 +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
Zlash65
44146e0cda
remove duplicates
2018-05-15 15:21:49 +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
292f46fec0
Merge branch 'hotfix'
2018-05-15 14:59:36 +05:30
Saurabh
78a0be666f
bumped to version 10.1.33
2018-05-15 15:29:36 +06:00
Saurabh
ce4f520908
Merge pull request #14042 from saurabh6790/patch_fix_15_05
...
[fix] if UOM and Warehouse link is invalid then set blank values
2018-05-15 14:58:12 +05:30
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
rohitwaghchaure
6cf8a6c5f7
Merge pull request #14040 from Zlash65/fix-dept
...
[Minor] Department tree fixes
2018-05-15 14:05:15 +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
Saurabh
62a59301ef
[fix] resolved merge conflicts
2018-05-15 13:02:40 +05:30
Saurabh
1b18bba04a
Merge branch 'hotfix'
2018-05-15 12:58:15 +05:30
Saurabh
f8c26bb778
bumped to version 10.1.32
2018-05-15 13:28:15 +06:00
rohitwaghchaure
686d5f219e
Merge pull request #14039 from rohitwaghchaure/code_clanup_hr
...
Code cleaup
2018-05-15 12:47:33 +05:30
Rohit Waghchaure
4a126947f5
Code cleaup
2018-05-15 12:43:21 +05:30
Saurabh
ccd0617e19
Merge pull request #14017 from netchampfaris/apply-price-list-hotfix
...
[fix] apply price list
2018-05-15 11:25:08 +05:30
Saurabh
bf10d0f98b
Merge pull request #14031 from shreyashah115/leave-balance
...
[Bug] Clear leave balance in Leave Application
2018-05-15 11:11:49 +05:30
Saurabh
12f708d155
Merge pull request #14035 from saurabh6790/v11_patch_fix
...
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 10:49:53 +05:30
rohitwaghchaure
ae41e5ffae
Merge pull request #14036 from rohitwaghchaure/hcl_leave_application_issue
...
[Fix] Global name 'Approved' is not defined
2018-05-15 10:44:14 +05:30
Rohit Waghchaure
3f02820384
[Fix] Global name 'Approved' is not defined
2018-05-15 10:30:06 +05:30
Saurabh
d217fbaa45
[fix] reload Leave Period and Staffing Plan doctypes
2018-05-15 08:35:25 +05:30
Shreya
dbb67fb4fd
Clear leave balance on changing leave type
2018-05-14 23:02:09 +05:30
Saurabh
ff85c49330
Merge pull request #14030 from saurabh6790/field_fixes
...
remove duplicate fields occurred due to merge conflicts
2018-05-14 22:14:17 +05:30
Saurabh
99400bd958
remove duplicate fields occured due to merge conflicts
2018-05-14 22:11:17 +05:30
rohitwaghchaure
4f2e39cd09
Merge pull request #14028 from rohitwaghchaure/get_approved_leaves_for_period_issue
...
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:39:09 +05:30
Rohit Waghchaure
9ba72f7897
[Fix] get_approved_leaves_for_period module import failed
2018-05-14 21:37:55 +05:30
Saurabh
2ca83d61ea
Resolve merge conflicts from enterprise_sprint branch
2018-05-14 21:15:46 +05:30
Saurabh
8b04d431c0
Merge pull request #13951 from ESS-LLP/jam_enterprise_sprint
...
Attendance Request, Leave Period, Compensatory Leave Request, Leave Policy
2018-05-14 20:57:55 +05:30
Saurabh
1f1dd96f57
Merge branch 'enterprise_sprint' into jam_enterprise_sprint
2018-05-14 20:57:40 +05:30
rohitwaghchaure
451bc04d4c
Merge pull request #13982 from ESS-LLP/tax_exemption
...
Employee Tax Exemption Declaration, Proof Submission
2018-05-14 20:47:51 +05:30
rohitwaghchaure
3f0c735e53
Merge branch 'enterprise_sprint' into tax_exemption
2018-05-14 20:47:35 +05:30
rohitwaghchaure
2b8fc49205
Merge pull request #14027 from saurabh6790/TDS_sprint
...
Tds sprint
2018-05-14 20:43:33 +05:30
Saurabh
4ae089d6a1
Provision to deduct TDS on Advance
2018-05-14 20:42:08 +05:30
Saurabh
f3f438ad18
tds fixed for PI
2018-05-14 20:42:08 +05:30
Saurabh
b9d3385fec
calculate TDS on Sales Invoice Amount
2018-05-14 20:42:08 +05:30
Saurabh
3b4a6be4d0
Supplier Tax Withholding Config
2018-05-14 20:42:08 +05:30
Saurabh
2d8a7ee81f
Bootstrap 'TDS' via fixture
2018-05-14 20:41:38 +05:30
rohitwaghchaure
d9faba962b
Merge pull request #13746 from Zlash65/supplier-group
...
[Enhance] Rename Supplier Type to Supplier Group - tree structure implemented
2018-05-14 20:40:30 +05:30
rohitwaghchaure
7c6bef4905
Merge branch 'enterprise_sprint' into supplier-group
2018-05-14 20:39:01 +05:30
rohitwaghchaure
8137f0402a
Merge pull request #13984 from manassolanki/employee-boarding
...
[feature] added the employee onboarding and separation doctype
2018-05-14 20:35:49 +05:30
