-
Notifications
You must be signed in to change notification settings - Fork 7.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Grant commission on certain items only #27467
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #27467 +/- ##
===========================================
+ Coverage 55.22% 55.23% +0.01%
===========================================
Files 1121 1121
Lines 66746 66748 +2
===========================================
+ Hits 36859 36869 +10
+ Misses 29887 29879 -8
|
Oh, I totally missed out on this feature. It's great. One suggestion, the commission rate % may not be the same for all the items in a sales invoice. So defining the commission rate % in item master would be more feature-rich. Then calculate the commission per line item & totaling them would be more extensive. |
@mujeerhashmi currently the commission is defined per Sales Partner. So to make your suggestion work we would need a mapping between Item and Sales Partner. This makes things much more complicated, so I would suggest waiting until someone really has this requirement. |
@marination any other changes required? |
e0f9449
to
879895e
Compare
Additional changes made:
@barredterra Please update documentation if needed. |
@barredterra This looks good, works as expected 👌 |
@marination @deepeshgarg007 @nextchamp-saqib |
Looks good to me! |
Co-authored-by: Sagar Vora <sagar@resilient.tech> (cherry picked from commit e10ab16) # Conflicts: # erpnext/selling/sales_common.js # erpnext/stock/doctype/item/item.json
✅ Backports have been created
|
@@ -1020,6 +1021,12 @@ | |||
"fieldname": "website_image_alt", | |||
"fieldtype": "Data", | |||
"label": "Image Description" | |||
}, | |||
{ | |||
"default": "1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be enabled by default right? @sagarvora @barredterra
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previously, this was applicable for all items. This keeps it backwards compatible. Alternative is patch with default as 0. But I think that there are generally lesser number of items where commission isn't granted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you think it is getting undue attention because the checkbox defaults to 1, we can change the field to be Don't Grant Commission instead.
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
Hey @barredterra , |
* feat: Grant commission on certain items only (backport frappe#27467) * feat: Grant commission on certain items only (backport frappe#27467) * fix * fix
* feat: Grant commission on certain items only (backport frappe#27467) * feat: Grant commission on certain items only (backport frappe#27467) * fix * fix
* feat: Grant commission on certain items only (backport frappe#27467) * feat: Grant commission on certain items only (backport frappe#27467) * fix * fix
Close #27276
Bildschirmaufnahme.2021-09-13.um.23.05.18.mov
Docs:
Thanks to @aisenyi and @sagarvora for their help with this feature.