[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.sogab.inc.php, 1.15, 1.16 cla
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.sogab.inc.php, 1.15, 1.16 class.soinvoice.inc.php, 1.33, 1.34 class.soXport.inc.php, 1.32, 1.33 class.uiadmin.inc.php, 1.17, 1.18 |
Date: |
Mon, 01 Sep 2003 15:26:57 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23087/inc
Modified Files:
class.sogab.inc.php class.soinvoice.inc.php
class.soXport.inc.php class.uiadmin.inc.php
Log Message:
no message
Index: class.sogab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sogab.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.sogab.inc.php 30 Aug 2003 22:04:46 -0000 1.15
--- class.sogab.inc.php 1 Sep 2003 19:26:54 -0000 1.16
***************
*** 99,103 ****
}
! $sql = "SELECT distinct gab_id,count(gab_id) as hits,
loc1_name as address FROM fm_gab_location $this->join fm_location1 on
fm_gab_location.loc1=fm_location1.loc1 $filtermethod GROUP BY gab_id,loc1_name
";
$this->db2->query($sql,__LINE__,__FILE__);
--- 99,103 ----
}
! $sql = "SELECT gab_id,count(gab_id) as hits, loc1_name
as address FROM fm_gab_location $this->join fm_location1 on
fm_gab_location.loc1=fm_location1.loc1 $filtermethod GROUP BY gab_id,loc1_name
";
$this->db2->query($sql,__LINE__,__FILE__);
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.soinvoice.inc.php 27 Jul 2003 15:53:24 -0000 1.33
--- class.soinvoice.inc.php 1 Sep 2003 19:26:54 -0000 1.34
***************
*** 141,145 ****
$filtermethod .= " $where overftid
>'$start_date' and overftid < '$end_date'";
}
-
}
else
--- 141,144 ----
***************
*** 159,165 ****
$sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop,spvend_code,fakturadato FROM $table
$filtermethod $querymethod group by bilagsnr,spvend_code,fakturadato ";
//echo $sql;
! $this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
--- 158,165 ----
$sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop,spvend_code,fakturadato FROM $table
$filtermethod $querymethod group by bilagsnr,spvend_code,fakturadato ";
+ $sql2 = "SELECT DISTINCT bilagsnr FROM $table
$filtermethod $querymethod";
//echo $sql;
! $this->db2->query($sql2,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
***************
*** 185,194 ****
if ($temp)
{
$i = 0;
foreach($temp as $invoice_temp)
{
-
- $role= $this->check_role();
-
$voucher_id=$invoice_temp['voucher_id'];
--- 185,192 ----
if ($temp)
{
+ $role= $this->check_role();
$i = 0;
foreach($temp as $invoice_temp)
{
$voucher_id=$invoice_temp['voucher_id'];
***************
*** 208,212 ****
$timestamp_payment_date=
mktime(0,0,0,date(m,strtotime($this->db->f('forfallsdato'))),date(d,strtotime($this->db->f('forfallsdato'))),date(y,strtotime($this->db->f('forfallsdato'))));
-
if($this->db->f('oppsynsmannid') &&
$this->db->f('oppsynsigndato'))
{
--- 206,209 ----
***************
*** 803,807 ****
function select_account_class()
{
! $sql = "SELECT distinct grouping as id from
fm_b_account ";
$this->db->query($sql,__LINE__,__FILE__);
--- 800,804 ----
function select_account_class()
{
! $sql = "SELECT DISTINCT grouping as id from
fm_b_account ";
$this->db->query($sql,__LINE__,__FILE__);
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.soXport.inc.php 7 Aug 2003 16:08:59 -0000 1.32
--- class.soXport.inc.php 1 Sep 2003 19:26:54 -0000 1.33
***************
*** 212,216 ****
function select_periods_with_invoice_to_transfer()
{
! $sql= "select distinct periode from fm_ecobilag where
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is
not null) and utbetalingsigndato is not null ";
$this->db->query($sql,__LINE__,__FILE__);
$i = 0;
--- 212,216 ----
function select_periods_with_invoice_to_transfer()
{
! $sql= "SELECT DISTINCT periode from fm_ecobilag where
budsjettsigndato is not null and (saksigndato is not null or oppsynsigndato is
not null) and utbetalingsigndato is not null ";
$this->db->query($sql,__LINE__,__FILE__);
$i = 0;
***************
*** 686,693 ****
// $sql= "select klasse from bokalk_leverandoerer where
resknr='$spvend_code'";
! $sql= "select contact_value from
phpgw_addressbook_extra where contact_id='$spvend_code' and
contact_name='klasse'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
! $pmlabor_code = $this->db->f('klasse');
return $pmlabor_code;
--- 686,693 ----
// $sql= "select klasse from bokalk_leverandoerer where
resknr='$spvend_code'";
! $sql= "select contact_value from
phpgw_addressbook_extra where contact_id=$spvend_code and
contact_name='klasse'";
$this->db->query($sql,__LINE__,__FILE__);
$this->db->next_record();
! $pmlabor_code = $this->db->f('contact_value');
return $pmlabor_code;
Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uiadmin.inc.php 5 Aug 2003 13:32:39 -0000 1.17
--- class.uiadmin.inc.php 1 Sep 2003 19:26:55 -0000 1.18
***************
*** 282,286 ****
'account_id'
=> $user['account_id'],
'lid'
=> $user['account_lid'],
! 'name'
=> $user['account_firstname'] . ' ' .
$user['account_lastname'],
'read_right'
=> $user['right'][1],
'add_right'
=> $user['right'][2],
--- 282,286 ----
'account_id'
=> $user['account_id'],
'lid'
=> $user['account_lid'],
! 'name'
=> $user['account_firstname'] . ' ' .
$user['account_lastname'] . ' [' . $user['account_lid'] . ']',
'read_right'
=> $user['right'][1],
'add_right'
=> $user['right'][2],
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.sogab.inc.php, 1.15, 1.16 class.soinvoice.inc.php, 1.33, 1.34 class.soXport.inc.php, 1.32, 1.33 class.uiadmin.inc.php, 1.17, 1.18,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.128, 1.129
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.70, 1.71 class.boinvoice.inc.php, 1.23, 1.24 class.botts.inc.php, 1.17, 1.18 class.soinvoice.inc.php, 1.34, 1.35 class.uilocation.inc.php, 1.27, 1.28 hook_settings.inc.php, 1.8, 1.9
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php, 1.128, 1.129
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.70, 1.71 class.boinvoice.inc.php, 1.23, 1.24 class.botts.inc.php, 1.17, 1.18 class.soinvoice.inc.php, 1.34, 1.35 class.uilocation.inc.php, 1.27, 1.28 hook_settings.inc.php, 1.8, 1.9
- Index(es):