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: batch based item price not working (backport #43172) #43206

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 13, 2024


This is an automatic backport of pull request #43172 done by [Mergify](https://mergify.com).

(cherry picked from commit d9e4ed1)

# Conflicts:
#	erpnext/stock/get_item_details.py
Copy link
Contributor Author

mergify bot commented Sep 13, 2024

Cherry-pick of d9e4ed1 has failed:

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

You are currently cherry-picking commit d9e4ed13cb.
  (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)

Changes to be committed:
	modified:   erpnext/public/js/controllers/transaction.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/get_item_details.py

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

@github-actions github-actions bot added needs-tests This PR needs automated unit-tests. stock labels Sep 13, 2024
@rohitwaghchaure rohitwaghchaure removed needs-tests This PR needs automated unit-tests. conflicts labels Sep 13, 2024
@rohitwaghchaure rohitwaghchaure merged commit 61a42ea into version-15-hotfix Sep 13, 2024
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-43172 branch September 13, 2024 08:00
frappe-pr-bot pushed a commit that referenced this pull request Sep 18, 2024
# [15.36.0](v15.35.2...v15.36.0) (2024-09-18)

### Bug Fixes

* A project without tasks should be able to complete ([dea735d](dea735d))
* add currency in options for rate field in pricing rule ([782c9dd](782c9dd))
* batch based item price not working (backport [#43172](#43172)) ([#43206](#43206)) ([61a42ea](61a42ea))
* cancel cost center allocation and journal entry after test ([3d29007](3d29007))
* consistent behaviour on refresh ([01f3068](01f3068))
* create and link address while creating prospect & customer ([d6a3d0d](d6a3d0d))
* create fiscal year without overlapping existing Fiscal Years ([78768f8](78768f8))
* currency changing while making PO from Supplier Quotation (backport [#43187](#43187)) ([#43205](#43205)) ([ef6b172](ef6b172))
* delete exchange gain loss journal entry while deleting payment entry ([5789de2](5789de2))
* do not auto apply tds in purchase order ([741c18b](741c18b))
* do not check appy_tds in Purchase Order Automatically ([5edebb2](5edebb2))
* do not validate purchase document for composite asset ([c505156](c505156))
* fetch cost center allocation percentage only from the applicable allocation ([0fe901a](0fe901a))
* hide and reset discount control on new POS order ([42494db](42494db))
* **holiday-list:** use same date format for same holiday error message (backport [#42606](#42606)) ([#43222](#43222)) ([f101a1c](f101a1c))
* ignore repost logic on Payment Reconciliation ([d91013a](d91013a))
* invalid gp calculation ([291f0a5](291f0a5))
* item list view in website (backport [#43165](#43165)) ([#43207](#43207)) ([c1a6c56](c1a6c56))
* map rows on journal entry by validating account, party, debit and credit value ([86e1818](86e1818))
* prevent KeyError by checking `report_filter` existence ([984acb6](984acb6))
* revert 091c549 ([2ad6d63](2ad6d63))
* set party_type null when payment_type is changed to Internal Transfer ([45ff8fa](45ff8fa))
* set tax_withholding_category from Purchase Order while creating pi form po ([7027be8](7027be8))
* tds workflow in purchase order ([11359bd](11359bd))
* typo with po_date when creating remarks ([1657a83](1657a83))
* updated filtering in depreciation and balances report ([78c6839](78c6839))
* **ux:** set amount based on account currency while adding new row ([f7cedac](f7cedac))
* **ux:** set amount on foreign currency when foreign currency account is selected on last row of journal ([d8d4cd2](d8d4cd2))

### Features

* API for crm integration ([f060534](f060534))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant