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(RFQ): make email message fully configurable (backport #36353) #36531

Merged
merged 4 commits into from
Aug 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2023

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


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

feat: make RFQ message fully configurable
(cherry picked from commit 21080af)
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Aug 7, 2023
@barredterra barredterra removed their assignment Aug 7, 2023
@barredterra
Copy link
Collaborator

barredterra commented Aug 8, 2023

Depends on frappe/frappe#21976 . ✅
Cherry-pick #36554 into this PR, once merged. ✅

@barredterra barredterra marked this pull request as draft August 8, 2023 14:00
@barredterra barredterra removed the needs-tests This PR needs automated unit-tests. label Aug 8, 2023
@barredterra barredterra marked this pull request as ready for review August 15, 2023 18:11
@s-aga-r
Copy link
Contributor

s-aga-r commented Aug 17, 2023

unrelated failing test

@s-aga-r s-aga-r merged commit c308bd5 into version-14-hotfix Aug 17, 2023
8 of 9 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-36353 branch August 17, 2023 06:42
frappe-pr-bot pushed a commit that referenced this pull request Aug 23, 2023
# [14.36.0](v14.35.2...v14.36.0) (2023-08-23)

### Bug Fixes

* Accounts Payable Currency bug ([94612b9](94612b9))
* Add company filters for account ([e62ffa9](e62ffa9))
* add missing items labels back ([#36737](#36737)) ([3634e80](3634e80))
* broken advance field in Accounts Receivable summary rpt ([296a4d7](296a4d7))
* broken consolidated report due to finance book filter ([5bd2a09](5bd2a09))
* check tax and charges if it is passed ([1f76c69](1f76c69))
* clear dimension defaults after test ([2a467a9](2a467a9))
* dict value for dimension for gl entries defined without the dimension ([11ba553](11ba553))
* dimension name in remark ([01ae513](01ae513))
* divide offsetting amount for multiple dimensions ([1269f2d](1269f2d))
* divide offsetting amount only when account exists ([2c8c3a0](2c8c3a0))
* Document Name link validation in Bank Reconciliation Tool ([#36495](#36495)) ([83cbc1b](83cbc1b)), closes [#35540](#35540) [#35540](#35540)
* don't throw if item does not have default BOM (backport [#36709](#36709)) ([#36734](#36734)) ([e1bd9a7](e1bd9a7))
* duplicate acc dimension in test ([cdb66bf](cdb66bf))
* fetch acc dimensions correctly when fieldname is different from name ([7ac35b4](7ac35b4))
* fetch accounting dimension details specific to company ([c1f1a21](c1f1a21))
* include gain/loss journal in AR/AP reports ([4606079](4606079))
* incorrect gl balance on multi company setup ([cb9aad3](cb9aad3))
* incorrect schedule in asset value adjustment ([#36725](#36725)) ([a0575ed](a0575ed))
* make offsetting entry for acc dimensions ([3198f26](3198f26))
* make offsetting entry for all doctypes ([f578c32](f578c32))
* mode of payment fetched from pos profile company in POS ([c74a414](c74a414))
* not able to make stock entry ([#36759](#36759)) ([873ee38](873ee38))
* Procurement Tracker report not showing material request items ([#36768](#36768)) ([6a9935c](6a9935c))
* reset dimension defaults when company changedin test ([37ef6e9](37ef6e9))
* **RFQ:** make "update password" and "submit quotation" buttons the same size (backport [#36667](#36667)) ([#36686](#36686)) ([36147ec](36147ec))
* timeout error coming during reposting ([#36715](#36715)) ([620b21f](620b21f))
* **ux:** change batch selection message to alert (backport [#36500](#36500)) ([#36697](#36697)) ([0a4947a](0a4947a))
* **UX:** Ignore prepared report ([3e23e1f](3e23e1f))

### Features

* **RFQ:** make email message fully configurable (backport [#36353](#36353)) ([#36531](#36531)) ([c308bd5](c308bd5))
* Tick on checkbox to include draft timesheets (backport [#36577](#36577)) ([#36640](#36640)) ([9668615](9668615))
* utility to repost accounting ledgers without cancellation ([#36469](#36469)) ([f8d6fe6](f8d6fe6))

### Performance Improvements

* pull latest details only for referenced vouchers ([47345e8](47345e8))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.36.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 Feb 5, 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.

3 participants