-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
fix(Payment Entry): splitting outstanding rows as per payment terms #27946
Merged
nextchamp-saqib
merged 18 commits into
frappe:develop
from
Anuja-pawar:payment-terms-split-rows
Nov 2, 2021
Merged
fix(Payment Entry): splitting outstanding rows as per payment terms #27946
nextchamp-saqib
merged 18 commits into
frappe:develop
from
Anuja-pawar:payment-terms-split-rows
Nov 2, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## develop #27946 +/- ##
===========================================
+ Coverage 46.50% 55.37% +8.87%
===========================================
Files 1248 1248
Lines 67681 67685 +4
===========================================
+ Hits 31475 37482 +6007
+ Misses 36206 30203 -6003
|
…awar/erpnext into payment-terms-split-rows
…awar/erpnext into payment-terms-split-rows
nextchamp-saqib
approved these changes
Nov 2, 2021
@Mergifyio backport version-13-hotfix |
✅ Backports have been created
|
@Mergifyio backport version-13-pre-release |
✅ Backports have been created
|
nextchamp-saqib
added a commit
that referenced
this pull request
Nov 3, 2021
…-27946 fix(Payment Entry): splitting outstanding rows as per payment terms (backport #27946)
nextchamp-saqib
added a commit
that referenced
this pull request
Nov 3, 2021
…se/pr-27946 fix(Payment Entry): splitting outstanding rows as per payment terms (backport #27946)
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…rappe#27946) (cherry picked from commit d72709d)
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…-release/pr-27946 fix(Payment Entry): splitting outstanding rows as per payment terms (backport frappe#27946)
fproldan
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Aug 2, 2022
…rappe#27946) (cherry picked from commit d72709d)
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Aug 8, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) # Conflicts: # erpnext/e_commerce/shopping_cart/utils.py * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
github-actions bot
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Aug 8, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) # Conflicts: # erpnext/e_commerce/shopping_cart/utils.py * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Aug 8, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Aug 8, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Sep 7, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com> Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Sep 7, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) # Conflicts: # erpnext/e_commerce/shopping_cart/utils.py * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com> Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com> Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
ValentinaPruvost
pushed a commit
to fproldan/erpnext
that referenced
this pull request
Sep 7, 2022
* feat(manufacturing): add link field for quality inspection template on operation (cherry picked from commit 281a9cc) * feat: provision to have limited parameters for in-process quality inspection (cherry picked from commit 6c45f8b) * refactor: use fetch from property for qi template on job card (cherry picked from commit 467324c) * perf: skip get_pricing_rules if no pricing rule exists (cherry picked from commit a500252) * perf: fetch mode of payments data in single query (cherry picked from commit 7b691be) * perf: get total company stock only for purchase order (cherry picked from commit eb3aae8) * perf: skip insertion of stock ledger entry (cherry picked from commit c7fc609) * fix: undo changes to allow negative stock flag (cherry picked from commit 7bafa11) * fix: sider (cherry picked from commit ac381d2) * fix(Payment Entry): splitting outstanding rows as per payment terms (frappe#27946) (cherry picked from commit d72709d) * fix: TDS round off not working from second transaction (cherry picked from commit ca00672) * fix: TDS round off not working from second transaction (cherry picked from commit b7a0853) * fix: Update receivable/payable account on company change (backport frappe#28057) * fix: changes in schedules gets overwritten on save (cherry picked from commit af1b9e1) * fix: Fetch thumbnail from Item master instead of regenerating (cherry picked from commit 94177c0) * fix: re-run patch - Patch will just fetch thumbnails if website items are created, else it will create new website items (cherry picked from commit 11c498d) * fix: Get db values as dict when checking for thumbnail in existing web item (cherry picked from commit 46a5a83) * fix: Check if thumbnail column exists in case of table trimming (cherry picked from commit ac8014e) * fix: Move thumbnail updation to different patch - Thumbnail updation handled via different patch - create_website_items will only have one purpose - added progress bar to `create_website_items` - code cleanup (cherry picked from commit 348a961) * fix: Serial Nos not set in the row after scanning in popup - Avoid whitspaces while calculating length of serial nos (cherry picked from commit 734b57d) * fix: don't reset rates in Timesheet Detail when Activity Type is cleared (backport frappe#28056) * fix: show full item name in search widget (backport frappe#28283) * fix: Avoid automatic customer creation on website user login (cherry picked from commit d824a90) * fix: Sider, Linter - Moved return to next line - Space between function import and body (cherry picked from commit a780f78) * fix: Merge conflicts with e-commerce * fix: POS Closing Entry without linked invoices (backport frappe#28042) * fix: update production plan status (backport frappe#27567) * refactor: shows opening balance from filtered from_date (backport frappe#26877) * fix: Remove warehouse filter on Batch field for Material Receipt (cherry picked from commit 048210a) * chore: Add comment above fix for future reference (cherry picked from commit 48886ee) * fix: Autoemail report not showing dynamic report filters (cherry picked from commit 3a6894f) * Update employee_leave_balance.py fix: Employee Leave Balance report showing wrong figures (cherry picked from commit 632f784) * fix: Make status filter in Fixed Asset Register optional (backport frappe#28126) * fix: Skip empty rows while updating unsaved BOM cost (backport frappe#28136) * v.13.14.1 * feat: employee initial work history updated when transfer is performed (backport frappe#27768) Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com> Co-authored-by: Diksha Jadhav <dikshajadhav11.dj@gmail.com> Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankushmenat@gmail.com> Co-authored-by: Anuja Pawar <60467153+Anuja-pawar@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com> Co-authored-by: marination <maricadsouza221197@gmail.com> Co-authored-by: Goh Yan Chang <yanchang.goh@itechstro.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue: Some of the Outstanding invoices gets repeated in Payment Entry irrespective of their Payment Terms.
It occurs while fetching Outstanding Invoices (split as per Payment Terms) in the Payment Entry
Steps to replicate:
Enable Allocate Payment Based on Payment Terms in Payment Terms Template
Create 3 or more Purchase Invoices which has Payment Terms
Try fetching these invoices in a Payment Entry, you would get one or two of the invoices multiple times and one of the outstanding invoices would be missing
In following example, Purchase Invoices PINV-21-00035, PINV-21-00036 should be split in 1 row while PINV-21-00034 should be split in 2 rows as per their payment terms. PINV-21-00037, which doesn't have any payment terms should be fetched along with these.
Before
After