[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php,1.19,1.20 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php,1.19,1.20 class.soinvoice.inc.php,1.27,1.28 class.soXport.inc.php,1.27,1.28 class.uiinvoice.inc.php,1.27,1.28 |
|
Date: |
Wed, 02 Jul 2003 07:32:59 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26916/inc
Modified Files:
class.boinvoice.inc.php class.soinvoice.inc.php
class.soXport.inc.php class.uiinvoice.inc.php
Log Message:
no message
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.boinvoice.inc.php 28 Jun 2003 16:11:47 -0000 1.19
--- class.boinvoice.inc.php 2 Jul 2003 11:32:56 -0000 1.20
***************
*** 168,171 ****
--- 168,172 ----
$check_count =
$this->so->check_count($voucher_id);
+ //_debug_array($check_count);
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.soinvoice.inc.php 30 Jun 2003 19:18:34 -0000 1.27
--- class.soinvoice.inc.php 2 Jul 2003 11:32:57 -0000 1.28
***************
*** 158,162 ****
! $sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop FROM $table $filtermethod $querymethod
group by bilagsnr";
//echo $sql;
--- 158,162 ----
! $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;
***************
*** 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'))));
--- 209,213 ----
! if($this->db->f('oppsynsmannid') &&
$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'))));
***************
*** 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'))));
--- 218,222 ----
$invoice[$i]['jan_date']
='';
}
! if($this->db->f('saksbehandlerid') &&
$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'))));
***************
*** 228,235 ****
}
! if($this->db->f('budsjettsigndato'))
{
! $timestamp_budget_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('budsjettsigndato'))),date(d,strtotime($this->db->f('budsjettsigndato'))),date(y,strtotime($this->db->f('budsjettsigndato'))));
! $invoice[$i]['budget_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_budget_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
else
--- 228,235 ----
}
! if($this->db->f('budsjettansvarligid')
&& $this->db->f('budsjettsigndato'))
{
! $timestamp_budget_date
=
mktime(0,0,0,date(m,strtotime($this->db->f('budsjettsigndato'))),date(d,strtotime($this->db->f('budsjettsigndato'))),date(y,strtotime($this->db->f('budsjettsigndato'))));
!
$invoice[$i]['budget_date'] =
$GLOBALS['phpgw']->common->show_date($timestamp_budget_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
else
***************
*** 238,245 ****
}
! if($this->db->f('utbetalingsigndato'))
{
$timestamp_transfer_date=
mktime(0,0,0,date(m,strtotime($this->db->f('utbetalingsigndato'))),date(d,strtotime($this->db->f('utbetalingsigndato'))),date(y,strtotime($this->db->f('utbetalingsigndato'))));
! $invoice[$i]['transfer_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_voucher_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
else
--- 238,245 ----
}
! if($this->db->f('utbetalingid') &&
$this->db->f('utbetalingsigndato'))
{
$timestamp_transfer_date=
mktime(0,0,0,date(m,strtotime($this->db->f('utbetalingsigndato'))),date(d,strtotime($this->db->f('utbetalingsigndato'))),date(y,strtotime($this->db->f('utbetalingsigndato'))));
! $invoice[$i]['transfer_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_transfer_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
else
***************
*** 263,267 ****
$invoice[$i]['budget_responsible']
= $this->db->f('budsjettansvarligid');
$invoice[$i]['transfer_id']
= $this->db->f('utbetalingid');
! $invoice[$i]['voucher_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_transfer_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['payment_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_payment_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['period']
= $this->db->f('periode');
--- 263,267 ----
$invoice[$i]['budget_responsible']
= $this->db->f('budsjettansvarligid');
$invoice[$i]['transfer_id']
= $this->db->f('utbetalingid');
! $invoice[$i]['voucher_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_voucher_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['payment_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_payment_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$invoice[$i]['period']
= $this->db->f('periode');
***************
*** 640,645 ****
{
- $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
-
$this->db->query("select count(dima) as dima_count ,
count(spbudact_code) as spbudact_code_count from fm_ecobilag where bilagsnr
='$voucher_id'");
$this->db->next_record();
--- 640,643 ----
***************
*** 647,651 ****
$check_count=array(
'dima_count' =>
$this->db->f('dima_count'),
! 'spbudact_code_count' =>
$this->db->f('spbudact_code_count')
);
--- 645,649 ----
$check_count=array(
'dima_count' =>
$this->db->f('dima_count'),
! 'spbudact_code_count' =>
$this->db->f('spbudact_code_count')
);
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.soXport.inc.php 30 Jun 2003 19:18:34 -0000 1.27
--- class.soXport.inc.php 2 Jul 2003 11:32:57 -0000 1.28
***************
*** 44,51 ****
{
//Finn dima fra Boei
! $sql = "select fm_gab_location.loc1,
fm_gab_location.loc2, fm_gab_location.loc3 from fm_gab_location, fm_location1,
boei_eier "
! . "where substring(fm_gab_location.gabnr,5,5)='$Gnr'
and "
! . " substring(fm_gab_location.gabnr,10,4)='$Bnr'
and "
! . "
substring(fm_gab_location.gabnr,18,3)='$sekjonnr' and "
. " fm_gab_location.loc1=fm_location1.loc1 and "
. " fm_location1.owner_id=fm_owner.owner_id and "
--- 44,51 ----
{
//Finn dima fra Boei
! $sql = "select fm_gab_location.loc1,
fm_gab_location.loc2, fm_gab_location.loc3 from fm_gab_location, fm_location1,
fm_owner "
! . "where substring(fm_gab_location.gab_id,5,5)='$Gnr'
and "
! . " substring(fm_gab_location.gab_id,10,4)='$Bnr'
and "
! . "
substring(fm_gab_location.gab_id,18,3)='$sekjonnr' and "
. " fm_gab_location.loc1=fm_location1.loc1 and "
. " fm_location1.owner_id=fm_owner.owner_id and "
***************
*** 163,168 ****
$dima=$fields['dima'];
! $dimd=$fields['dimd'];
if ($dimd)
{
--- 163,176 ----
$dima=$fields['dima'];
! if ($dima)
! {
! $dima_value="'$dima'";
! }
! else
! {
! $dima_value="Null";
! }
+ $dimd=$fields['dimd'];
if ($dimd)
{
***************
*** 186,190 ****
$sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$dima',$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
}
--- 194,198 ----
$sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uiinvoice.inc.php 28 Jun 2003 16:11:47 -0000 1.27
--- class.uiinvoice.inc.php 2 Jul 2003 11:32:57 -0000 1.28
***************
*** 120,123 ****
--- 120,124 ----
$content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$loc1,$workorder_id);
+ //_debug_array($content);
$i=0;
***************
*** 223,226 ****
--- 224,230 ----
}
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
+ $data['msgbox_data']
= $GLOBALS['phpgw']->common->msgbox($msgbox_data);
$data['sum']
= number_format($sum, 2, ',', ' ');
$data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
***************
*** 314,319 ****
$data['table_header_list_voucher']
= $table_header;
$data['values_list_voucher']
= $content;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_voucher' => $data));
}
$this->save_sessiondata();
--- 318,323 ----
$data['table_header_list_voucher']
= $table_header;
$data['values_list_voucher']
= $content;
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_voucher' => $data));
}
$this->save_sessiondata();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boinvoice.inc.php,1.19,1.20 class.soinvoice.inc.php,1.27,1.28 class.soXport.inc.php,1.27,1.28 class.uiinvoice.inc.php,1.27,1.28,
Sigurd Nes <address@hidden> <=