[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php,1.20,1.21 class.soinvoice.inc.php,1.29,1.30 class.soXport.inc.php,1.29,1.30

[Sigurd Nes <address@hidden>]

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

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

Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.boinvoice.inc.php     2 Jul 2003 11:32:56 -0000       1.20
--- class.boinvoice.inc.php     2 Jul 2003 22:26:28 -0000       1.21
***************
*** 318,326 ****
                                                $transfer_date="Null";
                                        }
  
                                        if (! $local_error)
                                        {
  
!                                               $sql= "update fm_ecobilag set 
$blank_date $kommma_blank $sign_field $sign_id $kommma $sign_date_field 
$sign_date $kommma $transfer_sign_field $transfer_id $transfer_date_field 
$transfer_date ,kreditnota='$wait_for_kreditnota'  where 
bilagsnr='$voucher_id'";
                                                
$GLOBALS['phpgw']->db->query($sql);
  //                                    echo $sql.'<br>';
--- 318,330 ----
                                                $transfer_date="Null";
                                        }
+                                       else
+                                       {
+                                               $wait_for_kreditnota='NULL';
+                                       }
  
                                        if (! $local_error)
                                        {
  
!                                               $sql= "update fm_ecobilag set 
$blank_date $kommma_blank $sign_field $sign_id $kommma $sign_date_field 
$sign_date $kommma $transfer_sign_field $transfer_id $transfer_date_field 
$transfer_date ,kreditnota=$wait_for_kreditnota  where bilagsnr='$voucher_id'";
                                                
$GLOBALS['phpgw']->db->query($sql);
  //                                    echo $sql.'<br>';

Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.soinvoice.inc.php     2 Jul 2003 18:57:47 -0000       1.29
--- class.soinvoice.inc.php     2 Jul 2003 22:26:28 -0000       1.30
***************
*** 594,598 ****
                                        }
  
!                                       $GLOBALS['phpgw']->db->query("update 
fm_ecobilag set  $dima_field , $dimd_field, mvakode = '$tax_code',spbudact_code 
= '$budget_account' where id='$id'");
  
                                        $receipt['message'][] = 
array('msg'=>lang('Voucher is updated '));
--- 594,598 ----
                                        }
  
!                                       $GLOBALS['phpgw']->db->query("update 
fm_ecobilag set $dima_field , $dimd_field, mvakode = '$tax_code',spbudact_code 
= '$budget_account' where id='$id'");
  
                                        $receipt['message'][] = 
array('msg'=>lang('Voucher is updated '));

Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.soXport.inc.php       2 Jul 2003 18:57:47 -0000       1.29
--- class.soXport.inc.php       2 Jul 2003 22:26:28 -0000       1.30
***************
*** 255,258 ****
--- 255,259 ----
                                $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');
***************
*** 369,372 ****
--- 370,374 ----
                        $spbudact_code=$BilagOverf['spbudact_code'];
                        $dima=$BilagOverf['dima'];
+                       $loc1=$BilagOverf['loc1'];
                        $dimd=$BilagOverf['dimd'];
  
***************
*** 394,399 ****
  
  
!                       $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,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',$dimd_value,'$mvakode',$belop,'$periode','$merknad',$utbetalingid_value,'$oppsynsigndato','$saksigndato','$budsjettsigndato','$utbetalingsigndato')";
  
                        $this->db->query($sql,__LINE__,__FILE__);
--- 396,401 ----
  
  
!                       $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__);
***************
*** 429,432 ****
--- 431,435 ----
                        $spvend_code            =       
$oRsOverfBilag['spvend_code'];
                        $dima                           =       
$oRsOverfBilag['dima'];
+                       $loc1                           =       
$oRsOverfBilag['loc1'];
                        $dimb                           =       
$oRsOverfBilag['dimb'];
                        if ($dimb)
***************
*** 475,479 ****
--- 478,501 ----
  
                        $oppsynsigndato         =       
$oRsOverfBilag['oppsynsigndato'];
+                       if ($oppsynsigndato)
+                       {
+                               $oppsynsigndato_value="'$oppsynsigndato'";
+                       }
+                       else
+                       {
+                               $oppsynsigndato_value="Null";
+                       }
+ 
                        $saksigndato            =       
$oRsOverfBilag['saksigndato'];
+                       if ($saksigndato)
+                       {
+                               $saksigndato_value="'$saksigndato'";
+                       }
+                       else
+                       {
+                               $saksigndato_value="Null";
+                       }
+ 
+ 
                        $budsjettsigndato       =       
$oRsOverfBilag['budsjettsigndato'];
                        $merknad                        =       
$oRsOverfBilag['merknad'];
***************
*** 490,495 ****
                        $ordrebelop=$this->bocommon->moneyformat($ordrebelop);
  
!                       $sql="INSERT INTO fm_ecobilagoverf 
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
!                               . "values 
('$id','$bilagsnr','$kidnr','$typeid','$kildeid',$pmwrkord_code_value,$belop,'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',$godkjentbelop,'$spvend_code','$dima',$dimb_value,'$mvakode',$dimd_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$oppsynsigndato','$saksigndato','$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',$ordrebelop,'$overftid')
 ";
                        $this->db->query($sql,__LINE__,__FILE__);
  //echo 'sql ' . $sql.'<br>';
--- 512,517 ----
                        $ordrebelop=$this->bocommon->moneyformat($ordrebelop);
  
!                       $sql="INSERT INTO fm_ecobilagoverf 
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,loc1,dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
!                               . "values 
('$id','$bilagsnr','$kidnr','$typeid','$kildeid',$pmwrkord_code_value,$belop,'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',$godkjentbelop,'$spvend_code','$dima','$loc1',$dimb_value,'$mvakode',$dimd_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid',$oppsynsigndato_value,$saksigndato_value,'$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',$ordrebelop,'$overftid')
 ";
                        $this->db->query($sql,__LINE__,__FILE__);
  //echo 'sql ' . $sql.'<br>';
***************
*** 526,530 ****
                                        $bilagsnr = 
$hoved_bilag_temp[$i]['bilagsnr'];
  
!                                       $sql= "select 
fm_ecobilag.*,fm_ecouser.initials as saksbehandler from fm_ecobilag $this->join 
fm_ecouser on fm_ecobilag.budsjettansvarligid=fm_ecouser.lid where 
bilagsnr='$bilagsnr' ";
                                        
$this->db->query($sql,__LINE__,__FILE__);
  
--- 548,552 ----
                                        $bilagsnr = 
$hoved_bilag_temp[$i]['bilagsnr'];
  
!                                       $sql= "select 
fm_ecobilag.*,fm_ecouser.initials as saksbehandler from fm_ecobilag $this->join 
fm_ecouser on fm_ecobilag.budsjettansvarligid=fm_ecouser.lid where 
bilagsnr=$bilagsnr ";
                                        
$this->db->query($sql,__LINE__,__FILE__);
  
***************
*** 611,614 ****
--- 633,637 ----
                                $underbilag[$i]['spvend_code']  = 
$this->db->f('spvend_code');
                                $underbilag[$i]['dima'] = $this->db->f('dima');
+                               $underbilag[$i]['loc1'] = $this->db->f('loc1');
                                $underbilag[$i]['dimb'] = $this->db->f('dimb');
                                $underbilag[$i]['mvakode']      = 
$this->db->f('mvakode');
***************
*** 750,754 ****
                {
                        $tid=date($this->datetimeformat);
!               $sql= "insert fm_ecologg (batchid,melding,tid) values 
('$batchid','Start transfer','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
        }
--- 773,777 ----
                {
                        $tid=date($this->datetimeformat);
!               $sql= "insert into fm_ecologg (batchid,melding,tid) values 
('$batchid','Start transfer','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
        }
***************
*** 756,760 ****
                {
                        $tid=date($this->datetimeformat);
!               $sql= "insert fm_ecologg (batchid,melding,tid) values 
('$batchid','End transfer','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
        }
--- 779,783 ----
                {
                        $tid=date($this->datetimeformat);
!               $sql= "insert into fm_ecologg (batchid,melding,tid) values 
('$batchid','End transfer','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
        }
***************
*** 763,767 ****
                {
                        $tid=date($this->datetimeformat);
!               $sql= "insert fm_ecologg 
(batchid,ecobilagid,status,melding,tid) values 
('$batchid',NULL,0,'$error_desr','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
        }
--- 786,790 ----
                {
                        $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__);
        }
***************
*** 772,776 ****
                        $message=lang('Invoice tranferred');
                        $tid=date($this->datetimeformat);
!                       $sql= "insert fm_ecologg 
(batchid,ecobilagid,melding,tid) values ('$batchid','$bilagid' 
,'$message','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
                }
--- 795,799 ----
                        $message=lang('Invoice tranferred');
                        $tid=date($this->datetimeformat);
!                       $sql= "insert into fm_ecologg 
(batchid,ecobilagid,melding,tid) values ('$batchid','$bilagid' 
,'$message','$tid')";
                        $this->db->query($sql,__LINE__,__FILE__);
                }