[Phpgroupware-cvs] property/inc/class.soXport.inc.php, 1.3

[nomail]

Update of /property/inc
Modified Files:
        Branch: 
          class.soXport.inc.php

date: 2004/07/13 20:55:27;  author: sigurdne;  state: Exp;  lines: +9 -3

Log Message:
no message
=====================================================================
Index: property/inc/class.soXport.inc.php
diff -u property/inc/class.soXport.inc.php:1.2 
property/inc/class.soXport.inc.php:1.3
--- property/inc/class.soXport.inc.php:1.2      Wed Jun  2 18:54:28 2004
+++ property/inc/class.soXport.inc.php  Tue Jul 13 20:55:27 2004
@@ -241,10 +241,16 @@
                }
 
                // Velg ut alle hoved bilag som skal overføres
-       function hoved_bilag ($periode)
+       function hoved_bilag ($periode,$pre_transfer='')
        {
-               $sql="select sum(belop) as belop, bilagsnr from fm_ecobilag 
where periode='$periode'  AND budsjettsigndato is not NULL  AND ( saksigndato 
is not NULL  OR oppsynsigndato is not NULL  ) AND utbetalingsigndato is not 
NULL group by bilagsnr";
-//echo 'sql ' . $sql.'<br>';
+                       if($pre_transfer)
+                       {
+                               $sql= "SELECT sum(belop) as belop, bilagsnr 
from fm_ecobilag WHERE pre_transfer IS NULL ";
+                       }
+                       else
+                       {
+                       $sql="select sum(belop) as belop, bilagsnr from 
fm_ecobilag where periode='$periode'  AND budsjettsigndato is not NULL  AND ( 
saksigndato is not NULL  OR oppsynsigndato is not NULL  ) AND 
utbetalingsigndato is not NULL group by bilagsnr";
+               }
 
                        $this->db->query($sql,__LINE__,__FILE__);
                        $i = 0;