[Fmsystem-commits] [6655] merge 6649:6654 from trunk

[Sigurd Nes]

Revision: 6655
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6655
Author:   sigurdne
Date:     2010-12-08 09:32:55 +0000 (Wed, 08 Dec 2010)
Log Message:
-----------
merge 6649:6654 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
    branches/Version-1_0-branch/rental/inc/model/class.agresso_gl07.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654

Modified: branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php    
2010-12-08 09:12:02 UTC (rev 6654)
+++ branches/Version-1_0-branch/property/inc/class.uigeneric.inc.php    
2010-12-08 09:32:55 UTC (rev 6655)
@@ -310,14 +310,17 @@
                                                $i++;
                                        }
                                }
-                               $code = '';
+
                                if($button_def)
                                {
                                        $code = 'var ' . implode(',', 
$button_def)  . ";\n";
                                        $code .= 'var selectsButtons = [' . 
"\n" . implode(",\n",$code_inner) . "\n];";
                                }
+                               else
+                               {
+                                       $code = 'var selectsButtons = [];';
+                               }
 
-                               $code = 'var selectsButtons = [];';
                                $GLOBALS['phpgw']->js->add_code('', $code);
 
                                if($values_combo_box)

Modified: 
branches/Version-1_0-branch/rental/inc/model/class.agresso_gl07.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/model/class.agresso_gl07.inc.php     
2010-12-08 09:12:02 UTC (rev 6654)
+++ branches/Version-1_0-branch/rental/inc/model/class.agresso_gl07.inc.php     
2010-12-08 09:32:55 UTC (rev 6655)
@@ -266,7 +266,7 @@
        protected function get_formatted_amount($amount)
        {
                $amount = round($amount, 2) * 100;
-               if($amount < 0) // Negative number
+               if($amount <= 0) // Negative number , extra check for '-0' 
which proved to be a problem
                {
                        return '-' . sprintf("%019.19s", abs($amount)); // We 
have to have the sign at the start of the string
                }
@@ -275,4 +275,4 @@
        
 } 
 
-?>
\ No newline at end of file
+?>