[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.10,1.11 Import_fra_Kemner,1.11,1.12 Import_fra_Service,1.12,1.13

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc/import
In directory subversions:/tmp/cvs-serv28644/inc/import

Modified Files:
        Import_fra_BKK Import_fra_Kemner Import_fra_Service 
Log Message:
no message

Index: Import_fra_BKK
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_BKK,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Import_fra_BKK      10 May 2003 16:34:22 -0000      1.10
--- Import_fra_BKK      22 May 2003 09:54:11 -0000      1.11
***************
*** 93,96 ****
--- 93,97 ----
                        $this->dateformat       = $this->bocommon->dateformat;
                        $this->datetimeformat   = 
$this->bocommon->datetimeformat;
+                       $this->next_bilagsnr    = 
$this->invoice->next_bilagsnr();
                }
  
***************
*** 237,241 ****
  
                                $buffer[$this->id][$name] = $value;
!                               $buffer[$this->id]['bilagsnr'] = 
$this->invoice->next_bilagsnr();
                                $buffer[$this->id]['fakturanr'] = 
$invoice_common['invoice_num'];
                                $buffer[$this->id]['dima'] = $dima;
--- 238,242 ----
  
                                $buffer[$this->id][$name] = $value;
!                               $buffer[$this->id]['bilagsnr'] = 
$this->next_bilagsnr;
                                $buffer[$this->id]['fakturanr'] = 
$invoice_common['invoice_num'];
                                $buffer[$this->id]['dima'] = $dima;
***************
*** 260,266 ****
                                $buffer[$this->id]['budsjettansvarligid'] = 
$invoice_common['budget_responsible'];
  
- //                            echo '<br>'.$name.' => '.$value;
                        }
- //print_r($buffer);
                        return $buffer;
                }
--- 261,265 ----
***************
*** 268,287 ****
                function import_end_file($buffer,$bilagsnr)
                {
- //print_r($buffer);
-                       //echo '<br>'; 
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
- //echo '<br>'.$i.': '.$name.' => '.$value;
                                        $entry[$i][$name] = $value;
                                }
- //print_r($buffer);
- //print_r($entry[$i]);
- //                            echo '<br>';
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                        }
                        $num = $i - 1;
!                       return lang('Successfully imported %1 records into your 
invoice register.',$num).' '.lang('ID').': '. $bilagsnr;
                }
        }
--- 267,283 ----
                function import_end_file($buffer,$bilagsnr)
                {
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
                                        $entry[$i][$name] = $value;
                                }
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                        }
                        $num = $i - 1;
! 
!                       $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
! 
!                       return $receipt;
                }
        }

Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Import_fra_Kemner   10 May 2003 16:34:22 -0000      1.11
--- Import_fra_Kemner   22 May 2003 09:54:11 -0000      1.12
***************
*** 348,354 ****
                                $buffer[$this->id]['budsjettansvarligid'] = 
$invoice_common['budget_responsible'];
  
- //                            echo '<br>'.$name.' => '.$value;
                        }
- //print_r($buffer);
                        return $buffer;
                }
--- 348,352 ----
***************
*** 356,375 ****
                function import_end_file($buffer,$bilagsnr)
                {
- 
- //echo 'count(buffer) '.count($buffer) .'<br>';
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
- //                                    echo '<br>'.$i.': '.$name.' => '.$value;
                                        $entry[$i][$name] = $value;
                                }
- //print_r($buffer);
- //print_r($entry[$i]);
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                                $bilagsnr_end = 
$this->invoice->increment_bilagsnr();
                        }
                        $num = $i - 1;
!                       return lang('Successfully imported %1 records into your 
invoice register.',$num).' '.lang('ID').': '. $bilagsnr .' - ' . $bilagsnr_end;
                }
        }
--- 354,371 ----
                function import_end_file($buffer,$bilagsnr)
                {
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
                                        $entry[$i][$name] = $value;
                                }
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                                $bilagsnr_end = 
$this->invoice->increment_bilagsnr();
                        }
                        $num = $i - 1;
! 
!                       $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
! 
!                       return $receipt;
                }
        }

Index: Import_fra_Service
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Import_fra_Service  10 May 2003 16:34:22 -0000      1.12
--- Import_fra_Service  22 May 2003 09:54:11 -0000      1.13
***************
*** 55,58 ****
--- 55,59 ----
                        $this->dateformat       = $this->bocommon->dateformat;
                        $this->datetimeformat   = 
$this->bocommon->datetimeformat;
+                       $this->next_bilagsnr    = 
$this->invoice->next_bilagsnr();
                }
  
***************
*** 182,186 ****
  
                                $buffer[$this->id][$name] = $value;
!                               $buffer[$this->id]['bilagsnr'] = 
$this->invoice->next_bilagsnr();
                                $buffer[$this->id]['splitt'] = $this->splitt;
                                $buffer[$this->id]['kildeid'] = $this->kildeid;
--- 183,187 ----
  
                                $buffer[$this->id][$name] = $value;
!                               $buffer[$this->id]['bilagsnr'] = 
$this->next_bilagsnr;
                                $buffer[$this->id]['splitt'] = $this->splitt;
                                $buffer[$this->id]['kildeid'] = $this->kildeid;
***************
*** 199,205 ****
                                $buffer[$this->id]['budsjettansvarligid'] = 
$invoice_common['budget_responsible'];
  
-       //                      echo '<br>'.$name.' => '.$value;
                        }
- //print_r($buffer);
                        return $buffer;
                }
--- 200,204 ----
***************
*** 207,226 ****
                function import_end_file($buffer,$bilagsnr)
                {
- //print_r($buffer);
- //echo '<br>'; 
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
- //echo '<br>'.$i.': '.$name.' => '.$value;
                                        $entry[$i][$name] = $value;
                                }
- //print_r($buffer);
- //print_r($entry[$i]);
- //                            echo '<br>';
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                        }
                        $num = $i - 1;
!                       return lang('Successfully imported %1 records into your 
invoice register.',$num).' '.lang('ID').': '. $bilagsnr;
                }
        }
--- 206,222 ----
                function import_end_file($buffer,$bilagsnr)
                {
                        for ($i=1;$i<=count($buffer);$i++)
                        {
                                while ( list($name,$value) = @each($buffer[$i]) 
)
                                {
                                        $entry[$i][$name] = $value;
                                }
                                
$this->soXport->add($GLOBALS['phpgw_info']['user']['account_id'],$entry[$i],$access,$cat_id);
                        }
                        $num = $i - 1;
! 
!                       $receipt['message'][]= array('msg' => 
lang('Successfully imported %1 records into your invoice register.',$num).' 
'.lang('ID').': '. $bilagsnr);
! 
!                       return $receipt;
                }
        }