[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10660] property: budget listing
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [10660] property: budget listing |
Date: |
Thu, 10 Jan 2013 11:44:05 +0000 |
Revision: 10660
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10660
Author: sigurdne
Date: 2013-01-10 11:44:05 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
property: budget listing
Modified Paths:
--------------
trunk/property/inc/class.sobudget.inc.php
Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2013-01-10 08:38:51 UTC (rev
10659)
+++ trunk/property/inc/class.sobudget.inc.php 2013-01-10 11:44:05 UTC (rev
10660)
@@ -148,13 +148,14 @@
if($query)
{
$query = $this->db->db_addslashes($query);
- $querymethod = " $where ( descr $this->like
'%$query%') OR fm_budget.b_account_id='$query'";
+ $querymethod = " $where ( descr {$this->like}
'%$query%' OR fm_budget.b_account_id='$query')";
}
- $sql = "SELECT fm_budget.*, fm_budget.category as
cat_id, ecodimb, descr,fm_b_account.category as grouping FROM fm_budget
{$this->join} fm_b_account ON fm_budget.b_account_id = fm_b_account.id
$filtermethod $querymethod";
+ $sql = "SELECT fm_budget.*, fm_budget.category as
cat_id, ecodimb, descr,fm_b_account.category as grouping"
+ . " FROM fm_budget {$this->join} fm_b_account ON
fm_budget.b_account_id = fm_b_account.id"
+ . " $filtermethod $querymethod";
-
if($GLOBALS['phpgw_info']['server']['db_type']=='postgres')
{
$sql_count = 'SELECT count(id) as cnt,
sum(budget_cost) AS sum_budget_cost FROM (SELECT DISTINCT fm_budget.id,
budget_cost '. substr($sql,strripos($sql,'FROM')) .') AS t';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10660] property: budget listing,
Sigurd Nes <=