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

chore: patch to set default exchange rate service providers #37439

Conversation

ruthra-kumar
Copy link
Member

part of #37385

mergify bot and others added 30 commits April 25, 2023 15:53
… fixed asset register (backport frappe#35031) (frappe#35036)

fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (frappe#35031)

fix: use filter_by_finance_book instead of only_depreciable_assets
(cherry picked from commit e08d636)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…ate" > "Work Order" (frappe#34726)

* fix: convert asynchronous field update to synchronous

* fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order"
…3350)

* fix: Payment Request flow fixes from Order to Payment Entry

(cherry picked from commit dc17898)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/public/js/controllers/transaction.js

* chore: Update test case

(cherry picked from commit e25b98b)

* chore: More fixes

(cherry picked from commit 31c95de)

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Unable to allocate advance against invoice (frappe#35007)

(cherry picked from commit f7b50f2)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
fix: Payment entry with TDS in bank reco statement (frappe#34961)

(cherry picked from commit ecea9b4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
## [13.49.14](frappe/erpnext@v13.49.13...v13.49.14) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([5680045](frappe@5680045))
* Advance payment against payment terms ([frappe#34872](frappe#34872)) ([d215a85](frappe@d215a85))
* internal Purchase Receipt GL Entries ([b73422e](frappe@b73422e))
* Payment entry with TDS in bank reco statement ([frappe#34961](frappe#34961)) ([5f28b1d](frappe@5f28b1d))
* Payment Request flow fixes from Order to Payment Entry ([frappe#33350](frappe#33350)) ([d5a80b5](frappe@d5a80b5))
* SLA permissions ([frappe#34981](frappe#34981)) ([c1187be](frappe@c1187be))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([d010b04](frappe@d010b04))
* Unable to allocate advance against invoice ([frappe#35007](frappe#35007)) ([61a3121](frappe@61a3121))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [frappe#35031](frappe#35031)) ([frappe#35036](frappe#35036)) ([be2095a](frappe@be2095a))
* validation for internal transfer entry ([91b5a33](frappe@91b5a33))
* value of depreciable assets not updating after manual depr entry [v14] (backport [frappe#35010](frappe#35010)) ([frappe#35029](frappe#35029)) ([9087ac0](frappe@9087ac0))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([frappe#34726](frappe#34726)) ([189b020](frappe@189b020))
…rt-fix

chore: set correct currency symbol in salary register for multi-currency salary slip
(cherry picked from commit 31bda37)
…35032

chore: set correct currency symbol in salary register for multi-currency salary slip (backport frappe#35032)
…fix/pr-35081

fix: Hyperlink in Quality Inspection Summary (backport frappe#35081)
fix: per_billed condition for Payment Entry (frappe#34969)

fix: per_billed condition for Payment Entry (frappe#34969)

(cherry picked from commit d6bc8bb)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit f9f42c7)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fix: Naming series error in Journal Entry template (frappe#35084)

(cherry picked from commit f3b3dab)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 61f0513)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
(cherry picked from commit be15419)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
(cherry picked from commit 88a0aa4)
…adjustment (backport frappe#35117) (frappe#35120)

fix: handle expected_value_after_useful_life properly in asset value adjustment (frappe#35117)

(cherry picked from commit 80230fe)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
…fix/pr-33013

fix: validate repost item valuation against accounts freeze date (backport frappe#33013)
(cherry picked from commit f751727)

# Conflicts:
#	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
…fix/pr-35118

fix: don't allow to make reposting for the closed period (backport frappe#35118)
…emption

fix: allow user to set standard deductions in income tax slab without allowing other exemptions
mergify bot and others added 12 commits September 21, 2023 07:59
…37184)

feat: `Stock Ledger Variance` report (frappe#37165)

* feat: `Stock Ledger Variance` report

* refactor: `get_data()`

(cherry picked from commit acda72d)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
…fix/pr-37069

fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry (backport frappe#37069)
…e#37264) (frappe#37267)

fix: trial balance report freezes when adding filters (frappe#37264)

fix: Only add onclick if correct data is returned

workaround for frappe/datatable#177

(cherry picked from commit 2dc95e5)

Co-authored-by: Ankush Menat <ankush@frappe.io>
fix: change currency exchange API to api.frankfurter.app
…xchange_provider

refactor: multiple service providers for Currency Exchange rates
@mergify
Copy link
Contributor

mergify bot commented Oct 10, 2023

⚠️ The sha of the head commit of this PR conflicts with #37440. Mergify cannot evaluate rules on this PR. ⚠️

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet