[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service,1.6,1.7

[Sigurd Nes <address@hidden>]

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

Modified Files:
        Import_fra_Service 
Log Message:
no message

Index: Import_fra_Service
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Import_fra_Service  27 Dec 2002 19:03:28 -0000      1.6
--- Import_fra_Service  6 Jan 2003 08:29:57 -0000       1.7
***************
*** 137,149 ****
                        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']));
                 
                                }
  
--- 137,149 ----
                        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']));
                 
                                }
  
***************
*** 187,191 ****
                                $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;
--- 187,191 ----
                                $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;