[Fmsystem-commits] [9269] property: test invoice export

[Sigurd Nes]

Revision: 9269
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9269
Author:   sigurdne
Date:     2012-05-03 11:21:23 +0000 (Thu, 03 May 2012)
Log Message:
-----------
property: test invoice export

Modified Paths:
--------------
    trunk/property/inc/export/default/Basware_X114

Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114      2012-05-03 11:16:42 UTC 
(rev 9268)
+++ trunk/property/inc/export/default/Basware_X114      2012-05-03 11:21:23 UTC 
(rev 9269)
@@ -99,11 +99,11 @@
                {
                        
if(isset($this->config->config_data['common']['invoice_approval']) && 
$this->config->config_data['common']['invoice_approval']== 1)
                        {
-                               $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr 
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr = 
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR 
(budsjettsigndato IS NOT NULL AND utbetalingsigndato IS NOT NULL) ORDER BY 
bilagsnr ASC";
+                               $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr 
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr = 
fm_ecobilag_sum_view.bilagsnr WHERE approved_amount = '0.00' OR 
budsjettsigndato IS NOT NULL ORDER BY bilagsnr ASC";
                        }
                        else
                        {
-                               $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr 
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr = 
fm_ecobilag_sum_view.bilagsnr WHERE  approved_amount = '0.00' OR ( 
budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR oppsynsigndato IS 
NOT NULL) AND utbetalingsigndato IS NOT NULL ) ORDER BY bilagsnr ASC";
+                               $sql= "SELECT DISTINCT fm_ecobilag.bilagsnr 
FROM fm_ecobilag {$this->join} fm_ecobilag_sum_view ON fm_ecobilag.bilagsnr = 
fm_ecobilag_sum_view.bilagsnr WHERE  approved_amount = '0.00' OR ( 
budsjettsigndato IS NOT NULL AND (saksigndato IS NOT NULL OR oppsynsigndato IS 
NOT NULL) ) ORDER BY bilagsnr ASC";
                        }
                        $this->db->query($sql,__LINE__,__FILE__);
                        $vouchers_step1 = array();
@@ -116,7 +116,7 @@
                        $vouchers = array();
                        foreach($vouchers_step1 as $bilagsnr)
                        {
-                               $sql = "SELECT_ bilagsnr FROM fm_ecobilag WHERE 
bilagsnr = {$bilagsnr} AND budsjettsigndato IS NULL";
+                               $sql = "SELECT bilagsnr FROM fm_ecobilag WHERE 
bilagsnr = {$bilagsnr} AND budsjettsigndato IS NULL";
                                $this->db->query($sql,__LINE__,__FILE__);
                                if( !$this->db->next_record() )
                                {