[Phpgroupware-cvs] projects/inc class.bobilling.inc.php, 1.8.4.2, 1.8.4.3 class.bodeliveries.inc.php, 1.15.4.3, 1.15.4.4 class.sobilling.inc.php, 1.11.2.1.2.5, 1.11.2.1.2.6 class.sodeliveries.inc.php, 1.15.2.1.2.4, 1.15.2.1.2.5

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.bobilling.inc.php class.bodeliveries.inc.php 
        class.sobilling.inc.php class.sodeliveries.inc.php 
Log Message:
bugfixes

Index: class.bobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bobilling.inc.php,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -C2 -d -r1.8.4.2 -r1.8.4.3
*** class.bobilling.inc.php     23 Oct 2003 11:16:33 -0000      1.8.4.2
--- class.bobilling.inc.php     23 Oct 2003 11:55:18 -0000      1.8.4.3
***************
*** 57,67 ****
                {
                        $co = $this->get_site_config();
! 
!                       if($co['invoice_acl'] == 'yes')
!                       {
!                               $owner = True;
!                       }
! 
!                       $bill = $this->sobilling->read_invoices($start, $query, 
$sort, $order, $limit, $project_id, $owner = False);
                        $this->total_records = $this->sobilling->total_records;
                        return $bill;
--- 57,61 ----
                {
                        $co = $this->get_site_config();
!                       $bill = $this->sobilling->read_invoices($start, $query, 
$sort, $order, $limit, $project_id,($co['invoice_acl'] == 'yes'?True:False));
                        $this->total_records = $this->sobilling->total_records;
                        return $bill;

Index: class.sodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sodeliveries.inc.php,v
retrieving revision 1.15.2.1.2.4
retrieving revision 1.15.2.1.2.5
diff -C2 -d -r1.15.2.1.2.4 -r1.15.2.1.2.5
*** class.sodeliveries.inc.php  23 Oct 2003 11:16:34 -0000      1.15.2.1.2.4
--- class.sodeliveries.inc.php  23 Oct 2003 11:55:19 -0000      1.15.2.1.2.5
***************
*** 180,184 ****
                        if ($owner)
                        {
!                               $acl_select = ' AND owner=' . $this->account;
                        }
  
--- 180,184 ----
                        if ($owner)
                        {
!                               $acl_select = ' AND phpgw_p_delivery.owner=' . 
$this->account;
                        }
  

Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.11.2.1.2.5
retrieving revision 1.11.2.1.2.6
diff -C2 -d -r1.11.2.1.2.5 -r1.11.2.1.2.6
*** class.sobilling.inc.php     23 Oct 2003 11:16:34 -0000      1.11.2.1.2.5
--- class.sobilling.inc.php     23 Oct 2003 11:55:19 -0000      1.11.2.1.2.6
***************
*** 71,75 ****
                        if ($owner)
                        {
!                               $acl_select = ' AND owner=' . $this->account;
                        }
  
--- 71,75 ----
                        if ($owner)
                        {
!                               $acl_select = ' AND phpgw_p_invoice.owner=' . 
$this->account;
                        }
  
***************
*** 141,145 ****
                        $values['invoice_num'] = 
$this->db->db_addslashes($values['invoice_num']);
                        $this->db->query("INSERT INTO phpgw_p_invoice 
(num,sum,project_id,customer,date,owner) VALUES ('" . $values['invoice_num'] . 
"',0,"
!                                                       . 
intval($values['project_id']) . ',' . intval($values['customer']) . ',' . 
intval($values['date']) . ',' . $this->account),__LINE__,__FILE__);
  
                        $this->db2->query("SELECT id from phpgw_p_invoice WHERE 
num='" . $values['invoice_num'] . "'",__LINE__,__FILE__);
--- 141,145 ----
                        $values['invoice_num'] = 
$this->db->db_addslashes($values['invoice_num']);
                        $this->db->query("INSERT INTO phpgw_p_invoice 
(num,sum,project_id,customer,date,owner) VALUES ('" . $values['invoice_num'] . 
"',0,"
!                                                       . 
intval($values['project_id']) . ',' . intval($values['customer']) . ',' . 
intval($values['date']) . ',' . $this->account . ')',__LINE__,__FILE__);
  
                        $this->db2->query("SELECT id from phpgw_p_invoice WHERE 
num='" . $values['invoice_num'] . "'",__LINE__,__FILE__);

Index: class.bodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.bodeliveries.inc.php,v
retrieving revision 1.15.4.3
retrieving revision 1.15.4.4
diff -C2 -d -r1.15.4.3 -r1.15.4.4
*** class.bodeliveries.inc.php  23 Oct 2003 11:16:34 -0000      1.15.4.3
--- class.bodeliveries.inc.php  23 Oct 2003 11:55:19 -0000      1.15.4.4
***************
*** 76,86 ****
                {
                        $co = $this->get_site_config();
! 
!                       if($co['invoice_acl'] == 'yes')
!                       {
!                               $owner = True;
!                       }
! 
!                       $del = $this->sodeliveries->read_deliveries($start, 
$query, $sort, $order, $limit, $project_id, $owner = False);
                        $this->total_records = 
$this->sodeliveries->total_records;
                        return $del;
--- 76,80 ----
                {
                        $co = $this->get_site_config();
!                       $del = $this->sodeliveries->read_deliveries($start, 
$query, $sort, $order, $limit, $project_id,($co['invoice_acl'] == 
'yes'?True:False));
                        $this->total_records = 
$this->sodeliveries->total_records;
                        return $del;