Skip to content

Fix a typing issue with the currency sub field #15

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix a typing issue with the currency sub field #15

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62427db
fix a type error
rtpg Jun 6, 2016
6af1453
make sure to consistently set the _currency subfield as a string-like
rtpg Jun 6, 2016
efbecc2
revert previous type change
rtpg Jun 6, 2016
10ec0b3
Merge pull request #2 from poswald/master
rtpg Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion money/contrib/django/models/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def __set__(self, obj, value):
if value is None: # Money(0) is False
self._set_values(obj, None, '')
elif isinstance(value, Money):
self._set_values(obj, value.amount, value.currency)
self._set_values(obj, value.amount, value.currency.code)
elif isinstance(value, Decimal):
_, currency = self._get_values(obj) # use what is currently set
self._set_values(obj, value, currency)
Expand Down