[Fmsystem-commits] [14745] Merge 14742:14744 from trunk

[Sigurd Nes]

Revision: 14745
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14745
Author:   sigurdne
Date:     2016-02-16 12:51:25 +0000 (Tue, 16 Feb 2016)
Log Message:
-----------
Merge 14742:14744 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.sotts.inc.php
    branches/Version-2_0-branch/property/js/portico/invoice.index.js

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


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744

Modified: branches/Version-2_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sotts.inc.php        
2016-02-16 12:45:20 UTC (rev 14744)
+++ branches/Version-2_0-branch/property/inc/class.sotts.inc.php        
2016-02-16 12:51:25 UTC (rev 14745)
@@ -1660,7 +1660,7 @@
 
                        $value_set = array();
 
-                       if (isset($ticket['extra']) && 
is_array($ticket['extra']))
+                       if (isset($ticket['extra']) && 
is_array($ticket['extra']) && $ticket['extra'])
                        {
                                foreach ($ticket['extra'] as $column => $value)
                                {

Modified: branches/Version-2_0-branch/property/js/portico/invoice.index.js
===================================================================
--- branches/Version-2_0-branch/property/js/portico/invoice.index.js    
2016-02-16 12:45:20 UTC (rev 14744)
+++ branches/Version-2_0-branch/property/js/portico/invoice.index.js    
2016-02-16 12:51:25 UTC (rev 14745)
@@ -200,15 +200,15 @@
                values['num_days'][i] = num_days[i].value;
                values['sign_orig'][i] = d.sign_orig;
 
-               if ((sign[i].name != "") && (sign[i].value != d.sign_orig) && 
(sign[i].checked))
+               if (typeof(sign[i]) != 'undefined' && (sign[i].name != "") && 
(sign[i].value != d.sign_orig) && (sign[i].checked))
                {
                        values['sign'][i] = sign[i].value;
                }
-               else if ((supervisor[i].name != "") && (supervisor[i].value != 
d.sign_orig) && (supervisor[i].checked))
+               else if (typeof(supervisor[i]) != 'undefined' && 
(supervisor[i].name != "") && (supervisor[i].value != d.sign_orig) && 
(supervisor[i].checked))
                {
                        values['sign'][i] = supervisor[i].value;
                }
-               else if ((budget_responsible[i].name != "") && 
(budget_responsible[i].value != d.sign_orig) && (budget_responsible[i].checked))
+               else if (typeof(budget_responsible[i]) != 'undefined' && 
(budget_responsible[i].name != "") && (budget_responsible[i].value != 
d.sign_orig) && (budget_responsible[i].checked))
                {
                        values['sign'][i] = budget_responsible[i].value;
                }
@@ -217,7 +217,7 @@
                        values['sign'][i] = '';
                }
 
-               if ((kreditnota_tmp[i].checked))
+               if (typeof(kreditnota_tmp[i]) != 'undefined' && 
(kreditnota_tmp[i].checked))
                {
                        values['kreditnota'][i] = true;
                }
@@ -226,7 +226,7 @@
                        values['kreditnota'][i] = '';
                }
 
-               if ((transfer_id[i].checked))
+               if (typeof(transfer_id[i]) != 'undefined' && 
(transfer_id[i].checked))
                {
                        values['transfer'][i] = true;
                }