Merge pull request #541 from ZvonokComGroup/opt-money-operations

Optimize money operations on moneys with the same currencies
django-money · Feb 14, 2020 · eaa8df7 · eaa8df7
2 parents e46109f + afba18e
commit eaa8df7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/djmoney/money.py b/djmoney/money.py
@@ -90,7 +90,7 @@ def maybe_convert(value, currency):
     """
     Converts other Money instances to the local currency if `AUTO_CONVERT_MONEY` is set to True.
     """
-    if getattr(settings, "AUTO_CONVERT_MONEY", False):
+    if getattr(settings, "AUTO_CONVERT_MONEY", False) and value.currency != currency:
         from .contrib.exchange.models import convert_money
 
         return convert_money(value, currency)

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -5,6 +5,11 @@ Changelog
 
 `1.1`_ - TBA
 
+Fixed
+~~~~~
+
+- Optimize money operations on monies with the same currencies. (`horpto`)
+
 Added
 ~~~~~