[Phpgroupware-cvs] CVS: property/inc class.soXport.inc.php,1.6,1.6.2.1 class.uiXport.inc.php,1.3.2.1,1.3.2.2 functions.inc.php,1.9,1.9.2.1

[Sigurd Nes <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.soXport.inc.php class.uiXport.inc.php functions.inc.php 
Log Message:
no message

Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** class.soXport.inc.php       11 Nov 2002 21:34:33 -0000      1.6
--- class.soXport.inc.php       29 Jan 2003 22:16:12 -0000      1.6.2.1
***************
*** 224,230 ****
                        $periode=$fields['periode'];
                        $merknad=$fields['merknad'];
! 
!                       $sql= "INSERT INTO t_ecobilag 
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad)"
!                       . " values 
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$dima',$dimd_value,'$mvakode',CONVERT(MONEY,"."'$belop'".",0),'$periode','$merknad')";
  
  //echo 'sql'.$sql.'<br>';
--- 224,232 ----
                        $periode=$fields['periode'];
                        $merknad=$fields['merknad'];
!                       if(abs($belop)>0)
!                       {
!                               $sql= "INSERT INTO t_ecobilag 
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad)"
!                               . " values 
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',CONVERT(MONEY,"."'$godkjentbelop'".",0),'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$dima',$dimd_value,'$mvakode',CONVERT(MONEY,"."'$belop'".",0),'$periode','$merknad')";
!                       }
  
  //echo 'sql'.$sql.'<br>';

Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** class.uiXport.inc.php       2 Dec 2002 18:35:03 -0000       1.3.2.1
--- class.uiXport.inc.php       29 Jan 2003 22:16:12 -0000      1.3.2.2
***************
*** 45,48 ****
--- 45,49 ----
                        
$budget_responsible,$num_days,$sday,$smonth,$syear,$eday,$emonth,$eyear,$sdate,$edate,$cancel;
  
+ //echo 'tsvfile: '.$tsvfile.'<br>';
                        if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
                        {
***************
*** 465,471 ****
  //                            echo 'fil_katalog: '.$fil_katalog .'<br>';
  
!                               $dir_handle = opendir($fil_katalog);
                                $i=0; $myfilearray = '';
!                               while ($file = readdir($dir_handle))
                                {
                                        if ((substr($file, 0, 1) != '.') && 
is_file($fil_katalog . SEP . $file) )
--- 466,472 ----
  //                            echo 'fil_katalog: '.$fil_katalog .'<br>';
  
!                               $dir_handle = @opendir($fil_katalog);
                                $i=0; $myfilearray = '';
!                               while ($file = @readdir($dir_handle))
                                {
                                        if ((substr($file, 0, 1) != '.') && 
is_file($fil_katalog . SEP . $file) )
***************
*** 475,479 ****
                                        }
                                }
!                               closedir($dir_handle);
                                @sort($myfilearray);
                                for ($i=0;$i<count($myfilearray);$i++)
--- 476,480 ----
                                        }
                                }
!                               @closedir($dir_handle);
                                @sort($myfilearray);
                                for ($i=0;$i<count($myfilearray);$i++)

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/Attic/functions.inc.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -r1.9 -r1.9.2.1
*** functions.inc.php   11 Nov 2002 21:34:33 -0000      1.9
--- functions.inc.php   29 Jan 2003 22:16:12 -0000      1.9.2.1
***************
*** 223,227 ****
        function increment_wrkorderid($next_id)
        {
!               $GLOBALS['phpgw']->db->query("update idgenerator set 
value='$next_id' where name='workorder'");
        }
  
--- 223,227 ----
        function increment_wrkorderid($next_id)
        {
!               $GLOBALS['phpgw']->db->query("update idgenerator set value= 
'$next_id' where name='workorder'");
        }