[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.4,1.5 Impor
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.4,1.5 Import_fra_Kemner,1.5,1.6 Import_fra_Service,1.5,1.6 |
|
Date: |
Fri, 27 Dec 2002 14:03:30 -0500 |
Update of /cvsroot/phpgroupware/property/inc/import
In directory subversions:/tmp/cvs-serv29649/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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Import_fra_BKK 21 Dec 2002 12:49:09 -0000 1.4
--- Import_fra_BKK 27 Dec 2002 19:03:28 -0000 1.5
***************
*** 94,100 ****
}
! function
import($tsvfile,$conv_type,$private,$fcat_id,$invoice_common,$download)
{
if(!$buffer[$this->id]['kidnr'] =
$invoice_common['kid_nr'])
{
--- 94,103 ----
}
! function import($invoice_common,$download)
{
+ $tsvfile = $invoice_common['tsvfile'];
+ $conv_type = $invoice_common['conv_type'];
+
if(!$buffer[$this->id]['kidnr'] =
$invoice_common['kid_nr'])
{
***************
*** 102,106 ****
return;
}
- if ($private == '') { $private = 'public'; }
$valid_data= False;
$buffer = array();
--- 105,108 ----
***************
*** 150,154 ****
if ($valid_data)
{
! $buffer =
$this->import_end_record($buffer,$invoice_common,$private);
$valid_data= False;
}
--- 152,156 ----
if ($valid_data)
{
! $buffer =
$this->import_end_record($buffer,$invoice_common);
$valid_data= False;
}
***************
*** 162,166 ****
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$private,$fcat_id,$invoice_common['bilagsnr']);
$this->invoice->increment_bilagsnr();
}
--- 164,168 ----
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
$this->invoice->increment_bilagsnr();
}
***************
*** 201,213 ****
while ( list($name, $value) =
each($this->currentrecord))
{
! $invoice_date = date("M d
Y",mktime(2,0,0,$invoice_common['invoice_month'],$invoice_common['invoice_day'],$invoice_common['invoice_year']));
if($invoice_common['num_days'])
{
! $payment_date = date("M d
Y",mktime(2,0,0,$invoice_common['invoice_month'],$invoice_common['invoice_day'],$invoice_common['invoice_year'])+(86400*$invoice_common['num_days']));
}
else
{
! $payment_date = date("M d
Y",mktime(2,0,0,$invoice_common['payment_month'],$invoice_common['payment_day'],$invoice_common['payment_year']));
}
--- 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']));
}
***************
*** 247,251 ****
$buffer[$this->id]['fakturadato'] =
$invoice_date;
$buffer[$this->id]['forfallsdato'] =
$payment_date;
! $buffer[$this->id]['periode'] =
$invoice_common['invoice_month'];
$buffer[$this->id]['regtid'] = date("M d Y
g:iA");
$buffer[$this->id]['artid'] =
$invoice_common['art'];
--- 249,253 ----
$buffer[$this->id]['fakturadato'] =
$invoice_date;
$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'];
***************
*** 263,267 ****
}
! function
import_end_file($buffer,$access='private',$cat_id=0,$bilagsnr)
{
//print_r($buffer);
--- 265,269 ----
}
! function import_end_file($buffer,$bilagsnr)
{
//print_r($buffer);
Index: Import_fra_Kemner
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Kemner,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Import_fra_Kemner 21 Dec 2002 12:49:09 -0000 1.5
--- Import_fra_Kemner 27 Dec 2002 19:03:28 -0000 1.6
***************
*** 61,66 ****
}
! function
import($tsvfile,$conv_type,$private,$fcat_id,$invoice_common,$download)
{
$Ingen = 0;
$FilGodkjent = 1;
--- 61,70 ----
}
! function import($invoice_common,$download)
{
+
+ $tsvfile = $invoice_common['tsvfile'];
+ $conv_type = $invoice_common['conv_type'];
+
$Ingen = 0;
$FilGodkjent = 1;
***************
*** 74,78 ****
$last_case_merknad='';
$bilagsnr = $this->invoice->next_bilagsnr();
- if ($private == '') { $private = 'public'; }
$buffer = array();
$buffer = $this->import_start_file($buffer);
--- 78,81 ----
***************
*** 94,98 ****
}
$Merknad='';
! $buffer =
$this->import_end_record($buffer,$invoice_common,$private);
$last_case_merknad='';
}
--- 97,101 ----
}
$Merknad='';
! $buffer =
$this->import_end_record($buffer,$invoice_common);
$last_case_merknad='';
}
***************
*** 281,285 ****
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$private,$fcat_id,$invoice_common['bilagsnr']);
}
//print_r($buffer);
--- 284,288 ----
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
}
//print_r($buffer);
***************
*** 346,350 ****
}
! function
import_end_file($buffer,$access='private',$cat_id=0,$bilagsnr)
{
--- 349,353 ----
}
! function import_end_file($buffer,$bilagsnr)
{
Index: Import_fra_Service
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/import/Import_fra_Service,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** Import_fra_Service 24 Dec 2002 23:22:29 -0000 1.5
--- Import_fra_Service 27 Dec 2002 19:03:28 -0000 1.6
***************
*** 54,61 ****
}
! function
import($tsvfile,$conv_type,$private,$fcat_id,$invoice_common,$download)
{
! if ($private == '') { $private = 'public'; }
$row = 0;
$valid_data= False;
--- 54,62 ----
}
! function import($invoice_common,$download)
{
! $tsvfile = $invoice_common['tsvfile'];
! $conv_type = $invoice_common['conv_type'];
$row = 0;
$valid_data= False;
***************
*** 86,90 ****
if ($valid_data)
{
! $buffer =
$this->import_end_record($buffer,$invoice_common,$private);
$valid_data= False;
}
--- 87,91 ----
if ($valid_data)
{
! $buffer =
$this->import_end_record($buffer,$invoice_common);
$valid_data= False;
}
***************
*** 97,101 ****
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$private,$fcat_id,$invoice_common['bilagsnr']);
$this->invoice->increment_bilagsnr();
}
--- 98,102 ----
if(!$download)
{
! $buffer =
$this->import_end_file($buffer,$invoice_common['bilagsnr']);
$this->invoice->increment_bilagsnr();
}
***************
*** 136,148 ****
while ( list($name, $value) =
each($this->currentrecord))
{
! $invoice_date = date("M d
Y",mktime(2,0,0,$invoice_common['invoice_month'],$invoice_common['invoice_day'],$invoice_common['invoice_year']));
if($invoice_common['num_days'])
{
! $payment_date = date("M d
Y",mktime(2,0,0,$invoice_common['invoice_month'],$invoice_common['invoice_day'],$invoice_common['invoice_year'])+(86400*$invoice_common['num_days']));
}
else
{
! $payment_date = date("M d
Y",mktime(2,0,0,$invoice_common['payment_month'],$invoice_common['payment_day'],$invoice_common['payment_year']));
}
--- 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']));
}
***************
*** 185,189 ****
$buffer[$this->id]['fakturadato'] =
$invoice_date;
$buffer[$this->id]['forfallsdato'] =
$payment_date;
! $buffer[$this->id]['periode'] =
$invoice_common['invoice_month'];
$buffer[$this->id]['regtid'] = date("M d Y
g:iA");
$buffer[$this->id]['artid'] =
$invoice_common['art'];
--- 186,190 ----
$buffer[$this->id]['fakturadato'] =
$invoice_date;
$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'];
***************
*** 201,205 ****
}
! function
import_end_file($buffer,$access='private',$cat_id=0,$bilagsnr)
{
//print_r($buffer);
--- 202,206 ----
}
! function import_end_file($buffer,$bilagsnr)
{
//print_r($buffer);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.4,1.5 Import_fra_Kemner,1.5,1.6 Import_fra_Service,1.5,1.6,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default lookup.xsl,NONE,1.1 invoice.xsl,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.bolookup.inc.php,NONE,1.1 class.solookup.inc.php,NONE,1.1 class.uilookup.inc.php,NONE,1.1 class.boXport.inc.php,1.4,1.5 class.uiXport.inc.php,1.6,1.7
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default lookup.xsl,NONE,1.1 invoice.xsl,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.bolookup.inc.php,NONE,1.1 class.solookup.inc.php,NONE,1.1 class.uilookup.inc.php,NONE,1.1 class.boXport.inc.php,1.4,1.5 class.uiXport.inc.php,1.6,1.7
- Index(es):