[Phpgroupware-cvs] CVS: inv/inc class.boinventory.inc.php,1.1,1.2 class.uiinventory.inc.php,1.1,1.2

[Bettina gille <address@hidden>]

Update of /cvsroot/phpgroupware/inv/inc
In directory subversions:/tmp/cvs-serv18510/inc

Modified Files:
        class.boinventory.inc.php class.uiinventory.inc.php 
Log Message:
start porting inv to ntier

Index: class.boinventory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.boinventory.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.boinventory.inc.php   15 Jan 2002 02:57:17 -0000      1.1
--- class.boinventory.inc.php   15 Jan 2002 03:32:00 -0000      1.2
***************
*** 200,205 ****
                function read_products($limit,$object,$status)
                {
!                       return 
$this->soinv->read_products($this->start,$limit,$this->query,$object,$this->cat_id,$this->sort,$this->order,$status);
                        $this->total_records = $this->soinv->total_records;
                }
  
--- 200,206 ----
                function read_products($limit,$object,$status)
                {
!                       $pro = 
$this->soinv->read_products($this->start,$limit,$this->query,$object,$this->cat_id,$this->sort,$this->order,$status);
                        $this->total_records = $this->soinv->total_records;
+                       return $pro;
                }
  

Index: class.uiinventory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/inc/class.uiinventory.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiinventory.inc.php   15 Jan 2002 02:57:17 -0000      1.1
--- class.uiinventory.inc.php   15 Jan 2002 03:32:00 -0000      1.2
***************
*** 104,108 ****
                        
$this->t->set_var('link_rooms',$GLOBALS['phpgw']->link('/inv/rooms.php','subroom=True'));
 
  
!                       if ($this->action == 'subproduct')
                        {
                                
$this->t->set_var('sub_productarchive',$GLOBALS['phpgw']->link('/inv/archiv.php','subarchive=True'));
 
--- 104,108 ----
                        
$this->t->set_var('link_rooms',$GLOBALS['phpgw']->link('/inv/rooms.php','subroom=True'));
 
  
!                       if ($subarchive == True)
                        {
                                
$this->t->set_var('sub_productarchive',$GLOBALS['phpgw']->link('/inv/archiv.php','subarchive=True'));
 
***************
*** 122,128 ****
                        }
  
!                       if ($subproduct == True)
                        {
!                               
$this->t->set_var('sub_products',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_products&subproduct=True'));
 
                                
$this->t->set_var('sub_minstock',$GLOBALS['phpgw']->link('/inv/listminstock.php','subproduct=True'));
                                
$this->t->set_var('sub_receipt',$GLOBALS['phpgw']->link('/inv/listreceipt.php','subproduct=True'));
 
--- 122,128 ----
                        }
  
!                       if ($this->action == 'subproduct')
                        {
!                               
$this->t->set_var('sub_products',$GLOBALS['phpgw']->link('/index.php','menuaction=inv.uiinventory.list_products&action=subproduct'));
 
                                
$this->t->set_var('sub_minstock',$GLOBALS['phpgw']->link('/inv/listminstock.php','subproduct=True'));
                                
$this->t->set_var('sub_receipt',$GLOBALS['phpgw']->link('/inv/listreceipt.php','subproduct=True'));
 
***************
*** 166,172 ****
                        $archive_id = $this->boinv->get_status_id('archive');
  
!                       if (!$start)
                        {
!                               $start = '0';
                        }
  
--- 166,172 ----
                        $archive_id = $this->boinv->get_status_id('archive');
  
!                       if (!$this->start)
                        {
!                               $this->start = '0';
                        }
  
***************
*** 213,218 ****
  // -------------------------------- end declaration 
-----------------------------------------
  
! 
!                       $taxpercent = $this->boinv->select_tax($this->cat_id);
  
                        for ($i=0;$i<count($products);$i++)
--- 213,217 ----
  // -------------------------------- end declaration 
-----------------------------------------
  
!                       $taxpercent = $this->boinv->select_tax($cat_id);
  
                        for ($i=0;$i<count($products);$i++)