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: show full item name in search widget #28283

Merged
merged 1 commit into from
Nov 9, 2021
Merged

Conversation

ankush
Copy link
Member

@ankush ankush commented Nov 9, 2021

In item auto-complete query, item_name is automatically stripped to 40 characters. item_name is supposed to be human readable description of the item hence this shouldn't be stripped.

Search widget shows full item name now:
Screenshot 2021-11-09 at 10 57 42 AM

Completion in table almost looks the same because of ellipsis class:

telegram-cloud-photo-size-5-6075918035983643300-y

@ankush
Copy link
Member Author

ankush commented Nov 9, 2021

ignoring raw query, not new.

@codecov
Copy link

codecov bot commented Nov 9, 2021

Codecov Report

Merging #28283 (54de14b) into develop (aed45f2) will increase coverage by 0.07%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #28283      +/-   ##
===========================================
+ Coverage    55.18%   55.25%   +0.07%     
===========================================
  Files         1117     1117              
  Lines        66491    66496       +5     
===========================================
+ Hits         36695    36745      +50     
+ Misses       29796    29751      -45     
Impacted Files Coverage Δ
erpnext/controllers/queries.py 60.48% <100.00%> (+0.32%) ⬆️
erpnext/stock/get_item_details.py 79.60% <100.00%> (-0.31%) ⬇️
...e/asset_value_adjustment/asset_value_adjustment.py 87.65% <0.00%> (-3.71%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 92.40% <0.00%> (-2.54%) ⬇️
erpnext/regional/india/utils.py 62.91% <0.00%> (-1.44%) ⬇️
erpnext/accounts/deferred_revenue.py 75.11% <0.00%> (-0.89%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 91.24% <0.00%> (-0.73%) ⬇️
...ice_creation_tool/opening_invoice_creation_tool.py 60.13% <0.00%> (-0.70%) ⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py 77.24% <0.00%> (-0.69%) ⬇️
.../report/accounts_receivable/accounts_receivable.py 67.83% <0.00%> (-0.44%) ⬇️
... and 18 more

@ankush ankush merged commit 34f5283 into frappe:develop Nov 9, 2021
@ankush ankush deleted the item_query branch November 9, 2021 06:25
mergify bot pushed a commit that referenced this pull request Nov 9, 2021
mergify bot pushed a commit that referenced this pull request Nov 9, 2021
ankush added a commit that referenced this pull request Nov 9, 2021
(cherry picked from commit 34f5283)

Co-authored-by: Ankush Menat <ankush@frappe.io>
ankush added a commit that referenced this pull request Nov 9, 2021
(cherry picked from commit 34f5283)

Co-authored-by: Ankush Menat <ankush@frappe.io>
asoral pushed a commit to asoral/erpnext that referenced this pull request Nov 12, 2021
(cherry picked from commit 34f5283)

Co-authored-by: Ankush Menat <ankush@frappe.io>
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
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

1 participant