[Fmsystem-commits] [16996] formatting

[sigurdne]

Revision: 16996
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16996
Author:   sigurdne
Date:     2017-08-22 10:20:52 -0400 (Tue, 22 Aug 2017)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/js/rental/contract.index.js

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2017-08-22 13:21:29 UTC (rev 
16995)
+++ trunk/rental/inc/class.uicontract.inc.php   2017-08-22 14:20:52 UTC (rev 
16996)
@@ -1168,7 +1168,7 @@
                                                ),
                                                array(
                                                        'key' => 'total_price',
-                                                       'label' => 
lang('total_price'),
+                                                       'label' => 
lang('total_price') . " ({$this->currency_suffix})",
                                                        'className' => 'right',
                                                        'sortable' => false,
                                                        'hidden' => false,
@@ -1176,7 +1176,7 @@
                                                ),
                                                array(
                                                        'key' => 'rented_area',
-                                                       'label' => lang('area'),
+                                                       'label' => lang('area') 
. " ({$this->area_suffix})",
                                                        'className' => 'right',
                                                        'sortable' => false,
                                                        'hidden' => false,

Modified: trunk/rental/js/rental/contract.index.js
===================================================================
--- trunk/rental/js/rental/contract.index.js    2017-08-22 13:21:29 UTC (rev 
16995)
+++ trunk/rental/js/rental/contract.index.js    2017-08-22 14:20:52 UTC (rev 
16996)
@@ -7,13 +7,13 @@
 
 function formatterArea(key, oData)
 {
-       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator) + ' ' + area_suffix;
+       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator);
        return amount;
 }
 
 function formatterPrice(key, oData)
 {
-       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator) + ' ' + currency_suffix;
+       var amount = $.number(oData[key], decimalPlaces, decimalSeparator, 
thousandsSeparator);
        return amount;
 }