Skip to content
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

refactor: shows opening balance from filtered from_date #26877

Merged
merged 6 commits into from
Oct 23, 2021

Conversation

noahjacob
Copy link
Contributor

@noahjacob noahjacob commented Aug 10, 2021

Before

Stock Balance

  • While calculating opening balances for the stock balance report, opening balances were only calculated for stock recos created before the filtered from_date and not the set from_date.
  • If a "Stock Reconciliation" was created for opening stock and the stock balance report was generated with from_date set to the date when the opening stock was created, the "Opening Balance " would not reflect.
Stock Balances

Stock Balance with same date as the Stock Reconciliation

image

Stock Balance with a date after the Stock Reconciliation

image

Stock Ledger

  • If a stock entry was created on filtered from_date at 00:00:00, the entry was considered as the Opening Balance.
Stock Ledgers

Stock Ledger with a date before the Stock Entry

image

Stock Ledger with same date as the Stock Entry created at 00:00:00

image

After

Stock Balance

  • Now also calculates opening balances if the date is the same as from_date in the filters.
Stock Reconciliation

image

image

Stock Ledger

  • Initially only considers sles before the from_date.
  • Now checks if any "Stock Reconciliation" Entry is present with the same filtered from_date. If any, the entry is removed from the Stock Ledger and added as the Opening Balance.

image

no_docs

@stale stale bot added the inactive label Sep 9, 2021
@frappe frappe deleted a comment from stale bot Sep 9, 2021
@ankush ankush removed the inactive label Sep 9, 2021
@stale stale bot added the inactive label Oct 6, 2021
@stale stale bot closed this Oct 9, 2021
@noahjacob noahjacob reopened this Oct 11, 2021
@stale stale bot removed the inactive label Oct 11, 2021
@frappe frappe deleted a comment from stale bot Oct 19, 2021
@frappe frappe deleted a comment from codecov bot Oct 19, 2021
@codecov
Copy link

codecov bot commented Oct 19, 2021

Codecov Report

Merging #26877 (a2aed39) into develop (35fe065) will decrease coverage by 0.07%.
The diff coverage is 42.85%.

@@             Coverage Diff             @@
##           develop   #26877      +/-   ##
===========================================
- Coverage    55.19%   55.12%   -0.08%     
===========================================
  Files         1255     1255              
  Lines        67871    67875       +4     
===========================================
- Hits         37464    37415      -49     
- Misses       30407    30460      +53     
Impacted Files Coverage Δ
erpnext/stock/report/stock_ledger/stock_ledger.py 78.22% <33.33%> (-1.78%) ⬇️
...rpnext/stock/report/stock_balance/stock_balance.py 79.41% <100.00%> (ø)
erpnext/utilities/product.py 15.94% <0.00%> (-34.79%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 69.49% <0.00%> (-23.73%) ⬇️
erpnext/shopping_cart/product_info.py 32.35% <0.00%> (-20.59%) ⬇️
...eport/item_variant_details/item_variant_details.py 84.52% <0.00%> (-3.58%) ⬇️
...e/shopping_cart_settings/shopping_cart_settings.py 66.03% <0.00%> (-1.89%) ⬇️
.../hr/doctype/upload_attendance/upload_attendance.py 45.11% <0.00%> (-1.51%) ⬇️
erpnext/shopping_cart/product_query.py 61.19% <0.00%> (-1.50%) ⬇️
.../report/stock_projected_qty/stock_projected_qty.py 88.31% <0.00%> (-1.30%) ⬇️
... and 15 more

@ankush ankush added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Oct 23, 2021
@ankush ankush merged commit fdaf93f into frappe:develop Oct 23, 2021
mergify bot pushed a commit that referenced this pull request Oct 23, 2021
* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups

(cherry picked from commit fdaf93f)
ankush pushed a commit that referenced this pull request Oct 25, 2021
)

* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups

(cherry picked from commit fdaf93f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
frappe#28072)

* refactor: shows opening balance from filtered from_date

* refactor: opening balance considered from filtered from_date in stock ledger

* fix: check if stock reco is opening and misc cleanups

(cherry picked from commit fdaf93f)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.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
Labels
backport version-13-hotfix squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants