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: make projected qty editable after submit (backport #44670) #44671

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Issue:
Unable to set quotation as lost as the projected qty is being updated here
ref: 26916

image

Backport needed for v15


This is an automatic backport of pull request #44670 done by Mergify.

(cherry picked from commit 9ef9ff3)

# Conflicts:
#	erpnext/selling/doctype/quotation_item/quotation_item.json
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 9ef9ff3 has failed:

On branch mergify/bp/version-15-hotfix/pr-44670
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 9ef9ff3de8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/selling/doctype/quotation_item/quotation_item.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@rohitwaghchaure rohitwaghchaure merged commit bd9c84d into version-15-hotfix Dec 12, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-44670 branch December 12, 2024 09:54
frappe-pr-bot pushed a commit that referenced this pull request Dec 12, 2024
## [15.45.5](v15.45.4...v15.45.5) (2024-12-12)

### Bug Fixes

* 'Use Multi-Level BOM' checkbox default value (backport [#44618](#44618)) ([#44620](#44620)) ([5cd3994](5cd3994))
* add docstatus for translation ([47e1ed1](47e1ed1))
* add label strings for translation in pos_controller.js ([ffdd7cf](ffdd7cf))
* add labels for translation in production_analytics.py ([7a6cb0f](7a6cb0f))
* add labels for translation in purchase_order_analysis.py ([f06827c](f06827c))
* add labels for translation in quality_inspection_summary.py ([dd3a747](dd3a747))
* add labels for translation in sales_order_analysis.py ([6980d1e](6980d1e))
* add labels for translation in sales_order.js ([283043e](283043e))
* add string for translation in delayed_tasks_summary.py ([43fc8bf](43fc8bf))
* add strings for translation in pos_item_cart.js ([71d8dfb](71d8dfb))
* add strings for translation in timesheet.js ([#44496](#44496)) ([106671a](106671a))
* add strings for translation payment_terms_status_for_sales_order.py ([773e03f](773e03f))
* add title for translation in  asset.js ([843ff18](843ff18))
* **Bank Transaction:** error in party matching should not block submitting (backport [#44416](#44416)) ([#44574](#44574)) ([31c2b81](31c2b81))
* BOM for variant items (backport [#44580](#44580)) ([#44584](#44584)) ([0b26827](0b26827))
* BOM has not attr required items (backport [#44598](#44598)) ([#44600](#44600)) ([608eaaa](608eaaa))
* BOM name issue (backport [#44575](#44575)) ([#44579](#44579)) ([03ae9e2](03ae9e2))
* BOM name issue (backport [#44586](#44586)) ([#44589](#44589)) ([a5cc307](a5cc307))
* consider zero valuation rate for serial nos (backport [#44532](#44532)) ([#44534](#44534)) ([3771c6e](3771c6e))
* correct color for draft in list view ([cce1cc6](cce1cc6))
* currency symbol in SCO and SCR (backport [#44577](#44577)) ([#44594](#44594)) ([2a17ecd](2a17ecd))
* description overwrite on qty change (backport [#44606](#44606)) ([#44609](#44609)) ([243bf54](243bf54))
* do not allow to inward same serial nos multiple times (backport [#44617](#44617)) ([#44619](#44619)) ([bdb60a5](bdb60a5))
* duplicate required items in the CSV (backport [#44498](#44498)) ([#44507](#44507)) ([539c5b7](539c5b7))
* incorrect stock UOM for BOM raw materials (backport [#44528](#44528)) ([#44531](#44531)) ([f4aa4c9](f4aa4c9))
* inv dimensions fields not creating for standard doctype (backport [#44504](#44504)) ([#44515](#44515)) ([8733eda](8733eda))
* make projected qty editable after submit (backport [#44670](#44670)) ([#44671](#44671)) ([bd9c84d](bd9c84d))
* not able to make PO for returned qty from material request (backport [#44540](#44540)) ([#44547](#44547)) ([5ef063c](5ef063c))
* not able to make sales return entry (backport [#44605](#44605)) ([#44613](#44613)) ([04b07a9](04b07a9))
* precision check for salvage value ([ef5a564](ef5a564))
* prevent set_payment_schedule on return documents ([2560beb](2560beb))
* required by date in the reorder material request (backport [#44497](#44497)) ([#44509](#44509)) ([07df87a](07df87a))
* restrict advance payment entries with flag ([98bd5f2](98bd5f2))
* strings for translation in pos_past_order_summary.js ([ceec5fd](ceec5fd))
* update free item qty while adding same item in seperate row ([f88dc26](f88dc26))
* update qty in SABB if qty changed in stock reco (backport [#44542](#44542)) ([#44546](#44546)) ([99a3271](99a3271))
* validate returned serial nos and batches (backport [#44669](#44669)) ([#44674](#44674)) ([33273fa](33273fa))
* valuation rate for batch in stock reconciliation  (backport [#44657](#44657)) ([#44664](#44664)) ([2466e4c](2466e4c))
* variant qty while making work order from BOM (backport [#44548](#44548)) ([#44551](#44551)) ([63b1df3](63b1df3))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants