Merge branch 'develop' of git://github.com/bSzala/invoiceninja into bSzala-develop

app/Libraries/Utils.php

@@ -344,7 +344,7 @@ class Utils
         $decimal = $currency->decimal_separator;
         $precision = $currency->precision;
         $code = $currency->code;
-        $swapSymbol = false;
+        $swapSymbol = $currency->swap_currency_symbol;
 
         if ($countryId && $currencyId == CURRENCY_EURO) {
             $country = self::getFromCache($countryId, 'countries');

database/migrations/2016_05_16_102925_add_swap_currency_symbol_to_currency.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddSwapCurrencySymbolToCurrency extends Migration
+{
+    const TABLE_NAME = 'currencies';
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(self::TABLE_NAME,function(Blueprint $table){
+            $table->boolean('swap_currency_symbol')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(self::TABLE_NAME,function(Blueprint $table){
+           $table->dropColumn('swap_currency_symbol');
+        });
+    }
+}

database/seeds/CurrenciesSeeder.php

@@ -58,7 +58,7 @@ class CurrenciesSeeder extends Seeder
             ['name' => 'Maldivian Rufiyaa', 'code' => 'MVR', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Costa Rican Colón', 'code' => 'CRC', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'],
             ['name' => 'Pakistani Rupee', 'code' => 'PKR', 'symbol' => 'Rs ', 'precision' => '0', 'thousand_separator' => ',', 'decimal_separator' => '.'],
-            ['name' => 'Polish Zloty', 'code' => 'PLN', 'symbol' => 'zł', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => ','],
+            ['name' => 'Polish Zloty', 'code' => 'PLN', 'symbol' => 'zł', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => ',', 'swap_currency_symbol' => true],
         ];
 
         foreach ($currencies as $currency) {

resources/views/money_script.blade.php

@@ -70,7 +70,7 @@
         var thousand = currency.thousand_separator;
         var decimal = currency.decimal_separator;
         var code = currency.code;
-        var swapSymbol = false;
+        var swapSymbol = currency.swap_currency_symbol;
 
         if (countryId && currencyId == {{ CURRENCY_EURO }}) {
             var country = countryMap[countryId];