[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.5,1.6 Import_fra_Kemner,1.6,1.7 Import_fra_Service,1.7,1.8

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc/import
In directory subversions:/tmp/cvs-serv1016/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.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Import_fra_BKK      27 Dec 2002 19:03:28 -0000      1.5
--- Import_fra_BKK      6 Jan 2003 16:51:13 -0000       1.6
***************
*** 84,95 ****
                        );
  
- 
- 
- 
                function import_conv()
                {
  
!                       $this->soXport = CreateObject('property.soXport');      
!                       $this->invoice = CreateObject('property.invoice');      
                }
  
--- 84,94 ----
                        );
  
                function import_conv()
                {
  
!                       $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
!                       $this->soXport          = 
CreateObject($this->currentapp.'.soXport');   
!                       $this->invoice          = 
CreateObject($this->currentapp.'.invoice');
!                       $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
                }
  
***************
*** 203,215 ****
                        while ( list($name, $value) = 
each($this->currentrecord))
                        {
!                               $invoice_date = date("M d 
Y",mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
  
                                if($invoice_common['num_days'])
                                {
!                                       $payment_date = date("M d 
Y",mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
                                }
                                else
                                {
!                                       $payment_date = date("M d 
Y",mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
                 
                                }
  
--- 202,214 ----
                        while ( list($name, $value) = 
each($this->currentrecord))
                        {
!                               $invoice_date = 
date($this->bocommon->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
  
                                if($invoice_common['num_days'])
                                {
!                                       $payment_date = 
date($this->bocommon->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
                                }
                                else
                                {
!                                       $payment_date = 
date($this->bocommon->dateformat,mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
                     
                                }
  
***************
*** 250,254 ****
                                $buffer[$this->id]['forfallsdato'] = 
$payment_date;
                                $buffer[$this->id]['periode'] = 
$invoice_common['smonth'];
!                               $buffer[$this->id]['regtid'] = date("M d Y 
g:iA");
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;
--- 249,253 ----
                                $buffer[$this->id]['forfallsdato'] = 
$payment_date;
                                $buffer[$this->id]['periode'] = 
$invoice_common['smonth'];
!                               $buffer[$this->id]['regtid'] = 
date($this->bocommon->datetimeformat);
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;

Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Import_fra_Kemner   27 Dec 2002 19:03:28 -0000      1.6
--- Import_fra_Kemner   6 Jan 2003 16:51:13 -0000       1.7
***************
*** 57,62 ****
                function import_conv()
                {
!                       $this->soXport = CreateObject('property.soXport');      
!                       $this->invoice = CreateObject('property.invoice');      
                }
  
--- 57,65 ----
                function import_conv()
                {
!                       $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
!                       $this->soXport          = 
CreateObject($this->currentapp.'.soXport');   
!                       $this->invoice          = 
CreateObject($this->currentapp.'.invoice');
!                       $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
!                       
                }
  
***************
*** 170,175 ****
                                                $periode = $forfall_month - 1;
  
!                                               $forfallsdato = date("M d 
Y",mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year));
!                                               $fakturadato= date("M d 
Y",mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year)-(86400*30));
  
                                                $belop = 
intval(substr($data,32,17))/100;
--- 173,178 ----
                                                $periode = $forfall_month - 1;
  
!                                               $forfallsdato = 
date($this->bocommon->dateformat,mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year));
!                                               $fakturadato= 
date($this->bocommon->dateformat,mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year)-(86400*30));
  
                                                $belop = 
intval(substr($data,32,17))/100;
***************
*** 334,338 ****
                                $buffer[$this->id]['spbudact_code'] = 
$this->spbudact_code;
                                $buffer[$this->id]['typeid'] = 
$invoice_common['type'];
!                               $buffer[$this->id]['regtid'] = date("M d Y 
g:iA");
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;
--- 337,341 ----
                                $buffer[$this->id]['spbudact_code'] = 
$this->spbudact_code;
                                $buffer[$this->id]['typeid'] = 
$invoice_common['type'];
!                               $buffer[$this->id]['regtid'] = 
date($this->bocommon->datetimeformat);
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;

Index: Import_fra_Service
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Import_fra_Service  6 Jan 2003 08:29:57 -0000       1.7
--- Import_fra_Service  6 Jan 2003 16:51:13 -0000       1.8
***************
*** 49,55 ****
                function import_conv()
                {
! 
!                       $this->soXport = CreateObject('property.soXport');      
!                       $this->invoice = CreateObject('property.boinvoice');    
                }
  
--- 49,56 ----
                function import_conv()
                {
!                       $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
!                       $this->soXport          = 
CreateObject($this->currentapp.'.soXport');   
!                       $this->invoice          = 
CreateObject($this->currentapp.'.boinvoice');
!                       $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
                }