Afshan
|
084de5f0b2
|
fix: handled condition if staffing isn't created (#22992)
* fix: handled condition if staffing isn't created
* style: reformated code for redability
* Update erpnext/hr/doctype/job_offer/job_offer.py
Co-authored-by: Marica <maricadsouza221197@gmail.com>
|
2020-08-17 13:14:09 +05:30 |
|
marination
|
eb241c6c42
|
fix: General Ledger filter validation
|
2020-08-17 12:57:56 +05:30 |
|
Anupam K
|
d7b69e57ae
|
fix: deleting unused Stock Entry Type
|
2020-08-17 11:20:56 +05:30 |
|
Afshan
|
5b45961b9d
|
fix: the JSON object must be str, bytes or bytearray, not "list" (#23047)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2020-08-17 10:51:53 +05:30 |
|
Deepesh Garg
|
e9b229c246
|
Merge pull request #23049 from deepeshgarg007/loan_top_up_fixes
feat: Enhancement in Loan Topups
|
2020-08-16 22:52:48 +05:30 |
|
Deepesh Garg
|
e1e847a3f7
|
feat: Enhancement in Loan Topups
|
2020-08-16 20:57:39 +05:30 |
|
Deepesh Garg
|
a2249e013d
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_top_up_fixes
|
2020-08-15 18:28:04 +05:30 |
|
michellealva
|
e69b2e0da1
|
fix: Remove dependency of Sales Order in Sales Analytics
|
2020-08-15 10:16:26 +05:30 |
|
Shivam Mishra
|
fe57ed629e
|
Merge branch 'develop' into iff-invoicing
|
2020-08-14 14:31:31 +00:00 |
|
Shivam Mishra
|
2da23ba051
|
Merge pull request #22447 from scmmishra/support-search
feat: added search to support page
|
2020-08-14 14:01:17 +00:00 |
|
Shivam Mishra
|
736aee886e
|
Merge branch 'develop' into support-search
|
2020-08-14 13:36:59 +00:00 |
|
Rucha Mahabal
|
5fb0e7184e
|
fix: list index out of range error while setting POS payment mode (#23018)
|
2020-08-14 17:11:39 +05:30 |
|
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 |
|