[Fmsystem-commits] [8649] property: add view and alternate approval

[Sigurd Nes]

Revision: 8649
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8649
Author:   sigurdne
Date:     2012-01-23 10:38:14 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
property: add view and alternate approval

Modified Paths:
--------------
    trunk/property/inc/export/default/Basware_X114
    trunk/property/setup/setup.inc.php
    trunk/property/setup/tables_update.inc.php

Modified: trunk/property/inc/export/default/Basware_X114
===================================================================
--- trunk/property/inc/export/default/Basware_X114      2012-01-23 10:20:41 UTC 
(rev 8648)
+++ trunk/property/inc/export/default/Basware_X114      2012-01-23 10:38:14 UTC 
(rev 8649)
@@ -97,11 +97,11 @@
                {
                        
if(isset($this->config->config_data['common']['invoice_approval']) && 
$this->config->config_data['common']['invoice_approval']== 1)
                        {
-                               $sql= 'SELECT DISTINCT bilagsnr from 
fm_ecobilag WHERE 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 AND utbetalingsigndato IS NOT NULL) ORDER BY 
bilagsnr ASC";
                        }
                        else
                        {
-                               $sql= 'SELECT DISTINCT bilagsnr from 
fm_ecobilag WHERE 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) AND utbetalingsigndato IS NOT NULL ) ORDER BY bilagsnr ASC";
                        }
                        $this->db->query($sql,__LINE__,__FILE__);
                        $vouchers = array();

Modified: trunk/property/setup/setup.inc.php
===================================================================
--- trunk/property/setup/setup.inc.php  2012-01-23 10:20:41 UTC (rev 8648)
+++ trunk/property/setup/setup.inc.php  2012-01-23 10:38:14 UTC (rev 8649)
@@ -12,7 +12,7 @@
        */
 
        $setup_info['property']['name']                 = 'property';
-       $setup_info['property']['version']              = '0.9.17.632';
+       $setup_info['property']['version']              = '0.9.17.633';
        $setup_info['property']['app_order']    = 8;
        $setup_info['property']['enable']               = 1;
        $setup_info['property']['app_group']    = 'office';

Modified: trunk/property/setup/tables_update.inc.php
===================================================================
--- trunk/property/setup/tables_update.inc.php  2012-01-23 10:20:41 UTC (rev 
8648)
+++ trunk/property/setup/tables_update.inc.php  2012-01-23 10:38:14 UTC (rev 
8649)
@@ -5796,6 +5796,28 @@
        }
 
        /**
+       * Update property version from 0.9.17.632 to 0.9.17.633
+       * Add view on fm_ecobilag
+       */
+       $test[] = '0.9.17.632';
+       function property_upgrade0_9_17_632()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+               $GLOBALS['phpgw_setup']->oProc->query("DELETE FROM fm_cache");
+
+               $sql = 'CREATE OR REPLACE VIEW fm_ecobilag_sum_view AS'
+                       . ' SELECT DISTINCT bilagsnr, sum(godkjentbelop) AS 
approved_amount, sum(belop) AS amount FROM fm_ecobilag  GROUP BY bilagsnr ORDER 
BY bilagsnr ASC';
+
+               $GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['property']['currentver'] = 
'0.9.17.633';
+                       return $GLOBALS['setup_info']['property']['currentver'];
+               }
+       }
+
+       /**
        * Update property version from 0.9.17.607 to 0.9.17.608
        * Add more room for address at tickets
        *