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: don't make naming series mandatory for items #28394

Merged
merged 2 commits into from
Nov 15, 2021

Conversation

ankush
Copy link
Member

@ankush ankush commented Nov 15, 2021

To reproduce:

  • Change item creation to naming series from stock settings
  • create a template
  • try to create variant
  • "series" is mandatory will pop up.
  1. Item variants are an exception, hence this needs to be checked conditionally.
  2. There's no need to even check this. document naming checks it already.
  • Made "naming_series" non-mandatory field upon enabling item naming by "naming series"
  • patch to toggle this for everyone using naming series

Item variants are an exception, hence this needs to be checked
conditionally.
@codecov
Copy link

codecov bot commented Nov 15, 2021

Codecov Report

Merging #28394 (89f54e4) into develop (c0f06bc) will decrease coverage by 0.08%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #28394      +/-   ##
===========================================
- Coverage    55.24%   55.15%   -0.09%     
===========================================
  Files         1119     1119              
  Lines        66553    66553              
===========================================
- Hits         36768    36709      -59     
- Misses       29785    29844      +59     
Impacted Files Coverage Δ
...ext/stock/doctype/stock_settings/stock_settings.py 87.75% <ø> (ø)
...pnext/setup/doctype/naming_series/naming_series.py 36.43% <100.00%> (ø)
erpnext/utilities/product.py 14.70% <0.00%> (-35.30%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 68.96% <0.00%> (-24.14%) ⬇️
erpnext/shopping_cart/product_info.py 30.30% <0.00%> (-21.22%) ⬇️
...eport/item_variant_details/item_variant_details.py 84.33% <0.00%> (-3.62%) ⬇️
erpnext/assets/doctype/asset/depreciation.py 84.44% <0.00%> (-2.97%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 90.51% <0.00%> (-2.92%) ⬇️
...value/warehouse_wise_item_balance_age_and_value.py 92.40% <0.00%> (-2.54%) ⬇️
...e/shopping_cart_settings/shopping_cart_settings.py 65.38% <0.00%> (-1.93%) ⬇️
... and 21 more

@ankush ankush merged commit 54184e5 into frappe:develop Nov 15, 2021
@ankush ankush deleted the naming_series_variant_item branch November 15, 2021 12:48
ankush added a commit that referenced this pull request Nov 15, 2021
…28396)

* fix: don't make naming series mandatory for items

Item variants are an exception, hence this needs to be checked
conditionally.

(cherry picked from commit 7fcaeca)

* fix: patch for naming series property setter

(cherry picked from commit 54184e5)

# Conflicts:
#	erpnext/patches.txt

* fix: conflicts

Co-authored-by: Ankush Menat <ankush@frappe.io>
fproldan added a commit to fproldan/erpnext that referenced this pull request Aug 29, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
github-actions bot pushed a commit to fproldan/erpnext that referenced this pull request Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Sep 21, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 18, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 18, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 15, 2022
* perf(minor): general ledger report (backport frappe#27987)

* fix: replaced "=" with "in" for multiple statuses in query (backport frappe#28193)

* 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 make naming series mandatory for items (backport frappe#28394)

* fix: Work order creation from sales order (backport frappe#28388)

* fix: currency wise pricing rule not working

(cherry picked from commit 43aeb54)

* fix: remove item-item group name validation (backport frappe#28392)

* fix: Default party account getting overriden in invoices

(cherry picked from commit 8864857)

* fix: Remove warehouse filter on Batch field for Material Receipt

(cherry picked from commit 048210a)

* fix: Dispatch address details not displayed in v13

* fix: Unable to edit supplier scorecard criteria name once created (backport frappe#28348)

* fix: performance to submit the JV

(cherry picked from commit 7472760)

* fix: Pricing Rule not created against the Promotional Scheme

(cherry picked from commit d82910b)

* fix: sum of components in salary register (backport frappe#28237)

* fix: auto update price list rate

* fix: Pull Items that are in JC in Stock Entry against JC

- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks

Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 3da0302)

* test: Stock Entry from JC correctness (items mapping and qty)

(cherry picked from commit 0aa237f)

* fix: Partial Trabsfers against JC

- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup

(cherry picked from commit e8d0c25)

* fix: (travis) Production Plan Summary Report breaks if no WO

- `get_cached_value` throws a DoesNotExistError if non-existent value, used `get_value` instead
- accomodate production plan items that dont have WO/PO against them as well (blank values)
- added some None value handling to avoid AttributeError

(cherry picked from commit 1eb3ca2)

* fix: Server side test

- make `tests_that_skip_setup` a tuple (added comma)
- remove manual teardown in `test_job_card_material_transfer_correctness` to avoid premature committing
- transfer_material_against = "Job Card" while making BOM with mulitple operations

(cherry picked from commit bb561ba)

* fix: `test_job_card_partial_material_transfer` test

- Use a specific BOM for JC tests
- Utility to create said BOM
- Sider: unused variable

(cherry picked from commit a5f8274)

Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.com>

Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Subin Tom <subintom2@gmail.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