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: use max function to get default company address (backport #34116) #34452

Merged
merged 2 commits into from Mar 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2023

This is an automatic backport of pull request #34116 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

@ankush ankush merged commit ba2fd71 into version-14-hotfix Mar 15, 2023
9 of 10 checks passed
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-34116 branch March 15, 2023 05:08
frappe-pr-bot pushed a commit that referenced this pull request Mar 21, 2023
# [14.19.0](v14.18.3...v14.19.0) (2023-03-21)

### Bug Fixes

* **client:** Amount calculation for 0 qty debit notes ([#34455](#34455)) ([d24f4d2](d24f4d2))
* difference amount calculation for company currency accounts ([9ab7bff](9ab7bff))
* don't map item row having `0` qty ([7611a49](7611a49))
* E-commerce issue with Item Variants ([53c3fff](53c3fff))
* german translations ([#34312](#34312)) ([dd0c833](dd0c833))
* hide `+` button based on `Blanket Order Type` ([daa1bb8](daa1bb8))
* incorrect depr schedules after asset repair [v14] ([#34527](#34527)) ([560df63](560df63)), closes [#30838](#30838)
* Multiple accounting dimension filtering in AR/AP reports ([#34464](#34464)) ([f146479](f146479))
* Overallocation of 'qty' from Cr Notes to Parent Invoice ([848e56b](848e56b))
* patch depends on Currency Exchange Settings ([#34494](#34494)) ([4acde44](4acde44))
* POS not picking up pos profile company address instead fetch any random company address ([#34521](#34521)) ([01f4cc7](01f4cc7))
* Update account number from parent company ([#34474](#34474)) ([55d002c](55d002c))
* use max function to get default company address (backport [#34116](#34116)) ([#34452](#34452)) ([ba2fd71](ba2fd71))

### Features

* add field `Over Order Allowance (%)` in `Buying Settings` ([da915f1](da915f1))
* add field `Over Order Allowance (%)` in `Selling Settings` ([46b5ba9](46b5ba9))
* bank reconciliation and plaid changes ([#33986](#33986)) ([9b608ea](9b608ea))
* consider `over_order_allowance` while validating order qty ([932639b](932639b))
* consider `over_order_allowance` while validating sales order qty ([09b577a](09b577a))
* Support for Alternative Items in Quotation ([#33874](#33874)) ([9f7da21](9f7da21))

### Performance Improvements

* index against_sales_invoice field on DN items (backport [#34509](#34509)) ([#34510](#34510)) ([baa789b](baa789b))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.19.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

babureddyks pushed a commit to babureddyks/Check_Engine that referenced this pull request Mar 28, 2023
# [14.19.0](frappe/erpnext@v14.18.3...v14.19.0) (2023-03-21)

### Bug Fixes

* **client:** Amount calculation for 0 qty debit notes ([#34455](frappe/erpnext#34455)) ([d24f4d2](frappe/erpnext@d24f4d2))
* difference amount calculation for company currency accounts ([9ab7bff](frappe/erpnext@9ab7bff))
* don't map item row having `0` qty ([7611a49](frappe/erpnext@7611a49))
* E-commerce issue with Item Variants ([53c3fff](frappe/erpnext@53c3fff))
* german translations ([#34312](frappe/erpnext#34312)) ([dd0c833](frappe/erpnext@dd0c833))
* hide `+` button based on `Blanket Order Type` ([daa1bb8](frappe/erpnext@daa1bb8))
* incorrect depr schedules after asset repair [v14] ([#34527](frappe/erpnext#34527)) ([560df63](frappe/erpnext@560df63)), closes [#30838](frappe/erpnext#30838)
* Multiple accounting dimension filtering in AR/AP reports ([#34464](frappe/erpnext#34464)) ([f146479](frappe/erpnext@f146479))
* Overallocation of 'qty' from Cr Notes to Parent Invoice ([848e56b](frappe/erpnext@848e56b))
* patch depends on Currency Exchange Settings ([#34494](frappe/erpnext#34494)) ([4acde44](frappe/erpnext@4acde44))
* POS not picking up pos profile company address instead fetch any random company address ([#34521](frappe/erpnext#34521)) ([01f4cc7](frappe/erpnext@01f4cc7))
* Update account number from parent company ([#34474](frappe/erpnext#34474)) ([55d002c](frappe/erpnext@55d002c))
* use max function to get default company address (backport [#34116](frappe/erpnext#34116)) ([#34452](frappe/erpnext#34452)) ([ba2fd71](frappe/erpnext@ba2fd71))

### Features

* add field `Over Order Allowance (%)` in `Buying Settings` ([da915f1](frappe/erpnext@da915f1))
* add field `Over Order Allowance (%)` in `Selling Settings` ([46b5ba9](frappe/erpnext@46b5ba9))
* bank reconciliation and plaid changes ([#33986](frappe/erpnext#33986)) ([9b608ea](frappe/erpnext@9b608ea))
* consider `over_order_allowance` while validating order qty ([932639b](frappe/erpnext@932639b))
* consider `over_order_allowance` while validating sales order qty ([09b577a](frappe/erpnext@09b577a))
* Support for Alternative Items in Quotation ([#33874](frappe/erpnext#33874)) ([9f7da21](frappe/erpnext@9f7da21))

### Performance Improvements

* index against_sales_invoice field on DN items (backport [#34509](frappe/erpnext#34509)) ([#34510](frappe/erpnext#34510)) ([baa789b](frappe/erpnext@baa789b))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 7, 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.

None yet

3 participants