[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uiXport.inc.php, 1.31, 1.32
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uiXport.inc.php, 1.31, 1.32 |
Date: |
Wed, 06 Aug 2003 17:47:53 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv14291/inc
Modified Files:
class.uiXport.inc.php
Log Message:
no message
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.uiXport.inc.php 6 Aug 2003 17:07:58 -0000 1.31
--- class.uiXport.inc.php 6 Aug 2003 21:47:51 -0000 1.32
***************
*** 391,396 ****
function debug_import($buffer='',$invoice_common='')
{
-
- //_debug_array($buffer);
$table = $buffer['table'];
$header = $buffer['header'];
--- 391,394 ----
***************
*** 399,427 ****
$sum=0;
! for ($i=1; $i<count($table)+1; $i++)
! {
! for ($k=0; $k<count($header); $k++)
! {
! }
! }
!
! for ($i=1; $i<count($table)+1; $i++)
{
! for ($k=0; $k<count($import); $k++)
{
!
$values[$i]['field_'.$k]=$table[$i][$import[$header[$k]]];
if ($import[$header[$k]]=='belop')
{
$sum=$sum+$table[$i][$import[$header[$k]]];
}
}
}
- $import_values = array_values($import);
-
for ($k=0; $k<count($header); $k++)
{
! $table_header[$k]['header']=$header[$k];
! $table_key[$k]['key']=$import_values[$k];
}
--- 397,421 ----
$sum=0;
! $import_count = count($import);
! $table_count = count($table)+1;
! for ($i=1; $i<$table_count; $i++)
{
! for ($k=0; $k<$import_count; $k++)
{
! $content[$i]['row'][$k]['value']
= $table[$i][$import[$header[$k]]];
if ($import[$header[$k]]=='belop')
{
+
$content[$i]['row'][$k]['align'] = 'right';
$sum=$sum+$table[$i][$import[$header[$k]]];
+
$content[$i]['row'][$k]['value'] =
number_format($table[$i][$import[$header[$k]]], 2, ',', ' ');
}
}
}
for ($k=0; $k<count($header); $k++)
{
! $table_header[$k]['header'] = $header[$k];
! $table_header[$k]['width'] = '5%';
! $table_header[$k]['align'] =
'center';
}
***************
*** 449,454 ****
'lang_add_statustext' => lang('Import this
invoice'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_add),
! 'lang_cancel' =>
lang('cancel'),
! 'lang_cancel_statustext' => lang('Do not
import this invoice'),
'cancel_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_cancel)
--- 443,448 ----
'lang_add_statustext' => lang('Import this
invoice'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_add),
! 'lang_cancel' =>
lang('cancel'),
! 'lang_cancel_statustext'=> lang('Do not import
this invoice'),
'cancel_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_cancel)
***************
*** 479,495 ****
'lang_sum'
=> lang('Sum'),
'sum'
=> number_format($sum, 2, ',', ' '),
! 'table_header_debug' =>
$table_header,
! 'table_key'
=> $table_key,
! 'values_debug'
=> $values,
'table_add'
=> $table_add
);
! unset($table);
! //_debug_array($table);
!
!
! //_debug_array($data);
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
$appname
= lang('Invoice');
$function_msg =
lang('Debug');
--- 473,484 ----
'lang_sum'
=> lang('Sum'),
'sum'
=> number_format($sum, 2, ',', ' '),
! 'table_header'
=> $table_header,
! 'values'
=> $content,
'table_add'
=> $table_add
);
! unset($content);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','table_header'));
$appname
= lang('Invoice');
$function_msg =
lang('Debug');
***************
*** 498,502 ****
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('debug' => $data));
-
}
--- 487,490 ----
***************
*** 513,518 ****
$values = get_var('values',array('POST','GET'));
$date = get_var('date',array('POST','GET'));
- //_debug_array($values);
-
$links = $this->bocommon->menu($sub);
--- 501,504 ----
***************
*** 524,528 ****
$receipt['error'][] = array('msg'=>
lang('No conversion type could be located.') . ' - ' . lang('Please choose a
conversion type from the list'));
- // $receipt['error'][] = array('msg'=>
lang('Please choose a conversion type from the list'));
}
elseif($values['conv_type'] &&
!$values['file']):
--- 510,513 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uiXport.inc.php, 1.31, 1.32,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl, 1.31, 1.32
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service, 1.14, 1.15 Import_fra_Kemner, 1.14, 1.15 Import_fra_BKK, 1.13, 1.14
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default invoice.xsl, 1.31, 1.32
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_Service, 1.14, 1.15 Import_fra_Kemner, 1.14, 1.15 Import_fra_BKK, 1.13, 1.14
- Index(es):