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: asset patch failure due to missing shift_based column #38776

Merged
merged 2 commits into from
Dec 15, 2023
Merged

fix: asset patch failure due to missing shift_based column #38776

merged 2 commits into from
Dec 15, 2023

Conversation

anandbaburajan
Copy link
Contributor

Fixes #38765.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 15, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 15, 2023

Codecov Report

Merging #38776 (c558332) into develop (6851c50) will increase coverage by 0.00%.
Report is 14 commits behind head on develop.
The diff coverage is 100.00%.

Additional details and impacted files 
@@           Coverage Diff            @@
##           develop   #38776   +/-   ##
========================================
  Coverage    60.07%   60.08%           
========================================
  Files          759      759           
  Lines        69547    69556    +9     
========================================
+ Hits         41780    41790   +10     
+ Misses       27767    27766    -1
Files Coverage Δ
...e/payment_reconciliation/payment_reconciliation.py 86.14% <100.00%> (+0.25%) ⬆️
erpnext/crm/doctype/lead/lead.py 57.65% <100.00%> (+0.45%) ⬆️

... and 5 files with indirect coverage changes

@anandbaburajan anandbaburajan merged commit 1704180 into frappe:develop Dec 15, 2023
14 checks passed
mergify bot pushed a commit that referenced this pull request Dec 15, 2023
@anandbaburajan @mergify
fix: asset patch failure due to missing shift_based column (#38776)
727bf68 
* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype

(cherry picked from commit 1704180)
@mergify mergify bot mentioned this pull request Dec 15, 2023
Merged
anandbaburajan added a commit that referenced this pull request Dec 15, 2023
@mergify @anandbaburajan
fix: asset patch failure due to missing shift_based column (backport #…
6e92c78 
…38776) (#38777)

fix: asset patch failure due to missing shift_based column (#38776)

* fix: add missing daily_prorata_based in get_asset_finance_books_map

* fix: reload Asset Finance Book doctype

(cherry picked from commit 1704180)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Dec 20, 2023
@frappe-bot
chore(release): Bumped to Version 15.7.0
2a5164d 
# [15.7.0](v15.6.1...v15.7.0) (2023-12-20)

### Bug Fixes

* asset patch failure due to missing shift_based column (backport [#38776](#38776)) ([#38777](#38777)) ([6e92c78](6e92c78))
* barcode scanning for the stock entry (backport [#38716](#38716)) ([#38718](#38718)) ([1dcb065](1dcb065))
* **demo:** Demo setup for canadian COA ([7d84441](7d84441))
* fetch exc rate of multi currency journals ([f55b561](f55b561))
* fetch item_tax_template values if fields with fetch_from exisit ([fba28d6](fba28d6))
* groups for current accounts in German CoAs ([58de991](58de991))
* homepage not working (backport [#38755](#38755)) ([#38756](#38756)) ([ad3a5b5](ad3a5b5))
* if not budget then don't validate (backport [#38861](#38861)) ([#38865](#38865)) ([5ec75fb](5ec75fb))
* incoming rate for sales return with Moving Average valuation method (backport [#38849](#38849)) (backport [#38863](#38863)) ([#38866](#38866)) ([d65be69](d65be69))
* incorrect available qty for backdated stock reco with batch (backport [#37858](#37858)) ([#38811](#38811)) ([18bd330](18bd330))
* Init internal child table values ([7802f6c](7802f6c))
* item variant with manufacturer (backport [#38845](#38845)) (backport [#38847](#38847)) ([#38851](#38851)) ([7320440](7320440))
* not able to cancel SCR with Batch (backport [#38817](#38817)) (backport [#38821](#38821)) ([#38829](#38829)) ([4bd1a5f](4bd1a5f))
* not able to make inter-company po from so (backport [#38826](#38826)) (backport [#38828](#38828)) ([#38833](#38833)) ([02ceee6](02ceee6))
* on closed unreserved the production plan qty (backport [#38848](#38848)) (backport [#38859](#38859)) ([#38862](#38862)) ([cbbc6af](cbbc6af))
* **pe:** show split alert only on splitting ([77dba48](77dba48))
* Reset SLA on issue doesn't work (backport [#38789](#38789)) ([#38791](#38791)) ([2045306](2045306))
* serial and batch bundle return not working (backport [#38754](#38754)) ([#38806](#38806)) ([8990c48](8990c48))
* set `fg-itm-qty` based on `qty` instead of the other way round in Subcontracting POs (backport [#38842](#38842)) ([#38855](#38855)) ([4e27174](4e27174))
* show bill_date and bill_no in Purchase Register ([4ed86db](4ed86db))
* skip jvs against bank accounts ([bf8a2d0](bf8a2d0))
* supplier removed on selection of item (backport [#38712](#38712)) ([#38713](#38713)) ([feb452b](feb452b))
* timezone aware SLA banner (backport [#38745](#38745)) ([#38747](#38747)) ([a551660](a551660))
* **ux:** don't override Item Name and Description in MR (backport [#38720](#38720)) ([#38763](#38763)) ([703be50](703be50))
* validation error on reconciling PE to Journals as Invoice ([aa5e16e](aa5e16e))
* wrong currency in Stock Balance report (backport [#38778](#38778)) ([#38780](#38780)) ([7fc8150](7fc8150))
* wrong paid and cn amount on pos invoice ([cff9e47](cff9e47))

### Features

* RFQ print preview ([f30bede](f30bede))
* set lead name from email ([f770621](f770621))

### Performance Improvements

* index `return_against` on delivery note (backport [#38827](#38827)) ([#38832](#38832)) ([6ad75e7](6ad75e7))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 30, 2023
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

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

Successfully merging this pull request may close these issues.

Migration v14 to v15 error due missing shift_based column not found
1 participant
@anandbaburajan