[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.26,1.27 c
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.26,1.27 class.solocation.inc.php,1.16,1.17 class.soXport.inc.php,1.26,1.27 |
Date: |
Mon, 30 Jun 2003 15:18:37 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv13949/inc
Modified Files:
class.soinvoice.inc.php class.solocation.inc.php
class.soXport.inc.php
Log Message:
no message
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.soinvoice.inc.php 29 Jun 2003 15:43:11 -0000 1.26
--- class.soinvoice.inc.php 30 Jun 2003 19:18:34 -0000 1.27
***************
*** 199,203 ****
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
! . " forfallsdato,periode,artid,kidnr ";
$this->db->query($sql,__LINE__,__FILE__);
--- 199,203 ----
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
! . "
forfallsdato,periode,artid,kidnr,kreditnota ";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 209,213 ****
! if($this->db->f('oppsynsigndato'))
{
$timestamp_jan_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('oppsynsigndato'))),date(d,strtotime($this->db->f('oppsynsigndato'))),date(y,strtotime($this->db->f('oppsynsigndato'))));
--- 209,213 ----
! if($this->db->f('oppsynsmannid'))
{
$timestamp_jan_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('oppsynsigndato'))),date(d,strtotime($this->db->f('oppsynsigndato'))),date(y,strtotime($this->db->f('oppsynsigndato'))));
***************
*** 218,222 ****
$invoice[$i]['jan_date']
='';
}
! if($this->db->f('saksigndato'))
{
$timestamp_super_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('saksigndato'))),date(d,strtotime($this->db->f('saksigndato'))),date(y,strtotime($this->db->f('saksigndato'))));
--- 218,222 ----
$invoice[$i]['jan_date']
='';
}
! if($this->db->f('saksbehandlerid'))
{
$timestamp_super_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('saksigndato'))),date(d,strtotime($this->db->f('saksigndato'))),date(y,strtotime($this->db->f('saksigndato'))));
***************
*** 443,447 ****
{
$select_account_class=',fm_b_account.grouping
as b_account_class';
! $group_account_class=', spbudact_code';
}
--- 443,447 ----
{
$select_account_class=',fm_b_account.grouping
as b_account_class';
! $group_account_class=',
spbudact_code,fm_b_account.grouping';
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.solocation.inc.php 28 Jun 2003 16:11:47 -0000 1.16
--- class.solocation.inc.php 30 Jun 2003 19:18:34 -0000 1.17
***************
*** 22,25 ****
--- 22,26 ----
$this->join = $this->socommon->join;
+ $this->left_join = $this->socommon->left_join;
}
***************
*** 234,238 ****
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['column_name']."))";
$paranthesis .='(';
--- 235,239 ----
if (($config[$i]['location_type'] <= $type_id)
&& ($config[$i]['f_key'] ==1))
{
! $joinmethod .= " $this->left_join " .
$config[$i]['reference_table'] . " ON ( fm_location" .
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" .
$config[$i]['reference_table'] . ".".$config[$i]['column_name']."))";
$paranthesis .='(';
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.soXport.inc.php 28 Jun 2003 16:11:47 -0000 1.26
--- class.soXport.inc.php 30 Jun 2003 19:18:34 -0000 1.27
***************
*** 520,524 ****
$bilagsnr =
$hoved_bilag_temp[$i]['bilagsnr'];
! $sql= "select
fm_ecobilag.*,fm_ecobruker.initialer as saksbehandler from fm_ecobilag
$this->join fm_ecobruker on
fm_ecobilag.budsjettansvarligid=fm_ecobruker.spemp_code where
bilagsnr='$bilagsnr' ";
$this->db->query($sql,__LINE__,__FILE__);
--- 520,524 ----
$bilagsnr =
$hoved_bilag_temp[$i]['bilagsnr'];
! $sql= "select
fm_ecobilag.*,fm_ecouser.initials as saksbehandler from fm_ecobilag $this->join
fm_ecouser on fm_ecobilag.budsjettansvarligid=fm_ecouser.lid where
bilagsnr='$bilagsnr' ";
$this->db->query($sql,__LINE__,__FILE__);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.soinvoice.inc.php,1.26,1.27 class.solocation.inc.php,1.16,1.17 class.soXport.inc.php,1.26,1.27,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.107,1.108
- Next by Date:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_en.lang,1.1.2.4.2.5,1.1.2.4.2.6 phpgw_fr.lang,1.1.2.4.2.4,1.1.2.4.2.5
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.107,1.108
- Next by thread:
[Phpgroupware-cvs] CVS: news_admin/setup phpgw_en.lang,1.1.2.4.2.5,1.1.2.4.2.6 phpgw_fr.lang,1.1.2.4.2.4,1.1.2.4.2.5
- Index(es):