[Phpgroupware-cvs] property/class.soinvoice.php, 1.1.1.7

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.soinvoice.php

date: 2004/04/30 09:52:25;  author: sigurdne;  state: Exp;  lines: +4 -4

Log Message:
no message
=====================================================================
Index: property/class.soinvoice.php
diff -u property/class.soinvoice.php:1.1.1.6 
property/class.soinvoice.php:1.1.1.7
--- property/class.soinvoice.php:1.1.1.6        Mon Apr 26 12:21:08 2004
+++ property/class.soinvoice.php        Fri Apr 30 09:52:25 2004
@@ -199,7 +199,7 @@
                                        $sql = "SELECT 
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
                                        . " 
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
                                        . " 
forfallsdato,periode,artid,kidnr,kreditnota "
-                                       . " from $table $this->join 
phpgw_addressbook ON phpgw_addressbook.id = $table.spvend_code WHERE bilagsnr = 
$voucher_id "
+                                       . " from $table $this->join 
fm_addressbook ON fm_addressbook.id = $table.spvend_code WHERE bilagsnr = 
$voucher_id "
                                        . " group by 
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
                                        . " 
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
                                        . " 
forfallsdato,periode,artid,kidnr,kreditnota ";
@@ -353,7 +353,7 @@
 
                        $sql = "SELECT 
$table.*,fm_workorder.status,fm_workorder.charge_tenant ,org_name FROM (( 
$table $this->left_join "
                        . "fm_workorder on fm_workorder.id = 
$table.pmwrkord_code ) $this->join "
-                       . "phpgw_addressbook  on $table.spvend_code = 
phpgw_addressbook.id ) $filtermethod ";
+                       . "fm_addressbook  on $table.spvend_code = 
fm_addressbook.id ) $filtermethod ";
 
                        $dbresult2 = $GLOBALS['phpgw']->db->Execute($sql);
                        $this->total_records = $dbresult2->_numOfRows;
@@ -754,7 +754,7 @@
                function check_vendor($vendor_id)
                {
 
-                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
count(*) from phpgw_addressbook where id='$vendor_id'");
+                       $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
count(*) from fm_addressbook where id='$vendor_id'");
 
                        return $dbresult->fields[0];
                }