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

fix: update production plan status #27567

Merged
merged 7 commits into from
Oct 27, 2021

Conversation

18alantom
Copy link
Member

Patch to update Production Plan status which may incorrectly not be set to Completed.

Related to PR #27027

@ankush
Copy link
Member

ankush commented Sep 17, 2021

Maybe we should refactor this a bit and improve the condition:

if all WO are finished => PP is finished 😄

ref: #27480

@codecov
Copy link

codecov bot commented Sep 17, 2021

Codecov Report

Merging #27567 (4d659cb) into develop (a87c201) will increase coverage by 0.03%.
The diff coverage is 25.00%.

@@             Coverage Diff             @@
##           develop   #27567      +/-   ##
===========================================
+ Coverage    55.11%   55.15%   +0.03%     
===========================================
  Files         1255     1255              
  Lines        67889    67892       +3     
===========================================
+ Hits         37420    37446      +26     
+ Misses       30469    30446      -23     
Impacted Files Coverage Δ
...cturing/doctype/production_plan/production_plan.py 69.56% <25.00%> (-0.22%) ⬇️
...vs_serial_no_count/stock_qty_vs_serial_no_count.py 93.10% <0.00%> (-3.45%) ⬇️
erpnext/assets/doctype/asset/depreciation.py 84.55% <0.00%> (-2.95%) ⬇️
...eorder_level/itemwise_recommended_reorder_level.py 92.45% <0.00%> (-1.89%) ⬇️
erpnext/stock/stock_ledger.py 85.17% <0.00%> (-1.09%) ⬇️
erpnext/controllers/stock_controller.py 89.70% <0.00%> (-1.06%) ⬇️
erpnext/stock/reorder_item.py 77.11% <0.00%> (-0.85%) ⬇️
.../report/accounts_receivable/accounts_receivable.py 67.90% <0.00%> (-0.44%) ⬇️
erpnext/hr/utils.py 74.29% <0.00%> (-0.41%) ⬇️
erpnext/stock/get_item_details.py 79.53% <0.00%> (-0.31%) ⬇️
... and 13 more

@18alantom 18alantom added Unrelated Test(s) Failing Use when the failing test has nothing to do with PR. old-backport version-12-hotfix labels Sep 17, 2021
@stale
Copy link

stale bot commented Oct 2, 2021

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Oct 2, 2021
@18alantom 18alantom requested a review from ankush October 4, 2021 17:11
@stale stale bot removed the inactive label Oct 4, 2021
@casakthiveln
Copy link

@rohitwaghchaure sir, please review this and add in the update...I'm facing huge problem with production plan status update

@ankush
Copy link
Member

ankush commented Oct 13, 2021

@18alantom this patch just fixes existing records, future Plan-WO combinations should also follow this right?

@18alantom
Copy link
Member Author

@18alantom this patch just fixes existing records, future Plan-WO combinations should also follow this right?

@ankush I didn't exactly understand what you meant.

Are you saying this check should be rewritten to check WO completions instead?

@18alantom 18alantom force-pushed the fix-update-production-plan-status branch 2 times, most recently from 3a8169a to 5173930 Compare October 14, 2021 10:09
@18alantom 18alantom removed the Unrelated Test(s) Failing Use when the failing test has nothing to do with PR. label Oct 14, 2021
@ankush
Copy link
Member

ankush commented Oct 14, 2021

Are you saying this check should be rewritten to check WO completions instead?

Yes

@casakthiveln
Copy link

@marination pls look into this

@ankush
Copy link
Member

ankush commented Oct 27, 2021

Ignoring raw query for patches. When/if postgres support comes, patch queries will be irrelevant anyway.

@ankush ankush merged commit 05831b1 into frappe:develop Oct 27, 2021
mergify bot pushed a commit that referenced this pull request Oct 27, 2021
fix: update production plan status
(cherry picked from commit 05831b1)

# Conflicts:
#	erpnext/patches.txt
@casakthiveln
Copy link

Thank you everyone

ankush added a commit that referenced this pull request Oct 27, 2021
* fix: update production plan status #27567

fix: update production plan status
(cherry picked from commit 05831b1)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
* fix: update production plan status frappe#27567

fix: update production plan status
(cherry picked from commit 05831b1)

# Conflicts:
#	erpnext/patches.txt

* fix: resolve conflicts

Co-authored-by: Alan <2.alan.tom@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants