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

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc/import
In directory subversions:/tmp/cvs-serv19253/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.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Import_fra_BKK      9 May 2003 09:05:31 -0000       1.9
--- Import_fra_BKK      10 May 2003 16:34:22 -0000      1.10
***************
*** 91,94 ****
--- 91,96 ----
                        $this->invoice          = 
CreateObject($this->currentapp.'.boinvoice');
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
+                       $this->dateformat       = $this->bocommon->dateformat;
+                       $this->datetimeformat   = 
$this->bocommon->datetimeformat;
                }
  
***************
*** 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']));
                     
                                }
  
--- 204,216 ----
                        while ( list($name, $value) = 
each($this->currentrecord))
                        {
!                               $invoice_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
  
                                if($invoice_common['num_days'])
                                {
!                                       $payment_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
                                }
                                else
                                {
!                                       $payment_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
                       
                                }
  
***************
*** 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;
--- 251,255 ----
                                $buffer[$this->id]['forfallsdato'] = 
$payment_date;
                                $buffer[$this->id]['periode'] = 
$invoice_common['smonth'];
!                               $buffer[$this->id]['regtid'] = 
date($this->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.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Import_fra_Kemner   9 May 2003 09:05:31 -0000       1.10
--- Import_fra_Kemner   10 May 2003 16:34:22 -0000      1.11
***************
*** 61,64 ****
--- 61,66 ----
                        $this->invoice          = 
CreateObject($this->currentapp.'.boinvoice');
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
+                       $this->dateformat       = $this->bocommon->dateformat;
+                       $this->datetimeformat   = 
$this->bocommon->datetimeformat;
                        
                }
***************
*** 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;
--- 175,180 ----
                                                $periode = $forfall_month - 1;
  
!                                               $forfallsdato = 
date($this->dateformat,mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year));
!                                               $fakturadato= 
date($this->dateformat,mktime(2,0,0,$forfall_month,$forfall_day,$forfall_year)-(86400*30));
  
                                                $belop = 
intval(substr($data,32,17))/100;
***************
*** 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;
--- 339,343 ----
                                $buffer[$this->id]['spbudact_code'] = 
$this->spbudact_code;
                                $buffer[$this->id]['typeid'] = 
$invoice_common['type'];
!                               $buffer[$this->id]['regtid'] = 
date($this->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.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Import_fra_Service  9 May 2003 09:05:31 -0000       1.11
--- Import_fra_Service  10 May 2003 16:34:22 -0000      1.12
***************
*** 53,56 ****
--- 53,58 ----
                        $this->invoice          = 
CreateObject($this->currentapp.'.boinvoice');
                        $this->bocommon         = 
CreateObject($this->currentapp.'.bocommon');
+                       $this->dateformat       = $this->bocommon->dateformat;
+                       $this->datetimeformat   = 
$this->bocommon->datetimeformat;
                }
  
***************
*** 138,150 ****
                        while ( list($name, $value) = 
each($this->currentrecord))
                        {
!                               $invoice_date = 
date("Y-m-d",mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
  
                                if($invoice_common['num_days'])
                                {
!                                       $payment_date = 
date("Y-m-d",mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
                                }
                                else
                                {
!                                       $payment_date = 
date("Y-m-d",mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
                 
                                }
  
--- 140,152 ----
                        while ( list($name, $value) = 
each($this->currentrecord))
                        {
!                               $invoice_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear']));
  
                                if($invoice_common['num_days'])
                                {
!                                       $payment_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['smonth'],$invoice_common['sday'],$invoice_common['syear'])+(86400*$invoice_common['num_days']));
                                }
                                else
                                {
!                                       $payment_date = 
date($this->dateformat,mktime(2,0,0,$invoice_common['emonth'],$invoice_common['eday'],$invoice_common['eyear']));
                       
                                }
  
***************
*** 188,192 ****
                                $buffer[$this->id]['forfallsdato'] = 
$payment_date;
                                $buffer[$this->id]['periode'] = 
$invoice_common['smonth'];
!                               $buffer[$this->id]['regtid'] = date("Y-m-d 
G:i:s");
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;
--- 190,194 ----
                                $buffer[$this->id]['forfallsdato'] = 
$payment_date;
                                $buffer[$this->id]['periode'] = 
$invoice_common['smonth'];
!                               $buffer[$this->id]['regtid'] = 
date($this->datetimeformat);
                                $buffer[$this->id]['artid'] = 
$invoice_common['art'];
                                $buffer[$this->id]['godkjentbelop'] = 
$godkjentbelop;