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.

Sign up for GitHub

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

Jump to bottom

fix: wrap none type rate under flt #36602

Merged
merged 1 commit into from
Aug 11, 2023
Merged

fix: wrap none type rate under flt #36602

merged 1 commit into from
Aug 11, 2023

Conversation

anandbaburajan
Copy link
Contributor

Wrapping d.rate under flt to avoid TypeError: '<' not supported between instances of 'NoneType' and 'int' error when d.rate is None.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 11, 2023
@anandbaburajan
Copy link
Contributor Author

@mergify backport version-14-hotfix

@mergify
Copy link
Contributor

mergify bot commented Aug 11, 2023 •
edited
Loading

backport version-14-hotfix

✅ Backports have been created

@codecov
Copy link

codecov bot commented Aug 11, 2023

Codecov Report

Merging #36602 (fa50f92) into develop (cd28d15) will increase coverage by 0.05%.
Report is 47 commits behind head on develop.
The diff coverage is 86.25%.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop   #36602      +/-   ##
===========================================
+ Coverage    64.72%   64.78%   +0.05%     
===========================================
  Files          791      792       +1     
  Lines        61633    61779     +146     
===========================================
+ Hits         39891    40021     +130     
- Misses       21742    21758      +16
Files Changed Coverage Δ
erpnext/assets/doctype/asset/asset.py 79.57% <0.00%> (ø)
...eport/fixed_asset_register/fixed_asset_register.py 0.00% <0.00%> (ø)
erpnext/controllers/print_settings.py 57.89% <ø> (ø)
erpnext/hooks.py 100.00% <ø> (ø)
...eport/item_shortage_report/item_shortage_report.py 93.54% <ø> (ø)
erpnext/assets/doctype/asset/depreciation.py 84.09% <92.85%> (ø)
...xt/accounts/doctype/journal_entry/journal_entry.py 69.41% <100.00%> (ø)
...e/payment_reconciliation/payment_reconciliation.py 88.21% <100.00%> (ø)
...preciation_schedule/asset_depreciation_schedule.py 89.84% <100.00%> (ø)
...e/asset_value_adjustment/asset_value_adjustment.py 87.36% <100.00%> (ø)
... and 1 more

... and 6 files with indirect coverage changes

@anandbaburajan anandbaburajan merged commit 627986e into frappe:develop Aug 11, 2023
13 checks passed
mergify bot pushed a commit that referenced this pull request Aug 11, 2023
@anandbaburajan @mergify
fix: wrap none type rate under flt (#36602)
0377b6e 
(cherry picked from commit 627986e)
@mergify mergify bot mentioned this pull request Aug 11, 2023
Merged
anandbaburajan added a commit that referenced this pull request Aug 11, 2023
@mergify @anandbaburajan
fix: wrap none type rate under flt (backport #36602) (#36604)
63c061e 
fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
mergify bot added a commit that referenced this pull request Aug 11, 2023
@mergify
fix: wrap none type rate under flt (backport #36602) (#36604)
aac3d51 
fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 63c061e)
anandbaburajan pushed a commit that referenced this pull request Aug 11, 2023
@mergify
fix: wrap none type rate under flt (backport #36602) (backport #36604) (
e4e1f03 
#36605)

fix: wrap none type rate under flt (backport #36602) (#36604)

fix: wrap none type rate under flt (#36602)

(cherry picked from commit 627986e)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 63c061e)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Aug 11, 2023
@frappe-bot
chore(release): Bumped to Version 14.34.3
ddcf555 
## [14.34.3](v14.34.2...v14.34.3) (2023-08-11)

### Bug Fixes

* wrap none type rate under flt (backport [#36602](#36602)) (backport [#36604](#36604)) ([#36605](#36605)) ([e4e1f03](e4e1f03))
frappe-pr-bot pushed a commit that referenced this pull request Aug 16, 2023
@frappe-bot
chore(release): Bumped to Version 14.35.0
b773465 
# [14.35.0](v14.34.3...v14.35.0) (2023-08-16)

### Bug Fixes

* Allow backdated repayment cancels for term loans ([1377cf4](1377cf4))
* allow negative stock condition for batch item ([#36586](#36586)) ([ee04c6d](ee04c6d))
* AR/AP report based on payment terms ([#36574](#36574)) ([ac0fff7](ac0fff7))
* better remarks on Cr note created by Reconciliation ([5443592](5443592))
* Button Alignment center in hero slider ([#36607](#36607)) ([b131f70](b131f70)), closes [#36561](#36561)
* cr/dr note should be posted for exc gain/loss ([349601b](349601b))
* disallow mulitple SO with same PO No ([b901cfd](b901cfd))
* don't show disabled items in `Item Shortage Report` (backport [#36550](#36550)) ([#36571](#36571)) ([19cfcea](19cfcea))
* fetch `Stock UOM` from Item if not set (backport [#36606](#36606)) ([#36617](#36617)) ([8b13185](8b13185))
* Group Account total not showing in Financial Statements ([2912648](2912648))
* incorrect available qty for backdated stock reco with batch ([#36581](#36581)) ([2800ad3](2800ad3))
* incorrect gain/loss on allocation change on reconciliation tool ([39c439d](39c439d))
* Make default sales update frequency as monthly instead of each transaction ([4ca1f3b](4ca1f3b))
* move company rename to long queue ([8083c0b](8083c0b))
* precision issue while submitting the stock entry ([#36575](#36575)) ([a864e07](a864e07))
* re-add permission that was unintentionally removed ([#36663](#36663)) ([99777d3](99777d3))
* **RFQ:** link to supplier portal ([eb2f68e](eb2f68e))
* standard formula to calculate the "difference" ([#36612](#36612)) ([716d5c0](716d5c0))
* Tax withholding post LDC limit consumed ([#36611](#36611)) ([1deebe8](1deebe8))
* **test:** replace hardcoded reference to adv with dynamic one ([2e6bfa3](2e6bfa3))
* **test:** test case breakage in Github Actions ([3542df7](3542df7))
* unhide `uom` and `stock_uom` fields in print view ([b49309c](b49309c))
* validation blocks partial payment for SO and PO ([ce08f03](ce08f03))
* wrap none type rate under flt (backport [#36602](#36602)) ([#36604](#36604)) ([63c061e](63c061e))
* wrong currency on financial-statement based reports ([#36524](#36524)) ([3044f46](3044f46))

### Features

* add voucher totals in tds payable report ([#36568](#36568)) ([90b390c](90b390c))
* daily asset depreciation method ([#36587](#36587)) ([2918127](2918127))
* Reallow customizing company abbreviation on setup. ([#36646](#36646)) ([ca34b63](ca34b63))

### Performance Improvements

* **invoice:** Faster return amount query (backport [#36556](#36556)) ([#36557](#36557)) ([fe41be9](fe41be9))
@commit-lint commit-lint bot mentioned this pull request Sep 12, 2023
Merged
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@deepeshgarg007 deepeshgarg007 Awaiting requested review from deepeshgarg007 deepeshgarg007 is a code owner

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

Assignees
No one assigned
Labels
needs-tests This PR needs automated unit-tests.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@anandbaburajan