[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.76, 1.77 class.soXport.inc.php, 1.35, 1.36

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bocommon.inc.php class.soXport.inc.php 
Log Message:
no message

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** class.bocommon.inc.php      18 Sep 2003 14:00:49 -0000      1.76
--- class.bocommon.inc.php      21 Sep 2003 07:31:42 -0000      1.77
***************
*** 66,71 ****
                                        break;
                                case 'pgsql':
!                                       $this->dateformat               = "F j, 
Y";
!                                       $this->datetimeformat   = "F j, Y g:iA";
                                        break;
                        }
--- 66,73 ----
                                        break;
                                case 'pgsql':
!                                       $this->dateformat               = 
"Y-m-d";
!                                       $this->datetimeformat   = "Y-m-d G:i:s";
! //                                    $this->dateformat               = "F j, 
Y";
! //                                    $this->datetimeformat   = "F j, Y g:iA";
                                        break;
                        }

Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.soXport.inc.php       18 Sep 2003 14:00:49 -0000      1.35
--- class.soXport.inc.php       21 Sep 2003 07:31:42 -0000      1.36
***************
*** 210,413 ****
                }
  
-               function select_periods_with_invoice_to_transfer()
-               {
-                       $sql= "SELECT DISTINCT periode from fm_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__);
-                       while ($this->db->next_record())
-                       {
-                               $periode[]      = $this->db->f('periode');
-                       }
-                       return $periode;
-               }
- 
-               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 fm_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>';
- 
-                       $i = 0;
-                       while ($this->db->next_record())
-                       {
-                               $invoice_roleback[$i]['id']     = 
$this->db->f('id');
-                               $invoice_roleback[$i]['bilagsnr']       = 
$this->db->f('bilagsnr');
-                               $invoice_roleback[$i]['kidnr']  = 
$this->db->f('kidnr');
-                               $invoice_roleback[$i]['typeid'] = 
$this->db->f('typeid');
-                               $invoice_roleback[$i]['kildeid']        = 
$this->db->f('kildeid');
-                               $invoice_roleback[$i]['pmwrkord_code']  = 
$this->db->f('pmwrkord_code');
-                               $invoice_roleback[$i]['belop']  = 
$this->db->f('belop');
-                               $invoice_roleback[$i]['fakturadato']    = 
$this->db->f('fakturadato');
-                               $invoice_roleback[$i]['periode']        = 
$this->db->f('periode');
-                               $invoice_roleback[$i]['forfallsdato']   = 
$this->db->f('forfallsdato');
-                               $invoice_roleback[$i]['fakturanr']      = 
$this->db->f('fakturanr');
-                               $invoice_roleback[$i]['spbudact_code']  = 
$this->db->f('spbudact_code');
-                               $invoice_roleback[$i]['regtid'] = 
$this->db->f('regtid');
-               //              $invoice_roleback[$i]['overftid']       = 
$this->db->f('overftid');
-                               $invoice_roleback[$i]['artid']  = 
$this->db->f('artid');
-                               $invoice_roleback[$i]['godkjentbelop']  = 
$this->db->f('godkjentbelop');
-                               $invoice_roleback[$i]['spvend_code']    = 
$this->db->f('spvend_code');
-                               $invoice_roleback[$i]['dima']   = 
$this->db->f('dima');
-                               $invoice_roleback[$i]['loc1']   = 
$this->db->f('loc1');
-                               $invoice_roleback[$i]['dimb']   = 
$this->db->f('dimb');
-                               $invoice_roleback[$i]['mvakode']        = 
$this->db->f('mvakode');
-                               $invoice_roleback[$i]['dimd']   = 
$this->db->f('dimd');
-                               if($this->db->f('oppsynsmannid'))
-                               {
-                                       $invoice_roleback[$i]['oppsynsmannid']  
= $this->db->f('oppsynsmannid');
-                               }
-                               if($this->db->f('saksbehandlerid'))
-                               {
-                                       
$invoice_roleback[$i]['saksbehandlerid']        = 
$this->db->f('saksbehandlerid');
-                               }
- 
-                               $invoice_roleback[$i]['budsjettansvarligid']    
= $this->db->f('budsjettansvarligid');
- 
-                               if($this->db->f('oppsynsigndato'))
-                               {
-                                       $invoice_roleback[$i]['oppsynsigndato'] 
= $this->db->f('oppsynsigndato');
-                               }
-                               if($this->db->f('saksigndato'))
-                               {
-                                       $invoice_roleback[$i]['saksigndato']    
= $this->db->f('saksigndato');
-                               }
- 
-                               $invoice_roleback[$i]['budsjettsigndato']       
= $this->db->f('budsjettsigndato');
-                               $invoice_roleback[$i]['merknad']        = 
$this->db->f('merknad');
-                               $invoice_roleback[$i]['splitt'] = 
$this->db->f('splitt');
-                               $invoice_roleback[$i]['ordrebelop']     = 
$this->db->f('ordrebelop');
-               //              $invoice_roleback[$i]['filnavn']        = 
$this->db->f('filnavn');
-                               $invoice_roleback[$i]['utbetalingid']   = 
$this->db->f('utbetalingid');
-                               $invoice_roleback[$i]['utbetalingsigndato']     
= $this->db->f('utbetalingsigndato');
-                               $i++;
-                       }
- //                    print_r($invoice_roleback);
-                       return $invoice_roleback;
-       }
- 
-               //roleback function
-               function bilag_update_overf($BilagOverf)
-               {
- 
-                       //remove the id-field (which has to be first)from the 
array
-                       //array_shift ($BilagOverf);
-                       //$BilagOverf = array_splice ($BilagOverf,0,1);
- 
-                       //$bilag_field_values = "'" . implode("','", 
$BilagOverf)."'";
-                       //$bilag_field_names = implode(",", 
array_keys($BilagOverf));
- 
-                       $pmwrkord_code=$BilagOverf['pmwrkord_code'];
-                       if ($pmwrkord_code)
-                       {
-                               $pmwrkord_code_value="'$pmwrkord_code'";
-                       }
-                       else
-                       {
-                               $pmwrkord_code_value="Null";
-                       }
-                       $bilagsnr=$BilagOverf['bilagsnr'];
-                       $splitt=$BilagOverf['splitt'];
-                       $kildeid=$BilagOverf['kildeid'];
-                       $kidnr=$BilagOverf['kidnr'];
-                       $typeid=$BilagOverf[typeid];
-                       $fakturadato=$BilagOverf['fakturadato'];
-                       $forfallsdato=$BilagOverf['forfallsdato'];
-                       $regtid=$BilagOverf['regtid'];
-                       $artid=$BilagOverf['artid'];
-                       $godkjentbelop=$BilagOverf['godkjentbelop'];
-                       $spvend_code=$BilagOverf['spvend_code'];
-                       $dimb=$BilagOverf['dimb'];
-                       if ($dimb)
-                       {
-                               $dimb_value="'$dimb'";
-                       }
-                       else
-                       {
-                               $dimb_value="Null";
-                       }
- 
-                       $oppsynsmannid=$BilagOverf['oppsynsmannid'];
- 
-                       if ($oppsynsmannid)
-                       {
-                               $oppsynsmannid_value="'$oppsynsmannid'";
-                       }
-                       else
-                       {
-                               $oppsynsmannid_value="Null";
-                       }
- 
-                       $saksbehandlerid=$BilagOverf['saksbehandlerid'];
-                       if ($saksbehandlerid)
-                       {
-                               $saksbehandlerid_value="'$saksbehandlerid'";
-                       }
-                       else
-                       {
-                               $saksbehandlerid_value="Null";
-                       }
- 
-                       $budsjettansvarligid=$BilagOverf['budsjettansvarligid'];
- 
-                       $utbetalingid=$BilagOverf['utbetalingid'];
- 
-                       if ($utbetalingid)
-                       {
-                               $utbetalingid_value="'$utbetalingid'";
-                       }
-                       else
-                       {
-                               $utbetalingid_value="Null";
-                       }
- 
-                       $fakturanr=$BilagOverf['fakturanr'];
-                       $spbudact_code=$BilagOverf['spbudact_code'];
-                       $dima=$BilagOverf['dima'];
-                       $loc1=$BilagOverf['loc1'];
-                       $dimd=$BilagOverf['dimd'];
- 
-                       if ($dimd)
-                       {
-                               $dimd_value="'$dimd'";
-                       }
-                       else
-                       {
-                               $dimd_value="Null";
-                       }
- 
- 
-                       $mvakode=$BilagOverf['mvakode'];
-                       $belop=$BilagOverf['belop'];
-                       $periode=$BilagOverf['periode'];
-                       $merknad=$BilagOverf['merknad'];
-                       $oppsynsigndato=$BilagOverf['oppsynsigndato'];
-                       $saksigndato=$BilagOverf['saksigndato'];
-                       $budsjettsigndato=$BilagOverf['budsjettsigndato'];
-                       $utbetalingsigndato=$BilagOverf['utbetalingsigndato'];
- 
-                       $belop=$this->bocommon->moneyformat($belop);
-                       
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
- 
- 
-                       $sql= "INSERT INTO fm_ecobilag 
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,loc1,dimd,mvakode,belop,periode,merknad,utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
-                       . " values 
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr','$spbudact_code','$dima','$loc1',$dimd_value,'$mvakode',$belop,'$periode','$merknad',$utbetalingid_value,'$oppsynsigndato','$saksigndato','$budsjettsigndato','$utbetalingsigndato')";
- 
-                       $this->db->query($sql,__LINE__,__FILE__);
- 
-               }
- 
                function add_OverfBilag ($oRsOverfBilag)
                {
--- 210,213 ----
***************
*** 676,694 ****
                }
  
-               // Hent leverandørklasse
- 
-               function select_vendor_class($spvend_code)
-               {
-       //              $sql= "select pmlabor_code from spvend where 
spvend_code='$spvend_code'";
-       //              $sql= "select klasse from bokalk_leverandoerer where 
resknr='$spvend_code'";
- 
-                       $sql= "select contact_value from 
phpgw_addressbook_extra where contact_id=$spvend_code and 
contact_name='klasse'";
-                       $this->db->query($sql,__LINE__,__FILE__);
-                       $this->db->next_record();
-                       $pmlabor_code = $this->db->f('contact_value');
- 
-                       return $pmlabor_code;
-               }
- 
  /*            function update_avvik($avvik)
                {
--- 476,479 ----
***************
*** 746,780 ****
                        return $dimc;
                }
- 
-               //Oppdater beløp på arbeidsordre operator="-" ved tilbakerulling
-               function 
correct_actual_cost($pmwrkord_code,$Belop,$actual_cost_field,$operator)
-               {
-                       $Belop=$Belop/100;
- 
-                       $sql="update fm_workorder set 
$actual_cost_field=$actual_cost_field $operator $Belop where 
id='$pmwrkord_code'";
-                       $this->db->query($sql,__LINE__,__FILE__);
-               }
- 
- 
- //Lagre start melding
-               function log_start($batchid)
-               {
-                       $tid=date($this->datetimeformat);
-               $sql= "insert into fm_ecologg (batchid,melding,tid) values 
('$batchid','Start transfer','$tid')";
-                       $this->db->query($sql,__LINE__,__FILE__);
-       }
-               function log_end($batchid)
-               {
-                       $tid=date($this->datetimeformat);
-               $sql= "insert into fm_ecologg (batchid,melding,tid) values 
('$batchid','End transfer','$tid')";
-                       $this->db->query($sql,__LINE__,__FILE__);
-       }
- 
-               function log_error($batchid,$error_desr)
-               {
-                       $tid=date($this->datetimeformat);
-               $sql= "insert into fm_ecologg 
(batchid,ecobilagid,status,melding,tid) values 
('$batchid',NULL,0,'$error_desr','$tid')";
-                       $this->db->query($sql,__LINE__,__FILE__);
-       }
  
                //Logg transaksjon
--- 531,534 ----