[Phpgroupware-cvs] CVS: property/inc class.boXport.inc.php,1.6,1.7 class.soXport.inc.php,1.12,1.13 class.uiinvoice.inc.php,1.4,1.5 class.uiXport.inc.php,1.10,1.11

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.boXport.inc.php class.soXport.inc.php 
        class.uiinvoice.inc.php class.uiXport.inc.php 
Log Message:
no message

Index: class.boXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boXport.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.boXport.inc.php       9 Jan 2003 19:41:40 -0000       1.6
--- class.boXport.inc.php       9 Jan 2003 23:10:22 -0000       1.7
***************
*** 305,309 ****
                function export($conv_type,$download)
                {
! echo 'download ' . $download.'<br>';
  
                        include (PHPGW_APP_INC . '/export/' . $conv_type);
--- 305,309 ----
                function export($conv_type,$download)
                {
! //echo 'download ' . $download.'<br>';
  
                        include (PHPGW_APP_INC . '/export/' . $conv_type);

Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.soXport.inc.php       9 Jan 2003 19:41:41 -0000       1.12
--- class.soXport.inc.php       9 Jan 2003 23:10:22 -0000       1.13
***************
*** 239,243 ****
                function select_periods_with_invoice_to_transfer()
                {
!                       $sql= "select distinct periode from t_ecobilag where 
not budsjettsigndato is null and (not saksigndato is null or not oppsynsigndato 
is null) and not utbetalingsigndato is null ";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $i = 0;
--- 239,243 ----
                function select_periods_with_invoice_to_transfer()
                {
!                       $sql= "select distinct periode from t_ecobilag where 
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is 
not null) and utbetalingsigndato is not null ";
                        $this->db->query($sql,__LINE__,__FILE__);
                        $i = 0;
***************
*** 253,260 ****
                function select_invoice_roleback($day,$month,$year,$Filnavn)
                {
! //echo 'Dato: '.$Dato.'<br>';
! //echo 'Filnavn: '.$Filnavn.'<br>';
  
!               $sql="select * from t_ecobilagoverf where filnavn='$Filnavn' 
and datepart(year,overftid)= $year and datepart(month,overftid)=$month and 
datepart(day,overftid)= $day";
                        $this->db->query($sql,__LINE__,__FILE__);
  //echo 'sql: '.$sql.'<br>';
--- 253,271 ----
                function select_invoice_roleback($day,$month,$year,$Filnavn)
                {
!                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='mssql')
!                       {
!                               $datepart_year          = 
"datepart(year,overftid)";
!                               $datepart_month         = 
"datepart(month,overftid)";
!                               $datepart_day           = 
"datepart(day,overftid)";
!                       }
!                       else
!                       {
!                               $datepart_year          = "YEAR(overftid)";
!                               $datepart_month         = "MONTH(overftid)";
!                               $datepart_day           = 
"DAYOFMONTH(overftid)";
!                       }
! 
  
!               $sql="select * from t_ecobilagoverf where filnavn='$Filnavn' 
and $datepart_year=$year and $datepart_month=$month and $datepart_day= $day";
                        $this->db->query($sql,__LINE__,__FILE__);
  //echo 'sql: '.$sql.'<br>';

Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiinvoice.inc.php     9 Jan 2003 19:41:41 -0000       1.4
--- class.uiinvoice.inc.php     9 Jan 2003 23:10:22 -0000       1.5
***************
*** 174,177 ****
--- 174,178 ----
                                'sub'                           => $this->sub,
                                'query'                         => $this->query,
+                               'start'                         => $this->start,
                                'filter'                        => $this->filter
                        );

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uiXport.inc.php       9 Jan 2003 19:41:41 -0000       1.10
--- class.uiXport.inc.php       9 Jan 2003 23:10:22 -0000       1.11
***************
*** 435,438 ****
--- 435,440 ----
                        $data = array
                        (
+                               'lang_type'                                     
        => lang('Type'),
+                               'artid'                                         
        => $table[1]['artid'],
                                'lang_bilagsnr'                                 
=> lang('bilagsnr'),
                                'bilagsnr'                                      
        => $table[1]['bilagsnr'],
***************
*** 475,479 ****
                        $values         = get_var('values',array('POST','GET'));
                        $date   = get_var('date',array('POST','GET'));
! _debug_array($values);
  
                        $sub = get_var('sub',array('POST','GET'));
--- 477,481 ----
                        $values         = get_var('values',array('POST','GET'));
                        $date   = get_var('date',array('POST','GET'));
! //_debug_array($values);
  
                        $sub = get_var('sub',array('POST','GET'));
***************
*** 491,499 ****
                                elseif($values['conv_type'] && 
!$values['file']):
                                {
!                                       $receipt['message'] = 
$this->bo->export($values['conv_type'],$values['download']);
                                }
                                elseif($values['conv_type'] && $values['file']):
                                {
!                                       $receipt['message'] = 
$this->bo->rollback($values['conv_type'],$values['file'],$date);
                                }
                                elseif(!$values['conv_type'] && 
$values['file']):
--- 493,501 ----
                                elseif($values['conv_type'] && 
!$values['file']):
                                {
!                                       $message = 
$this->bo->export($values['conv_type'],$values['download']);
                                }
                                elseif($values['conv_type'] && $values['file']):
                                {
!                                       $message = 
$this->bo->rollback($values['conv_type'],$values['file'],$date);
                                }
                                elseif(!$values['conv_type'] && 
$values['file']):
***************
*** 503,506 ****
--- 505,512 ----
                                endif;
                        }
+                       else
+                       {
+                               $date = 
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                       }
  
  
***************
*** 508,512 ****
                        (
                                'menuaction'            => 
$this->currentapp.'.uiXport.export',
!                               'invoice_id'            => $invoice_id);
  
                        $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
--- 514,519 ----
                        (
                                'menuaction'            => 
$this->currentapp.'.uiXport.export',
!                               'invoice_id'            => $invoice_id,
!                               'sub'                           => $sub);
  
                        $dateformat = 
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
***************
*** 546,554 ****
                                'value_debug'                                   
=> $values['debug'],
  
                                'lang_date'                                     
        => lang('Export date'),
                                'lang_submit'                                   
=> lang('Submit'),
                                'lang_cancel'                                   
=> lang('Cancel'),
  
!                               'message'                                       
        => $receipt['message'],
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'lang_save'                                     
        => lang('save')
--- 553,564 ----
                                'value_debug'                                   
=> $values['debug'],
  
+                               'value_date'                                    
=> $date,
                                'lang_date'                                     
        => lang('Export date'),
+                               'lang_date_statustext'                  => 
lang('Select date for the file to roll back'),
+ 
                                'lang_submit'                                   
=> lang('Submit'),
                                'lang_cancel'                                   
=> lang('Cancel'),
  
!                               'message'                                       
        => $message,
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'lang_save'                                     
        => lang('save')