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

[nomail]

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

date: 2004/05/30 19:10:31;  author: sigurdne;  state: Exp;  lines: +4 -4

Log Message:
no message
=====================================================================
Index: property/inc/class.soinvoice.inc.php
diff -u property/inc/class.soinvoice.inc.php:1.1.1.1 
property/inc/class.soinvoice.inc.php:1.1.1.2
--- property/inc/class.soinvoice.inc.php:1.1.1.1        Fri Apr 23 13:13:57 2004
+++ property/inc/class.soinvoice.inc.php        Sun May 30 19:10:31 2004
@@ -195,7 +195,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_vendor 
ON fm_vendor.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 ";
@@ -349,7 +349,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_vendor  on $table.spvend_code = fm_vendor.id ) 
$filtermethod ";
 
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();
@@ -751,7 +751,7 @@
                function check_vendor($vendor_id)
                {
 
-                       $this->db->query("select count(*) from 
phpgw_addressbook where id='$vendor_id'");
+                       $this->db->query("select count(*) from fm_vendor where 
id='$vendor_id'");
                        $this->db->next_record();
                        return $this->db->f(0);
                }