[Fmsystem-commits] [14971] rental: update

[Sigurd Nes]

Revision: 14971
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14971
Author:   sigurdne
Date:     2016-05-04 14:10:38 +0000 (Wed, 04 May 2016)
Log Message:
-----------
rental: update

Modified Paths:
--------------
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/inc/custom/default/NLSH_add_contract_from_composite.php

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2016-05-04 13:53:22 UTC (rev 
14970)
+++ trunk/rental/inc/class.uicontract.inc.php   2016-05-04 14:10:38 UTC (rev 
14971)
@@ -1383,7 +1383,7 @@
                        if (isset($contract))
                        {
                                $contract->set_contract_date(new 
rental_contract_date($date_start, $date_end));
-                               
$contract->set_security_type(phpgw::get_var('security_type'));
+                               
$contract->set_security_type(phpgw::get_var('security_type', 'int'));
                                
$contract->set_security_amount(phpgw::get_var('security_amount'));
                                
$contract->set_executive_officer_id(phpgw::get_var('executive_officer'));
                                
$contract->set_comment(phpgw::get_var('comment'));

Modified: trunk/rental/inc/custom/default/NLSH_add_contract_from_composite.php
===================================================================
--- trunk/rental/inc/custom/default/NLSH_add_contract_from_composite.php        
2016-05-04 13:53:22 UTC (rev 14970)
+++ trunk/rental/inc/custom/default/NLSH_add_contract_from_composite.php        
2016-05-04 14:10:38 UTC (rev 14971)
@@ -31,6 +31,10 @@
                        {
                                $responsibility_id = 8018;
                        }
+                       else if($loc1 == 8534)
+                       {
+                               $responsibility_id = 4036;
+                       }
                        else if ($loc1 > 8499 && $loc1 < 8600)
                        {
                                if ($loc2 == 18)