diff --git a/resources/views/money_script.blade.php b/resources/views/money_script.blade.php
index 4eb87f3bd50a..7cf39bced657 100644
--- a/resources/views/money_script.blade.php
+++ b/resources/views/money_script.blade.php
@@ -161,4 +161,11 @@
         }
     }
 
+    function convertCurrency(amount, fromCurrencyId, toCurrencyId) {
+        return fx.convert(amount, {
+            from: currencyMap[fromCurrencyId].code,
+            to: currencyMap[toCurrencyId].code,
+        });
+    }
+
 </script>
diff --git a/resources/views/reports/d3.blade.php b/resources/views/reports/d3.blade.php
index 16e431a475f9..8a923da25293 100644
--- a/resources/views/reports/d3.blade.php
+++ b/resources/views/reports/d3.blade.php
@@ -1,148 +1,165 @@
 @extends('header')
 
 @section('head')
-  @parent
+    @parent
 
-  @include('money_script')
-  <script src="{{ asset('js/d3.min.js') }}" type="text/javascript"></script>
+    @include('money_script')
+    <script src="{{ asset('js/d3.min.js') }}" type="text/javascript"></script>
 
-  <style type="text/css">
+    <style type="text/css">
 
-  #tooltip {
-    position: absolute;
-    width: 200px;
-    height: auto;
-    padding: 10px 10px 2px 10px;
-    background-color: #F6F6F6;
-    -webkit-border-radius: 10px;
-    -moz-border-radius: 10px;
-    border-radius: 10px;
-    -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
-    -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
-    box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
-  }
+    #tooltip {
+        position: absolute;
+        width: 200px;
+        height: auto;
+        padding: 10px 10px 2px 10px;
+        background-color: #F6F6F6;
+        -webkit-border-radius: 10px;
+        -moz-border-radius: 10px;
+        border-radius: 10px;
+        -webkit-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
+        -moz-box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
+        box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.4);
+    }
 
-  .no-pointer-events {
-    pointer-events: none;
-  }
+    .no-pointer-events {
+        pointer-events: none;
+    }
 
-  </style>
+    </style>
 @stop
 
 @section('content')
-  @parent
-  @include('accounts.nav', ['selected' => ACCOUNT_DATA_VISUALIZATIONS, 'advanced' => true])
+    @parent
+    @include('accounts.nav', ['selected' => ACCOUNT_DATA_VISUALIZATIONS, 'advanced' => true])
 
-  <div id="tooltip" class="hidden">
-    <p>
-      <strong><span id="tooltipTitle"></span></strong>
-      <a class="pull-right" href="#" target="_blank">{{ trans('texts.view') }}</a>
-    </p>
-    <p>{{ trans('texts.total') }} <span id="tooltipTotal" class="pull-right"></span></p>
-    <p>{{ trans('texts.balance') }} <span id="tooltipBalance" class="pull-right"></span></p>
-    <p>{{ trans('texts.age') }} <span id="tooltipAge" class="pull-right"></span></p>
-  </div>
+    <div id="tooltip" class="hidden">
+        <p>
+            <strong><span id="tooltipTitle"></span></strong>
+            <a class="pull-right" href="#" target="_blank">{{ trans('texts.view') }}</a>
+        </p>
+        <p>{{ trans('texts.total') }} <span id="tooltipTotal" class="pull-right"></span></p>
+        <p>{{ trans('texts.balance') }} <span id="tooltipBalance" class="pull-right"></span></p>
+        <p>{{ trans('texts.age') }} <span id="tooltipAge" class="pull-right"></span></p>
+    </div>
 
-  <form class="form-inline" role="form">
-    {{ trans('texts.group_by') }} &nbsp;&nbsp;
-    <select id="groupBySelect" class="form-control" onchange="update()" style="background-color:white !important">
-      <option value="clients">{{ trans('texts.clients') }}</option>
-      <option value="invoices">{{ trans('texts.invoices') }}</option>
-      <option value="products">{{ trans('texts.products') }}</option>
-    </select>
-    &nbsp;&nbsp; <b>{!! $message !!}</b>
-  </form>
+    <form class="form-inline" role="form">
+        {{ trans('texts.group_by') }} &nbsp;&nbsp;
+        <select id="groupBySelect" class="form-control" onchange="update()" style="background-color:white !important">
+            <option value="clients">{{ trans('texts.clients') }}</option>
+            <option value="invoices">{{ trans('texts.invoices') }}</option>
+            <option value="products">{{ trans('texts.products') }}</option>
+        </select>
+        &nbsp;&nbsp; <b>{!! $message !!}</b>
+    </form>
 
-  <p>&nbsp;</p>
+    <p>&nbsp;</p>
 
-  <div class="svg-div"/>
+    <div class="svg-div"/>
 
-  <script type="text/javascript">
+    <script type="text/javascript">
 
     // store data as JSON
     var data = {!! $clients !!};
 
     _.each(data, function(client) {
-      _.each(client.invoices, function(invoice) {
-        invoice.client = client;
-        _.each(invoice.invoice_items, function(invoice_item) {
-          invoice_item.invoice = invoice;
+        _.each(client.invoices, function(invoice) {
+            invoice.client = client;
+            _.each(invoice.invoice_items, function(invoice_item) {
+                invoice_item.invoice = invoice;
+            });
         });
-      });
     });
 
     // pre-process the possible groupings (clients, invoices and products)
     var clients = data.concat();
     var invoices = _.flatten(_.pluck(clients, 'invoices'));
+    var accountCurrencyId = {{ auth()->user()->account->getCurrencyId() }};
 
     // remove quotes and recurring invoices
     invoices = _.filter(invoices, function(invoice) {
-      if (! invoice.is_public) {
-          return false;
-      }
-      return parseInt(invoice.invoice_type_id) == {{ INVOICE_TYPE_STANDARD }} && !invoice.is_recurring;
+        if (! invoice.is_public) {
+            return false;
+        }
+        return parseInt(invoice.invoice_type_id) == {{ INVOICE_TYPE_STANDARD }} && !invoice.is_recurring;
     });
 
     var products = _.flatten(_.pluck(invoices, 'invoice_items'));
     products = d3.nest()
-      .key(function(d) {
-          return d.product_key + (d.invoice.client.currency && d.invoice.client.currency_id != {{ auth()->user()->account->currency_id }} ?
-            ' [' + d.invoice.client.currency.code + ']'
-            : '');
-      })
-      .sortKeys(d3.ascending)
-      .rollup(function(d) { return {
+    .key(function(d) {
+        return d.product_key + (d.invoice.client.currency && d.invoice.client.currency_id != accountCurrencyId ?
+        ' [' + d.invoice.client.currency.code + ']'
+        : '');
+    })
+    .sortKeys(d3.ascending)
+    .rollup(function(d) { return {
         amount: d3.sum(d, function(g) {
-           var lineTotal = g.qty * g.cost;
-           var discount = parseFloat(g.discount);
-           if (discount != 0) {
-               if (parseInt(g.invoice.is_amount_discount)) {
-                   lineTotal -= discount;
-               } else {
-                   lineTotal -= (lineTotal * discount / 100);
-               }
-           }
-           return lineTotal;
+            var lineTotal = g.qty * g.cost;
+            var discount = parseFloat(g.discount);
+            if (discount != 0) {
+                if (parseInt(g.invoice.is_amount_discount)) {
+                    lineTotal -= discount;
+                } else {
+                    lineTotal -= (lineTotal * discount / 100);
+                }
+            }
+            return lineTotal;
         }),
         paid: d3.sum(d, function(g) {
-          return g.invoice && g.invoice.invoice_status_id == {{ INVOICE_STATUS_PAID }} ? (g.qty * g.cost) : 0;
+            return g.invoice && g.invoice.invoice_status_id == {{ INVOICE_STATUS_PAID }} ? (g.qty * g.cost) : 0;
         }),
         age: d3.mean(d, function(g) {
-          return calculateInvoiceAge(g.invoice) || 0;
+            return calculateInvoiceAge(g.invoice) || 0;
         }),
         currency_id: d3.mean(d, function(g) {
-          return g.invoice.client.currency_id;
+            return g.invoice.client.currency_id;
         })
-      }})
-      .entries(products);
+    }})
+    .entries(products);
 
     // create standardized display properties
     _.each(clients, function(client) {
-      client.displayName = getClientDisplayName(client);
-      client.displayTotal = +client.paid_to_date + +client.balance;
-      client.displayBalance = +client.balance;
-      client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2);
-      var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) });
-      client.displayAge = oldestInvoice ? calculateInvoiceAge(oldestInvoice) : -1;
-      client.currencyId = client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
+        console.log('paid: %s, balance: %s', client.paid_to_date, client.balance);
+        var currencyId = client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
+        var total = +client.paid_to_date + +client.balance;
+        if (currencyId != accountCurrencyId) {
+            total = convertCurrency(total, currencyId, accountCurrencyId);
+        }
+        client.displayName = getClientDisplayName(client);
+        client.displayTotal = total;
+        client.displayBalance = +client.balance;
+        client.displayPercent = (+client.paid_to_date / (+client.paid_to_date + +client.balance)).toFixed(2);
+        var oldestInvoice = _.max(client.invoices, function(invoice) { return calculateInvoiceAge(invoice) });
+        client.displayAge = oldestInvoice ? calculateInvoiceAge(oldestInvoice) : -1;
+        client.currencyId = currencyId;
     });
 
     _.each(invoices, function(invoice) {
-      invoice.displayName = invoice.invoice_number;
-      invoice.displayTotal = +invoice.amount;
-      invoice.displayBalance = +invoice.balance;
-      invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount;
-      invoice.displayAge = calculateInvoiceAge(invoice);
-      invoice.currencyId = invoice.client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
+        var currencyId = invoice.client.currency_id || {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY) }};
+        var total = +invoice.amount;
+        if (currencyId != accountCurrencyId) {
+            total = convertCurrency(total, currencyId, accountCurrencyId);
+        }
+        invoice.displayName = invoice.invoice_number;
+        invoice.displayTotal = total;
+        invoice.displayBalance = +invoice.balance;
+        invoice.displayPercent = (+invoice.amount - +invoice.balance) / +invoice.amount;
+        invoice.displayAge = calculateInvoiceAge(invoice);
+        invoice.currencyId = currencyId;
     });
 
     _.each(products, function(product) {
-      product.displayName = product.key;
-      product.displayTotal = product.values.amount;
-      product.displayBalance = product.values.amount - product.values.paid;
-      product.displayPercent = (product.values.paid / product.values.amount).toFixed(2);
-      product.displayAge = product.values.age;
-      product.currencyId = product.values.currency_id;
+        var currencyId = product.values.currency_id;
+        var total = product.values.amount;
+        if (currencyId != accountCurrencyId) {
+            total = convertCurrency(total, currencyId, accountCurrencyId);
+        }
+        product.displayName = product.key;
+        product.displayTotal = total;
+        product.displayBalance = product.values.amount - product.values.paid;
+        product.displayPercent = (product.values.paid / product.values.amount).toFixed(2);
+        product.displayAge = product.values.age;
+        product.currencyId = currencyId;
     });
 
     //console.log(JSON.stringify(clients));
@@ -150,166 +167,166 @@
     //console.log(JSON.stringify(products));
 
     var arc = d3.svg.arc()
-      .innerRadius(function(d) { return d.r })
-      .outerRadius(function(d) { return d.r - 8 })
-      .startAngle(0);
+    .innerRadius(function(d) { return d.r })
+    .outerRadius(function(d) { return d.r - 8 })
+    .startAngle(0);
 
     var fullArc = d3.svg.arc()
-      .innerRadius(function(d) { return d.r - 1 })
-      .outerRadius(function(d) { return d.r - 7 })
-      .startAngle(0)
-      .endAngle(2 * Math.PI);
+    .innerRadius(function(d) { return d.r - 1 })
+    .outerRadius(function(d) { return d.r - 7 })
+    .startAngle(0)
+    .endAngle(2 * Math.PI);
 
     var diameter = 800,
     format = d3.format(",d");
     //color = d3.scale.category10();
 
     var color = d3.scale.linear()
-      .domain([0, 100])
-      .range(["yellow", "red"]);
+    .domain([0, 100])
+    .range(["yellow", "red"]);
 
     var bubble = d3.layout.pack()
-      .sort(null)
-      .size([diameter, diameter])
-      .value(function(d) { return d.displayTotal })
-      .padding(12);
+    .sort(null)
+    .size([diameter, diameter])
+    .value(function(d) { return d.displayTotal })
+    .padding(12);
 
     var svg = d3.select(".svg-div").append("svg")
-      .attr("width", "100%")
-      .attr("height", "1142px")
-      .attr("class", "bubble");
+    .attr("width", "100%")
+    .attr("height", "1142px")
+    .attr("class", "bubble");
 
     svg.append("rect")
-      .attr("stroke-width", "1")
-      .attr("stroke", "rgb(150,150,150)")
-      .attr("width", "99%")
-      .attr("height", "100%")
-      .attr("fill", "white");
+    .attr("stroke-width", "1")
+    .attr("stroke", "rgb(150,150,150)")
+    .attr("width", "99%")
+    .attr("height", "100%")
+    .attr("fill", "white");
 
     function update() {
 
-      var data = {};
-      var groupBy = $('#groupBySelect').val().toLowerCase();
-      data.children = window[groupBy];
+        var data = {};
+        var groupBy = $('#groupBySelect').val().toLowerCase();
+        data.children = window[groupBy];
 
-      data = bubble.nodes(data).filter(function(d) {
-        return !d.children && d.displayTotal && d.displayName;
-      });
+        data = bubble.nodes(data).filter(function(d) {
+            return !d.children && d.displayTotal && d.displayName;
+        });
 
-      var selection = svg.selectAll(".node")
+        var selection = svg.selectAll(".node")
         .data(data, function(d) { return d.displayName; });
 
-      var node = selection.enter().append("g")
+        var node = selection.enter().append("g")
         .attr("class", "node")
         .attr("transform", function(d) { return "translate(" + (d.x+20) + "," + (d.y+20) + ")"; });
 
-      var visibleTooltip = false;
-      node.on("mousemove", function(d) {
-        if (!visibleTooltip || visibleTooltip != d.displayName) {
-          d3.select("#tooltip")
-            .classed("hidden", false)
-            .style("left", (d3.event.offsetX + 40) + "px")
-            .style("top", (d3.event.offsetY + 40) + "px");
-          visibleTooltip = d.displayName;
-          //console.log(d3.event);
-        }
+        var visibleTooltip = false;
+        node.on("mousemove", function(d) {
+            if (!visibleTooltip || visibleTooltip != d.displayName) {
+                d3.select("#tooltip")
+                .classed("hidden", false)
+                .style("left", (d3.event.offsetX + 40) + "px")
+                .style("top", (d3.event.offsetY + 40) + "px");
+                visibleTooltip = d.displayName;
+                //console.log(d3.event);
+            }
 
-        d3.select("#tooltipTitle").text(truncate(d.displayName, 18));
-        d3.select("#tooltipTotal").text(formatMoney(d.displayTotal, d.currencyId));
-        d3.select("#tooltipBalance").text(formatMoney(d.displayBalance, d.currencyId));
-        d3.select("#tooltipAge").text(pluralize('? day', parseInt(Math.max(0, d.displayAge))));
+            d3.select("#tooltipTitle").text(truncate(d.displayName, 18));
+            d3.select("#tooltipTotal").text(formatMoney(d.displayTotal, d.currencyId));
+            d3.select("#tooltipBalance").text(formatMoney(d.displayBalance, d.currencyId));
+            d3.select("#tooltipAge").text(pluralize('? day', parseInt(Math.max(0, d.displayAge))));
 
-        if (groupBy == "products" || !d.public_id) {
-          d3.select("#tooltip a").classed("hidden", true);
-        } else {
-          d3.select("#tooltip a").classed("hidden", false);
-          d3.select("#tooltip a").attr("href", "/" + groupBy + "/" + d.public_id);
-        }
-      });
+            if (groupBy == "products" || !d.public_id) {
+                d3.select("#tooltip a").classed("hidden", true);
+            } else {
+                d3.select("#tooltip a").classed("hidden", false);
+                d3.select("#tooltip a").attr("href", "/" + groupBy + "/" + d.public_id);
+            }
+        });
 
-      svg.on("click", function() {
-        visibleTooltip = false;
-        d3.select("#tooltip")
-          .classed("hidden", true);
-      });
+        svg.on("click", function() {
+            visibleTooltip = false;
+            d3.select("#tooltip")
+            .classed("hidden", true);
+        });
 
-      node.append("circle")
+        node.append("circle")
         .attr("fill", "#ffffff")
         .attr("r", function(d) { return d.r });
 
-      node.append("path")
+        node.append("path")
         .each(function(d) { d.endAngle = 0; })
         .attr("class", "no-pointer-events")
         .attr("class", "animate-fade")
         .attr("d", fullArc)
         .style("fill", function(d, i) { return 'white'; });
 
-      node.append("text")
+        node.append("text")
         .attr("dy", ".3em")
         .attr("class", "no-pointer-events")
         .style("text-anchor", "middle")
         .text(function(d) { return d.displayName; });
 
-      node.append("path")
+        node.append("path")
         .each(function(d) { d.endAngle = 0; })
         .attr("class", "no-pointer-events")
         .attr("class", "animate-grow")
         .attr("d", arc)
         .style("fill", function(d, i) { return '#2e9e49'; });
 
-      d3.selectAll("path.animate-grow")
+        d3.selectAll("path.animate-grow")
         .transition()
         .delay(function(d, i) { return (Math.random() * 500) })
         .duration(1000)
         .call(arcTween, 5);
 
-      d3.selectAll("path.animate-fade")
+        d3.selectAll("path.animate-fade")
         .transition()
         .duration(1000)
         .style("fill", function(d, i) {
-          return 'red';
+            return 'red';
         });
 
-      selection.exit().remove();
+        selection.exit().remove();
     }
 
     update();
 
     // http://bl.ocks.org/mbostock/5100636
     function arcTween(transition, newAngle) {
-      transition.attrTween("d", function(d) {
-        var interpolate = d3.interpolate( 0, 360 * d.displayPercent * Math.PI/180 );
-        return function(t) {
-          d.endAngle = interpolate(t);
-          return arc(d);
-        };
-      });
+        transition.attrTween("d", function(d) {
+            var interpolate = d3.interpolate( 0, 360 * d.displayPercent * Math.PI/180 );
+            return function(t) {
+                d.endAngle = interpolate(t);
+                return arc(d);
+            };
+        });
     }
 
     function calculateInvoiceAge(invoice) {
-      if (!invoice || !invoice.due_date || invoice.invoice_status_id == 5) {
-        return 0;
-      }
-      return moment(invoice.due_date).diff(moment(), 'days') * -1;
+        if (!invoice || !invoice.due_date || invoice.invoice_status_id == 5) {
+            return 0;
+        }
+        return moment(invoice.due_date).diff(moment(), 'days') * -1;
     }
 
     function convertToJsDate(isoDate) {
-      if (!isoDate) {
-        return false;
-      }
-      var t = isoDate.split(/[- :]/);
-      return new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
+        if (!isoDate) {
+            return false;
+        }
+        var t = isoDate.split(/[- :]/);
+        return new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]);
     }
 
 
     function pluralize(string, count) {
-      string = string.replace('?', count);
-      if (count !== 1) {
-        string += 's';
-      }
-      return string;
+        string = string.replace('?', count);
+        if (count !== 1) {
+            string += 's';
+        }
+        return string;
     };
 
-  </script>
+    </script>
 
 @stop