tMerge branch 'master' of github.com:spesmilo/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 553993b4d01605d5d745e142c64561c31c342051
DIR parent 6b7d5abd29bc726a55f32b7e28cc226704fc1e6f
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 6 Mar 2018 07:14:08 +0100
Merge branch 'master' of github.com:spesmilo/electrum
Diffstat:
M lib/wallet.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -987,11 +987,11 @@ class Abstract_Wallet(PrintError):
def get_full_history(self, domain=None, from_timestamp=None, to_timestamp=None, fx=None, show_addresses=False):
from .util import timestamp_to_datetime, Satoshis, Fiat
out = []
- capital_gains = 0
income = 0
expenditures = 0
- fiat_income = 0
- fiat_expenditures = 0
+ capital_gains = Decimal(0)
+ fiat_income = Decimal(0)
+ fiat_expenditures = Decimal(0)
h = self.get_history(domain)
for tx_hash, height, conf, timestamp, value, balance in h:
if from_timestamp and (timestamp or time.time()) < from_timestamp: