[Fmsystem-commits] [8582] property: more on manual invoice

[Sigurd Nes]

Revision: 8582
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8582
Author:   sigurdne
Date:     2012-01-16 09:31:56 +0000 (Mon, 16 Jan 2012)
Log Message:
-----------
property: more on manual invoice

Modified Paths:
--------------
    trunk/property/inc/class.boinvoice.inc.php
    trunk/property/inc/class.soXport.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.boinvoice.inc.php
===================================================================
--- trunk/property/inc/class.boinvoice.inc.php  2012-01-16 09:23:47 UTC (rev 
8581)
+++ trunk/property/inc/class.boinvoice.inc.php  2012-01-16 09:31:56 UTC (rev 
8582)
@@ -651,7 +651,6 @@
                                $values['budsjettansvarligid'] = 
$values['budget_responsible'];
                        }
 
-
                        if(!$values['supervisor'])
                        {
                                $criteria_supervisor                            
= array('ecodimb' => $values['dimb'], 'cat_id' => $responsible_supervisor);

Modified: trunk/property/inc/class.soXport.inc.php
===================================================================
--- trunk/property/inc/class.soXport.inc.php    2012-01-16 09:23:47 UTC (rev 
8581)
+++ trunk/property/inc/class.soXport.inc.php    2012-01-16 09:31:56 UTC (rev 
8582)
@@ -660,7 +660,7 @@
 
                function get_responsible($b_abbount_id)
                {
-                       $this->db->query("SELECT account_lid FROM fm_b_account 
$this->join phpgw_accounts on fm_b_account.responsible = 
phpgw_accounts.account_id WHERE fm_b_account.id = '$b_abbount_id'");
+                       $this->db->query("SELECT account_lid FROM fm_b_account 
{$this->join} phpgw_accounts on fm_b_account.responsible = 
phpgw_accounts.account_id WHERE fm_b_account.id = 
'{$b_abbount_id}'",__LINE__,__FILE__);
                        $this->db->next_record();
                        $responsible = $this->db->f('account_lid');
                        return $responsible;

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2012-01-16 09:23:47 UTC 
(rev 8581)
+++ trunk/property/inc/class.uiworkorder.inc.php        2012-01-16 09:31:56 UTC 
(rev 8582)
@@ -2041,7 +2041,7 @@
                                        (
                                                'dimb' => $workorder['ecodimb']
                                        );
-                                       $_responsible                           
        = 
$boinvoice->set_responsible($_criteria,$workorder['user_id'],$values['b_account_id']);
+                                       $_responsible                           
        = 
$boinvoice->set_responsible($_criteria,$workorder['user_id'],$workorder['b_account_id']?$workorder['b_account_id']:$values['b_account_id']);
                                        $values['janitor']                      
        = $_responsible['janitor'];
                                        $values['supervisor']                   
= $_responsible['supervisor'];
                                        $values['budget_responsible']   = 
$_responsible['budget_responsible'];