fix: don't reset rates in Timesheet Detail when Activity Type is cleared #28056
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
barredterra
requested review from
pateljannat and
ruchamahabal
as code owners
|
@Mergifyio backport version-13-hotfix |
🟠 Waiting for conditions
|
barredterra
changed the title
sagarvora
reviewed
Oct 21, 2021
Co-authored-by: Sagar Vora <sagar@resilient.tech>
barredterra
added
the
squash
sagarvora
reviewed
Oct 21, 2021
sagarvora
approved these changes
Oct 21, 2021
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Oct 21, 2021
…red (#28056) * fix: don't reset rates when activity type is cleared * refactor: suggestions from review Co-authored-by: Sagar Vora <sagar@resilient.tech> * refactor: suggestions from review (fix) * style: fix sider * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech> (cherry picked from commit 2bdaf7b)
sagarvora
pushed a commit
that referenced
this pull request
Oct 22, 2021
…red (#28056) * fix: don't reset rates when activity type is cleared * refactor: suggestions from review Co-authored-by: Sagar Vora <sagar@resilient.tech> * refactor: suggestions from review (fix) * style: fix sider * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech> (cherry picked from commit 2bdaf7b) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
asoral
pushed a commit
to asoral/erpnext
that referenced
this pull request
Nov 12, 2021
…red (frappe#28056) * fix: don't reset rates when activity type is cleared * refactor: suggestions from review Co-authored-by: Sagar Vora <sagar@resilient.tech> * refactor: suggestions from review (fix) * style: fix sider * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech> (cherry picked from commit 2bdaf7b) Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fproldan
added a commit
to fproldan/erpnext
that referenced
this pull request
Aug 2, 2022
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.
Current: Assume a Timesheet Detail with correct billing and costing rate exists. If you now clear the Activity Type, the system will nevertheless try to fetch the Activity Cost, which doesn't exist, and reset the billing and costing rate to 0.00.
New: With this PR, the Activity Cost will only be fetched if any Activity Type is selected. This way we can avoid the useless overwrite of correct data.