[Phpgroupware-cvs] projects/inc class.sobilling.inc.php,1.17,1.18

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv4814/inc

Modified Files:
        class.sobilling.inc.php 
Log Message:
sapdb support table column update

Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.sobilling.inc.php     14 Nov 2003 13:04:03 -0000      1.17
--- class.sobilling.inc.php     14 Nov 2003 14:25:40 -0000      1.18
***************
*** 72,76 ****
                        if ($query)
                        {
!                               $querymethod = " AND (i_number like '%$query%' 
OR title like '%$query%' " . "OR sum like '%$query%') ";
                        }
  
--- 72,76 ----
                        if ($query)
                        {
!                               $querymethod = " AND (i_number like '%$query%' 
OR title like '%$query%' " . "OR i_sum like '%$query%') ";
                        }
  
***************
*** 82,86 ****
                        if ($project_id)
                        {
!                               $sql = 'SELECT phpgw_p_invoice.id as 
id,i_number,i_date,phpgw_p_invoice.project_id,phpgw_p_invoice.customer,sum,title
 '
                                        . 'FROM 
phpgw_p_invoice,phpgw_p_projects WHERE 
phpgw_p_invoice.project_id=phpgw_p_projects.id '
                                        . 'AND phpgw_p_projects.id=' . 
$project_id . ' AND phpgw_p_invoice.project_id=' . $project_id;
--- 82,86 ----
                        if ($project_id)
                        {
!                               $sql = 'SELECT phpgw_p_invoice.id as 
id,i_number,i_date,phpgw_p_invoice.project_id,phpgw_p_invoice.customer,i_sum,title
 '
                                        . 'FROM 
phpgw_p_invoice,phpgw_p_projects WHERE 
phpgw_p_invoice.project_id=phpgw_p_projects.id '
                                        . 'AND phpgw_p_projects.id=' . 
$project_id . ' AND phpgw_p_invoice.project_id=' . $project_id;
***************
*** 88,92 ****
                        else
                        {
!                               $sql = 'SELECT phpgw_p_invoice.id as 
id,i_number,title,i_date,sum,phpgw_p_invoice.project_id,phpgw_p_invoice.customer
 '
                                        . 'FROM 
phpgw_p_invoice,phpgw_p_projects WHERE 
phpgw_p_invoice.project_id=phpgw_p_projects.id';
                        }
--- 88,92 ----
                        else
                        {
!                               $sql = 'SELECT phpgw_p_invoice.id as 
id,i_number,title,i_date,i_sum,phpgw_p_invoice.project_id,phpgw_p_invoice.customer
 '
                                        . 'FROM 
phpgw_p_invoice,phpgw_p_projects WHERE 
phpgw_p_invoice.project_id=phpgw_p_projects.id';
                        }
***************
*** 112,116 ****
                                        'title'                 => 
$this->db->f('title'),
                                        'date'                  => 
$this->db->f('i_date'),
!                                       'sum'                   => 
$this->db->f('sum'),
                                        'project_id'    => 
$this->db->f('project_id'),
                                        'customer'              => 
$this->db->f('customer')
--- 112,116 ----
                                        'title'                 => 
$this->db->f('title'),
                                        'date'                  => 
$this->db->f('i_date'),
!                                       'sum'                   => 
$this->db->f('i_sum'),
                                        'project_id'    => 
$this->db->f('project_id'),
                                        'customer'              => 
$this->db->f('customer')
***************
*** 146,150 ****
                {
                        $values['invoice_num'] = 
$this->db->db_addslashes($values['invoice_num']);
!                       $this->db->query("INSERT INTO phpgw_p_invoice 
(i_number,sum,project_id,customer,i_date,owner) VALUES ('" . 
$values['invoice_num'] . "',0,"
                                                        . 
intval($values['project_id']) . ',' . intval($values['customer']) . ',' . 
intval($values['date']) . ',' . $this->account . ')',__LINE__,__FILE__);
  
--- 146,150 ----
                {
                        $values['invoice_num'] = 
$this->db->db_addslashes($values['invoice_num']);
!                       $this->db->query("INSERT INTO phpgw_p_invoice 
(i_number,i_sum,project_id,customer,i_date,owner) VALUES ('" . 
$values['invoice_num'] . "',0,"
                                                        . 
intval($values['project_id']) . ',' . intval($values['customer']) . ',' . 
intval($values['date']) . ',' . $this->account . ')',__LINE__,__FILE__);
  
***************
*** 177,181 ****
                                }
                        }
!                       $this->db->query('UPDATE phpgw_p_invoice SET 
sum=round(' . $sum_sum . ',2) WHERE id=' . $invoice_id,__LINE__,__FILE__);
                        return $invoice_id;
                }
--- 177,181 ----
                                }
                        }
!                       $this->db->query('UPDATE phpgw_p_invoice SET 
i_sum=round(' . $sum_sum . ',2) WHERE id=' . $invoice_id,__LINE__,__FILE__);
                        return $invoice_id;
                }
***************
*** 218,222 ****
                        }
  
!                       $this->db2->query('UPDATE phpgw_p_invoice SET 
sum=round(' . $sum_sum . ',2) WHERE id=' . 
$values['invoice_id'],__LINE__,__FILE__);
                }
  
--- 218,222 ----
                        }
  
!                       $this->db2->query('UPDATE phpgw_p_invoice SET 
i_sum=round(' . $sum_sum . ',2) WHERE id=' . 
$values['invoice_id'],__LINE__,__FILE__);
                }
  
***************
*** 299,305 ****
                function read_single_invoice($invoice_id)
                {
!                       $this->db->query('SELECT 
phpgw_p_invoice.customer,phpgw_p_invoice.i_number,phpgw_p_invoice.project_id,phpgw_p_invoice.i_date,'
!                                                       . 
'phpgw_p_invoice.sum,phpgw_p_projects.title,phpgw_p_projects.p_number FROM 
phpgw_p_invoice,phpgw_p_projects WHERE '
!                                                       . 'phpgw_p_invoice.id=' 
. intval($invoice_id) . ' AND 
phpgw_p_invoice.project_id=phpgw_p_projects.id',__LINE__,__FILE__);
  
                        if ($this->db->next_record())
--- 299,305 ----
                function read_single_invoice($invoice_id)
                {
!                       $this->db->query('SELECT 
phpgw_p_invoice.customer,i_number,phpgw_p_invoice.project_id,i_date,i_sum,title,p_number
 '
!                                                       . 'FROM 
phpgw_p_invoice,phpgw_p_projects WHERE phpgw_p_invoice.id=' . 
intval($invoice_id)
!                                                       . ' AND 
phpgw_p_invoice.project_id=phpgw_p_projects.id',__LINE__,__FILE__);
  
                        if ($this->db->next_record())
***************
*** 311,315 ****
                                $bill['project_id']             = 
$this->db->f('project_id');
                                $bill['project_num']    = 
$this->db->f('p_number');
!                               $bill['sum']                    = 
$this->db->f('sum');
                        }
                        return $bill;
--- 311,315 ----
                                $bill['project_id']             = 
$this->db->f('project_id');
                                $bill['project_num']    = 
$this->db->f('p_number');
!                               $bill['sum']                    = 
$this->db->f('i_sum');
                        }
                        return $bill;