[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/class.sopricebook.php, 1.1.1.8
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/class.sopricebook.php, 1.1.1.8 |
Date: |
Sun, 23 May 2004 02:38:17 -0000 |
Update of /property
Modified Files:
Branch:
class.sopricebook.php
date: 2004/04/30 09:52:25; author: sigurdne; state: Exp; lines: +11 -11
Log Message:
no message
=====================================================================
Index: property/class.sopricebook.php
diff -u property/class.sopricebook.php:1.1.1.7
property/class.sopricebook.php:1.1.1.8
--- property/class.sopricebook.php:1.1.1.7 Thu Apr 29 07:10:49 2004
+++ property/class.sopricebook.php Fri Apr 30 09:52:25 2004
@@ -70,10 +70,10 @@
function get_vendor_list()
{
- $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT
phpgw_addressbook.org_name ,vendor_id "
- . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join phpgw_addressbook ON
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
- . " GROUP by phpgw_addressbook.org_name
,vendor_id "
- . " ORDER BY phpgw_addressbook.org_name ");
+ $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT
fm_addressbook.org_name ,vendor_id "
+ . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join fm_addressbook ON
fm_activity_price_index.vendor_id = fm_addressbook.id "
+ . " GROUP by fm_addressbook.org_name ,vendor_id
"
+ . " ORDER BY fm_addressbook.org_name ");
while (!$dbresult->EOF)
{
//--------->fix this------->
@@ -201,7 +201,7 @@
}
else
{
- $ordermethod = ' order by
phpgw_addressbook.org_name,activity_id';
+ $ordermethod = ' order by
fm_addressbook.org_name,activity_id';
}
if ($cat_id > 0)
@@ -222,8 +222,8 @@
$querymethod = " AND (fm_activities.descr LIKE
'%$query%' or fm_activities.num LIKE '%$query%')";
}
- $sql = "SELECT
fm_activities.num,fm_activities.unit,fm_activities.dim_d,fm_activities.ns3420,fm_activities.descr
as descr, fm_activities.base_descr,activity_id,
phpgw_addressbook.org_name,fm_branch.descr as branch
,vendor_id,total_cost,m_cost,w_cost,index_count,fm_activity_price_index.this_index
"
- . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join phpgw_addressbook ON
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
+ $sql = "SELECT
fm_activities.num,fm_activities.unit,fm_activities.dim_d,fm_activities.ns3420,fm_activities.descr
as descr, fm_activities.base_descr,activity_id,
fm_addressbook.org_name,fm_branch.descr as branch
,vendor_id,total_cost,m_cost,w_cost,index_count,fm_activity_price_index.this_index
"
+ . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join fm_addressbook ON
fm_activity_price_index.vendor_id = fm_addressbook.id "
. " $this->join fm_branch ON
fm_activities.branch_id = fm_branch.id "
. " WHERE (vendor_id $vendor_condition and
current_index is not null "
. " OR (fm_activity_price_index.vendor_id
$vendor_condition) AND (fm_activity_price_index.this_index IS NULL))
$querymethod";
@@ -556,7 +556,7 @@
}
else
{
- $ordermethod = " order by
phpgw_addressbook.org_name asc";
+ $ordermethod = " order by
fm_addressbook.org_name asc";
}
if ($cat_id > 0)
@@ -572,11 +572,11 @@
$query = ereg_replace("'",'',$query);
$query = ereg_replace('"','',$query);
- $querymethod = " AND
(phpgw_addressbook.org_name LIKE '%$query%' or vendor_id LIKE '%$query%')";
+ $querymethod = " AND (fm_addressbook.org_name
LIKE '%$query%' or vendor_id LIKE '%$query%')";
}
- $sql = "SELECT fm_activities.id as
activity_id,fm_activities.num, phpgw_addressbook.org_name,fm_branch.descr as
branch ,vendor_id "
- . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join phpgw_addressbook ON
fm_activity_price_index.vendor_id = phpgw_addressbook.id "
+ $sql = "SELECT fm_activities.id as
activity_id,fm_activities.num, fm_addressbook.org_name,fm_branch.descr as
branch ,vendor_id "
+ . " FROM (fm_activities $this->join
fm_activity_price_index ON fm_activities.id =
fm_activity_price_index.activity_id) $this->join fm_addressbook ON
fm_activity_price_index.vendor_id = fm_addressbook.id "
. " $this->join fm_branch on fm_branch.id =
fm_activities.branch_id "
. " Where fm_activity_price_index.activity_id=
'$activity_id' $querymethod group by
fm_activities.id,fm_activities.num,fm_branch.descr,org_name ,vendor_id ";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/class.sopricebook.php, 1.1.1.8,
nomail <=