From 30dee8cc7d6049a341299cdaab7321dc93959da5 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 4 Feb 2010 16:40:30 +0000
Subject: [PATCH] resolve conflicts (Add Ledger.Amount.convertMixedAmountTo
 function)

---
 Ledger/Amount.hs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Ledger/Amount.hs b/Ledger/Amount.hs
index fa9140bfd..ea42bee6a 100644
--- a/Ledger/Amount.hs
+++ b/Ledger/Amount.hs
@@ -89,6 +89,12 @@ amountop op a@(Amount _ _ _) (Amount bc bq _) =
 convertAmountTo :: Commodity -> Amount -> Amount
 convertAmountTo c2 (Amount c1 q _) = Amount c2 (q * conversionRate c1 c2) Nothing
 
+-- | Convert mixed amount to the specified commodity
+convertMixedAmountTo :: Commodity -> MixedAmount -> Amount
+convertMixedAmountTo c2 (Mixed ams) = Amount c2 total Nothing
+    where
+    total = sum . map (quantity . convertAmountTo c2) $ ams
+
 -- | Convert an amount to the commodity of its saved price, if any.
 costOfAmount :: Amount -> Amount
 costOfAmount a@(Amount _ _ Nothing) = a
@@ -97,11 +103,6 @@ costOfAmount (Amount _ q (Just price))
     | otherwise = Amount pc (pq*q) Nothing
     where (Amount pc pq _) = head $ amounts price
 
--- | Convert an amount to the specified commodity using the appropriate
--- exchange rate (which is currently always 1).
-convertAmountTo :: Commodity -> Amount -> Amount
-convertAmountTo c2 (Amount c1 q _) = Amount c2 (q * conversionRate c1 c2) Nothing
-
 -- | Get the string representation of an amount, based on its commodity's
 -- display settings.
 showAmount :: Amount -> String