Suraj Shetty
|
404afb823f
|
Merge pull request #22723 from Anurag810/HR-fix
|
2020-08-14 16:43:28 +05:30 |
|
Suraj Shetty
|
cab5918244
|
Merge branch 'develop' into HR-fix
|
2020-08-14 16:12:28 +05:30 |
|
Shivam Mishra
|
3daa9de998
|
feat: add email option to field email_id
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
6b68eaad1e
|
feat: use email template for membership acknowledgement
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
b4d3666e69
|
feat: show send acknowledgement button if enabled in settings
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
e4c58c37c8
|
feat: allow member creation via API
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
98bcedd09c
|
feat: create member if not already exists
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
d7139bbd43
|
fix: type error
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
87ddec069e
|
refactor: try block across the function
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
6fbe9b5404
|
fix: remove payload
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
733bde31c9
|
fix: doctype name in patch
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
3a67a78ece
|
feat: add custom buttons for invoice and email
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
8e0314e7f6
|
feat: separate invoice generation and email
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
c8d9e7f77b
|
feat: add message field
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
1678eb9b50
|
feat: drop payload column
|
2020-08-14 13:46:58 +05:30 |
|
Shivam Mishra
|
62e344188a
|
feat: update settings and link filters
|
2020-08-14 13:46:32 +05:30 |
|
Shivam Mishra
|
15340e0c7f
|
feat: send invoice via email
|
2020-08-14 13:46:32 +05:30 |
|
Shivam Mishra
|
811ac909f9
|
feat: add auto invoice creation fields and controllers
|
2020-08-14 13:46:32 +05:30 |
|
Shivam Mishra
|
96dc67c35e
|
feat: add copy button and docs link
|
2020-08-14 13:46:32 +05:30 |
|
Shivam Mishra
|
3a1868dae8
|
feat: add item field
|
2020-08-14 13:46:32 +05:30 |
|
Shivam Mishra
|
a16b24d50a
|
feat: add enable or disable invoicing and print format field
|
2020-08-14 13:46:32 +05:30 |
|
Anurag Mishra
|
759632c025
|
fix: requested Changes
|
2020-08-14 12:26:04 +05:30 |
|
Anurag Mishra
|
6f1579da1f
|
Merge branch 'develop' into shift_management
|
2020-08-14 12:11:41 +05:30 |
|
Deepesh Garg
|
8ca57eb5dd
|
Merge pull request #23022 from marination/loan-amount
fix: Validate or Set Loan Amount first
|
2020-08-13 19:53:09 +05:30 |
|
Afshan
|
d7d92c520e
|
fix: removed code relating to standard working hours (#23009)
|
2020-08-13 19:40:09 +05:30 |
|
Deepesh Garg
|
1151f888ba
|
fix: Set pledge amount before setting loan amount
|
2020-08-13 18:52:23 +05:30 |
|
bhavesh95863
|
a647bef682
|
fix: warehouse mandatory even update stock uncheck (#23023)
|
2020-08-13 17:41:55 +05:30 |
|
Anupam K
|
b3bd780d46
|
fix: codasy dix
|
2020-08-13 17:07:15 +05:30 |
|
Anurag Mishra
|
f096ba4998
|
patch: Old Shift Assignment
|
2020-08-13 14:18:48 +05:30 |
|
Anurag Mishra
|
c2710e05ce
|
fix: showing on_going shift on calendar
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
74f0a1ab7c
|
fix: changes Requested
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
00a8081aba
|
Fix: button label
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
dcf598dc2d
|
Fix: requested Changes
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
d5c921e358
|
Fix: Requested Changes
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
b48110caf1
|
Update erpnext/hr/doctype/shift_assignment/shift_assignment.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
3aa1101d5e
|
fix: requested changes
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
17e6d0918b
|
feat: Employee level Shift Request Approver
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
43ba7dd4c8
|
feat: don't allow to request for default shift
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
feef4a6c1e
|
test: employee checkin
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
b3e00de0ae
|
refactor: Shift Request
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
a6ec7e31d2
|
test: shift assignment
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
dd46d19765
|
feat: map event calendar to show ongoing shift assignment and fixed period assigment
|
2020-08-13 14:17:47 +05:30 |
|
Anurag Mishra
|
afa98bb39b
|
feat: Assign shift for period or create ongoing assignment
|
2020-08-13 14:17:47 +05:30 |
|
Abhishek Balam
|
a25760046f
|
fix: condition syntax validation readded, fetch item details if condition not met ignoring rule
|
2020-08-13 13:22:58 +05:30 |
|
marination
|
8264fcd0a5
|
fix: Only validate repayment if term loan
|
2020-08-13 12:47:34 +05:30 |
|
Abhishek Balam
|
487aa30aef
|
fix: eval fail message fix
|
2020-08-13 12:19:34 +05:30 |
|
marination
|
6988fbb82d
|
fix: Validate or Set Loan Amount first
|
2020-08-13 12:17:13 +05:30 |
|
Deepesh Garg
|
ca898c6da3
|
fix: Condition fix
|
2020-08-13 11:54:18 +05:30 |
|
Deepesh Garg
|
cbde04d3da
|
fix: Pass doc instead of args
|
2020-08-13 11:47:41 +05:30 |
|
prssanna
|
bfb219612e
|
feat: enable total row in Gross Profit Report
|
2020-08-13 11:34:05 +05:30 |
|