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: Display appropriate message for Payment Term discrepancies in Payment Entry (backport #27749) #27763

Merged
merged 2 commits into from
Oct 5, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2021

This is an automatic backport of pull request #27749 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.io/

…in PE and its Payment References

(cherry picked from commit 9f14695)
@AfshanKhan AfshanKhan merged commit 046ec92 into version-13-hotfix Oct 5, 2021
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-27749 branch October 5, 2021 06:51
fproldan added a commit to fproldan/erpnext that referenced this pull request May 19, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request May 20, 2022
* fix: Account number and name incorrectly import using COA importer

(cherry picked from commit 17a8649)

* frappe#27775

* fix: Totals row incorrect value in GL Entry (frappe#27867)

(cherry picked from commit ebe68c1)

* frappe#27862

* frappe#27915

* fix: Item Variant selection empty popup on website

- pass item_code instead of website item name to fetch attributes

* perf: fetching of account balance in chart of accounts (frappe#27661)

(cherry picked from commit 9051735)

* frappe#27748

* fix: Website Items with same Item name unhandled, thumbnails missing

- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled

(cherry picked from commit 36b519c)

* fix: Pre-commit formatting

(cherry picked from commit 77d4849)

* fix: Delete linked Transaction Deletion Record docs on deleting company

(cherry picked from commit 38c7e42)

* frappe#27763

* frappe#27732

* fix: consolidated report not consider company currency

(cherry picked from commit dc42064)

* fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)'

(cherry picked from commit 19d14da)

* frappe#27804

* fix: consolitated financial statement

* fix: chart of account

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Jun 24, 2022
* fix: Account number and name incorrectly import using COA importer

(cherry picked from commit 17a8649)

* frappe#27775

* fix: Totals row incorrect value in GL Entry (frappe#27867)

(cherry picked from commit ebe68c1)

* frappe#27862

* frappe#27915

* fix: Item Variant selection empty popup on website

- pass item_code instead of website item name to fetch attributes

* perf: fetching of account balance in chart of accounts (frappe#27661)

(cherry picked from commit 9051735)

* frappe#27748

* fix: Website Items with same Item name unhandled, thumbnails missing

- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled

(cherry picked from commit 36b519c)

* fix: Pre-commit formatting

(cherry picked from commit 77d4849)

* fix: Delete linked Transaction Deletion Record docs on deleting company

(cherry picked from commit 38c7e42)

* frappe#27763

* frappe#27732

* fix: consolidated report not consider company currency

(cherry picked from commit dc42064)

* fix: opening balance to calculate 'Unclosed Fiscal Years Profit / Loss (Credit)'

(cherry picked from commit 19d14da)

* frappe#27804

* fix: consolitated financial statement

* fix: chart of account

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: GangaManoj <ganga.manoj98@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 17, 2025
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