From 8cd56fa969592278888f455dcbb74a9ebe57c5be Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 17 Mar 2016 09:54:32 +0200
Subject: [PATCH] Minor fixes

---
 LICENSE                             | 2 +-
 database/seeds/CurrenciesSeeder.php | 1 +
 public/built.js                     | 1 +
 public/js/script.js                 | 1 +
 resources/views/header.blade.php    | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 2f9d7d69a9..9fe9b899c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ open-source software.
 
 1. Redistributions of source code, in whole or part and with or without
 modification requires the express permission of the author and must prominently 
-display "Powered by InvoiceNinja" or the Invoice Ninja logo in verifiable form 
+display "Powered by InvoiceNinja" and the Invoice Ninja logo in verifiable form 
 with hyperlink to said site.
 2. Neither the name nor any trademark of the Author may be used to
 endorse or promote products derived from this software without specific
diff --git a/database/seeds/CurrenciesSeeder.php b/database/seeds/CurrenciesSeeder.php
index c26c5acd12..9a8304b181 100644
--- a/database/seeds/CurrenciesSeeder.php
+++ b/database/seeds/CurrenciesSeeder.php
@@ -54,6 +54,7 @@ class CurrenciesSeeder extends Seeder
             ['name' => 'Croatian Kuna', 'code' => 'HKR', 'symbol' => 'kn', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','],
             ['name' => 'Saudi Riyal', 'code' => 'SAR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Japanese Yen', 'code' => 'JPY', 'symbol' => '¥', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
+            ['name' => 'Maldivian Rufiyaa', 'code' => 'MVR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
         ];
 
         foreach ($currencies as $currency) {
diff --git a/public/built.js b/public/built.js
index 9d1e0d3a3e..cbb00de528 100644
--- a/public/built.js
+++ b/public/built.js
@@ -30487,6 +30487,7 @@ function calculateAmounts(invoice) {
   for (var i=0; i<invoice.invoice_items.length; i++) {
     var item = invoice.invoice_items[i];
     var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
+    lineTotal = roundToTwo(lineTotal);
     if (lineTotal) {
       total += lineTotal;
     }
diff --git a/public/js/script.js b/public/js/script.js
index 67031a5fe3..c447905f81 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -595,6 +595,7 @@ function calculateAmounts(invoice) {
   for (var i=0; i<invoice.invoice_items.length; i++) {
     var item = invoice.invoice_items[i];
     var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
+    lineTotal = roundToTwo(lineTotal);
     if (lineTotal) {
       total += lineTotal;
     }
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 46bebbd687..9cf35b09a7 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -401,6 +401,7 @@
         <span class="icon-bar"></span>
       </button>
       <a href="{{ URL::to(NINJA_WEB_URL) }}" class='navbar-brand' target="_blank">
+        {{-- Per our license, please do not remove or modify this link. --}}
         <img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:20px;width:auto;padding-right:10px"/>
       </a>	    
     </div>