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

feat: add Supplier Delivery Note field in SCR (backport #38127) #38155

Merged
merged 2 commits into from
Nov 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2023

This is an automatic backport of pull request #38127 done by Mergify.
Cherry-pick of da80e4d has failed:

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

You are currently cherry-picking commit da80e4dbce.
  (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/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit da80e4d)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@s-aga-r s-aga-r removed the conflicts label Nov 18, 2023
@s-aga-r s-aga-r merged commit 8d4a19c into version-14-hotfix Nov 18, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-38127 branch November 18, 2023 13:24
frappe-pr-bot pushed a commit that referenced this pull request Nov 22, 2023
# [14.49.0](v14.48.1...v14.49.0) (2023-11-22)

### Bug Fixes

* add revaluation journal filter in Payable report ([d0698b3](d0698b3))
* attributes were mandatory for manufacturers ([430980a](430980a))
* duplicate field in `Closing Stock Balance` ([#38105](#38105)) ([1f16c47](1f16c47))
* incorrect incoming rate for serial and batch items in standalone debit note ([#38121](#38121)) ([9a34518](9a34518))
* pass check permission in render_address ([1ccd5e4](1ccd5e4))
* payment entry rounding error ([49735bc](49735bc))
* remove ESS role when not mapped to employee (backport [#37867](#37867)) ([#38132](#38132)) ([bc01007](bc01007))
* round `unreconciled_amount` before asserting ([392ee2e](392ee2e))
* set asset's valuation_rate according to asset quantity (backport [#38254](#38254)) ([#38255](#38255)) ([00def82](00def82))
* set default asset quantity as 1 [v14] ([#38224](#38224)) ([3daf6f8](3daf6f8))
* show party values when naming by is not naming series ([dd76695](dd76695))
* Supplier Quotation fields ([#37963](#37963)) ([883eaee](883eaee))
* test case for rounded total with cash disc ([9b5185a](9b5185a))
* **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](#38134)) ([#38152](#38152)) ([c7c751e](c7c751e))
* **Timesheet:** warn user if billing hours > actual hours instead of resetting  (backport [#38239](#38239)) ([#38240](#38240)) ([e08f114](e08f114))
* update modified timestamp ([2849e0d](2849e0d))
* valuation rate in report Item Prices ([#38161](#38161)) ([a70696e](a70696e))
* wrong round off and rounded total ([296433a](296433a))

### Features

* add `Supplier Delivery Note` field in SCR (backport [#38127](#38127)) ([#38155](#38155)) ([8d4a19c](8d4a19c))
* Add accounting dimensions to Supplier Quotation ([51e33e1](51e33e1))
* virtual parent doctype ([8dbf2ce](8dbf2ce))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.49.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 6, 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.

2 participants