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: Comment unusable code and list can not be used as doctype name #37001

Merged
merged 3 commits into from
Sep 13, 2023
Merged

fix: Comment unusable code and list can not be used as doctype name #37001

merged 3 commits into from
Sep 13, 2023

Conversation

viralkansodiya
Copy link
Contributor

@viralkansodiya viralkansodiya commented Sep 9, 2023

#34673
I have removed unusable code

rule_label_map = frappe.db.get_values("Shipping Rule", shipping_rules, "label")

shipping_rules should be a doctype name not list

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Sep 9, 2023
@viralkansodiya viralkansodiya reopened this Sep 9, 2023
@codecov
Copy link

codecov bot commented Sep 11, 2023

Codecov Report

Merging #37001 (314dad7) into develop (ce549ce) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #37001      +/-   ##
===========================================
- Coverage    65.93%   65.93%   -0.01%     
===========================================
  Files          796      796              
  Lines        62753    62752       -1     
===========================================
- Hits         41379    41378       -1     
  Misses       21374    21374              
Files Changed Coverage
erpnext/e_commerce/shopping_cart/cart.py ø

Copy link
Contributor

@s-aga-r s-aga-r left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@viralkansodiya Don't comment out the line, just remove it.

@s-aga-r s-aga-r added backport version-14-hotfix backport to version 14 and removed needs-tests This PR needs automated unit-tests. labels Sep 11, 2023
@viralkansodiya
Copy link
Contributor Author

@s-aga-r I removed that code please marge

@deepeshgarg007 deepeshgarg007 merged commit 96363db into frappe:develop Sep 13, 2023
14 checks passed
mergify bot pushed a commit that referenced this pull request Sep 13, 2023
fix: Remove redundant code
(cherry picked from commit 96363db)
deepeshgarg007 pushed a commit that referenced this pull request Sep 13, 2023
fix: Remove redundant code (#37001)

fix: Remove redundant code
(cherry picked from commit 96363db)

Co-authored-by: ViralKansodiya <141210323+viralkansodiya@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Sep 20, 2023
# [14.40.0](v14.39.0...v14.40.0) (2023-09-20)

### Bug Fixes

* + btn not appearing for delivery note connection (backport [#36980](#36980)) ([#37070](#37070)) ([c2a0c1e](c2a0c1e))
* accepted warehouse and rejected warehouse can't be same (backport [#36973](#36973)) ([#37071](#37071)) ([b56c9b9](b56c9b9))
* after applying coupon code, field in_words not updated ([#37133](#37133)) ([1cb8c64](1cb8c64))
* Apply dimension filter, irrespective of dimesion columns ([9bc44a3](9bc44a3))
* asset validation misfire on debit notes ([b33db6c](b33db6c))
* company wise deferred accounting fields in item ([#37023](#37023)) ([13aaff3](13aaff3))
* Don't allow merging accounts with different currency ([#37074](#37074)) ([c41cb39](c41cb39))
* don't set from warehouse for purchase material request ([#37132](#37132)) ([e62b783](e62b783))
* Duplicate Serial Nos validation in POS ([#36927](#36927)) ([366325c](366325c))
* fetch logic for repay_from_salary in loan_repayment [v14] ([#37135](#37135)) ([480a0ca](480a0ca))
* ignore user permissions for `Source Warehouse` in MR (backport [#37102](#37102)) ([#37110](#37110)) ([727dcc5](727dcc5))
* incorrect stock ledger entries in DN (backport [#36944](#36944)) ([#37066](#37066)) ([699ad80](699ad80))
* packed item using expired price ([413b40f](413b40f))
* POS opening Issue if Product Bundle is available ([#37138](#37138)) ([af05864](af05864))
* precision issue and column name ([#37073](#37073)) ([f2395a9](f2395a9))
* Purchase Receipt Provisional Accounting GL Entries (backport [#37046](#37046)) ([#37068](#37068)) ([8772e40](8772e40))
* Remove redundant code ([#37001](#37001)) ([3ecdf02](3ecdf02))
* **ux:** move `get_route_options_for_new_doc` to `refresh` ([#37092](#37092)) ([a563fed](a563fed))
* validate duplicate serial no in DN ([fffa13f](fffa13f))

### Features

* provision to create RIV from `Stock Ledger Invariant Check` report (backport [#37115](#37115)) ([#37147](#37147)) ([29ff0ce](29ff0ce))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants