[Fmsystem-commits] [13381] rental: set default executive_officer

[Sigurd Nes]

Revision: 13381
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13381
Author:   sigurdne
Date:     2015-06-08 10:14:42 +0000 (Mon, 08 Jun 2015)
Log Message:
-----------
rental: set default executive_officer

Modified Paths:
--------------
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/templates/base/contract.php

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2015-06-08 09:20:54 UTC (rev 
13380)
+++ trunk/rental/inc/class.uicontract.inc.php   2015-06-08 10:14:42 UTC (rev 
13381)
@@ -679,6 +679,7 @@
                        
$contract->set_location_id(phpgw::get_var('responsibility_id'));
                        
$contract->set_account_in(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
 true));
                        
$contract->set_account_out(rental_socontract::get_instance()->get_default_account($contract->get_location_id(),
 false));
+                       
$contract->set_executive_officer_id($GLOBALS['phpgw_info']['user']['account_id']);
 
                        $config = CreateObject('phpgwapi.config','rental');
                        $config->read();

Modified: trunk/rental/templates/base/contract.php
===================================================================
--- trunk/rental/templates/base/contract.php    2015-06-08 09:20:54 UTC (rev 
13380)
+++ trunk/rental/templates/base/contract.php    2015-06-08 10:14:42 UTC (rev 
13381)
@@ -319,7 +319,11 @@
                                        </dt>
                                        <dd>
                                        <?php 
-                                               $executive_officer = 
$contract->get_executive_officer_id();
+                                               if(!$executive_officer = 
$contract->get_executive_officer_id())
+                                               {
+                                                       $executive_officer = 
$GLOBALS['phpgw_info']['user']['account_id'];
+                                               }
+
                                                if($editable)
                                                {
                                                        $location_name = 
$contract->get_field_of_responsibility_name();