[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.3,1.4 clas
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.3,1.4 class.boinvoice.inc.php,1.7,1.8 class.soinvoice.inc.php,1.7,1.8 class.solookup.inc.php,1.3,1.4 class.uiinvoice.inc.php,1.7,1.8 class.uiXport.inc.php,1.14,1.15 |
|
Date: |
Mon, 20 Jan 2003 05:35:30 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv3740/inc
Modified Files:
class.bocommon.inc.php class.boinvoice.inc.php
class.soinvoice.inc.php class.solookup.inc.php
class.uiinvoice.inc.php class.uiXport.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bocommon.inc.php 6 Jan 2003 16:51:12 -0000 1.3
--- class.bocommon.inc.php 20 Jan 2003 10:35:28 -0000 1.4
***************
*** 219,224 ****
//$sub='property';
! $admins =
$GLOBALS['phpgw']->session->appsession('admins','property');
! $module_order =
$GLOBALS['phpgw']->session->appsession('module_order','property');
$admin_equipment=$admins[$module_order['equipment']]['equipment']['admin'];
--- 219,224 ----
//$sub='property';
! $admins =
$GLOBALS['phpgw']->session->appsession('admins',$this->currentapp);
! $module_order =
$GLOBALS['phpgw']->session->appsession('module_order',$this->currentapp);
$admin_equipment=$admins[$module_order['equipment']]['equipment']['admin'];
***************
*** 227,232 ****
$admin_invoice=$admins[$module_order['invoice']]['invoice']['admin'];
! // echo 'admin_invoice: '.$admin_invoice .'<BR>';
! // print_r($admins);
if (!$sub)
--- 227,231 ----
$admin_invoice=$admins[$module_order['invoice']]['invoice']['admin'];
! // _debug_array($admins);
if (!$sub)
***************
*** 320,326 ****
{
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
!
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/property/invoice_paid.php','sub=invoice');
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
!
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/property/invoice_consume.php','sub=invoice');
$menu['sub_invoice_property_value']=$GLOBALS['phpgw']->link('/property/list_property_value.php','sub=invoice');
$menu['sublang_invoice_list']=lang('Invoice');
--- 319,325 ----
{
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
!
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice&paid=true');
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
!
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume&sub=invoice');
$menu['sub_invoice_property_value']=$GLOBALS['phpgw']->link('/property/list_property_value.php','sub=invoice');
$menu['sublang_invoice_list']=lang('Invoice');
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.boinvoice.inc.php 15 Jan 2003 20:55:46 -0000 1.7
--- class.boinvoice.inc.php 20 Jan 2003 10:35:28 -0000 1.8
***************
*** 108,115 ****
}
! function read_invoice()
{
$invoice = $this->so->read_invoice(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id));
$this->total_records = $this->so->total_records;
--- 108,118 ----
}
! function
read_invoice($paid='',$start_date='',$end_date='',$vendor_id='',$property_id='',$workorder_id='')
{
$invoice = $this->so->read_invoice(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id, 'paid' =>
$paid,
!
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
!
'property_id'=>$property_id,'workorder_id'=>$workorder_id));
!
$this->total_records = $this->so->total_records;
***************
*** 117,141 ****
}
! function read_invoice_sub($voucher_id='')
{
$invoice = $this->so->read_invoice_sub(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'user_lid' => $this->user_lid,'cat_id' =>
$this->cat_id,'voucher_id'=>$voucher_id));
$this->total_records = $this->so->total_records;
return $invoice;
}
! function read_remark($id='')
{
! return $remark = $this->so->read_remark($id);
}
function update_invoice($values)
{
$errorcount = 0;
- // while (is_array($values) && list(,$entry) =
each($values))
- // {
- // $local_error='';
while($entry=each($values['counter']))
{
--- 120,154 ----
}
! function read_invoice_sub($voucher_id='',$paid='')
{
$invoice = $this->so->read_invoice_sub(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'user_lid' => $this->user_lid,'cat_id' =>
$this->cat_id,'voucher_id'=>$voucher_id,'paid' => $paid));
$this->total_records = $this->so->total_records;
return $invoice;
}
! function read_remark($id='',$paid='')
{
! return $remark = $this->so->read_remark($id,$paid);
}
+ function
read_consume($start_date='',$end_date='',$vendor_id='',$property_id='',$workorder_id='',$b_account_class='',$district_id='')
+ {
+ $invoice = $this->so->read_consume(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id,
+
'start_date'=>$start_date,'end_date'=>$end_date,'vendor_id'=>$vendor_id,
+
'property_id'=>$property_id,'workorder_id'=>$workorder_id,'b_account_class'
=>$b_account_class,
+
'district_id' => $district_id ));
+
+ $this->total_records = $this->so->total_records;
+
+ return $invoice;
+ }
+
function update_invoice($values)
{
$errorcount = 0;
while($entry=each($values['counter']))
{
***************
*** 368,371 ****
--- 381,419 ----
return $user_list;
}
+
+
+ function select_account_class($selected='')
+ {
+
+ $b_account_class_list=
$this->so->select_account_class();
+
+ while (is_array($b_account_class_list) && list(,$class)
= each($b_account_class_list))
+ {
+ $sel_class = '';
+ if ($class['id']==$selected)
+ {
+ $sel_class = 'selected';
+ }
+
+ $class_list[] = array
+ (
+ 'id' => $class['id'],
+ 'name' => $class['name'],
+ 'selected' => $sel_class
+ );
+ }
+
+ for ($i=0;$i<count($class_list);$i++)
+ {
+ if ($class_list[$i]['selected'] != 'selected')
+ {
+ unset($class_list[$i]['selected']);
+ }
+ }
+
+ return $class_list;
+ }
+
+
function period_list($selected='')
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.soinvoice.inc.php 15 Jan 2003 20:55:46 -0000 1.7
--- class.soinvoice.inc.php 20 Jan 2003 10:35:28 -0000 1.8
***************
*** 24,27 ****
--- 24,29 ----
$this->db2 = $this->db;
+ $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
***************
*** 50,61 ****
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
! $query =
(isset($data['query'])?$data['query']:'');
! $sort =
(isset($data['sort'])?$data['sort']:'DESC');
! $order =
(isset($data['order'])?$data['order']:'');
! $cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $user_lid =
(isset($data['user_lid'])?$data['user_lid']:0);
}
if ($order)
--- 52,71 ----
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
! $query =
(isset($data['query'])?$data['query']:'');
! $sort =
(isset($data['sort'])?$data['sort']:'DESC');
! $order =
(isset($data['order'])?$data['order']:'');
! $cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
! $user_lid =
(isset($data['user_lid'])?$data['user_lid']:0);
! $paid =
(isset($data['paid'])?$data['paid']:'');
! $start_date =
(isset($data['start_date'])?$data['start_date']:'');
! $end_date =
(isset($data['end_date'])?$data['end_date']:'');
! $vendor_id =
(isset($data['vendor_id'])?$data['vendor_id']:'');
! $property_id =
(isset($data['property_id'])?$data['property_id']:'');
! $workorder_id =
(isset($data['workorder_id'])?$data['workorder_id']:'');
}
+ //_debug_array($data);
+
if ($order)
***************
*** 87,90 ****
--- 97,155 ----
$where= 'AND';
}
+
+
+ if ($vendor_id)
+ {
+ $filtermethod .= " $where spvend_code
='$vendor_id' ";
+ $where= 'AND';
+ }
+ if ($property_id)
+ {
+ $filtermethod .= " $where dima ='$property_id'
";
+ $where= 'AND';
+ }
+ if ($workorder_id)
+ {
+ $filtermethod .= " $where pmwrkord_code
='$workorder_id' ";
+ $where= 'AND';
+ }
+
+
+ if ($paid)
+ {
+ $table = 't_ecobilagoverf';
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $dateformat = str_replace(".","",$dateformat);
+ $dateformat = str_replace("-","",$dateformat);
+ $dateformat = str_replace("/","",$dateformat);
+ $y=strpos($dateformat,'y');
+ $d=strpos($dateformat,'d');
+ $m=strpos($dateformat,'m');
+
+ $dateparts = explode('/', $start_date);
+ $sday = $dateparts[$d];
+ $smonth = $dateparts[$m];
+ $syear = $dateparts[$y];
+
+ $dateparts = explode('/', $end_date);
+ $eday = $dateparts[$d];
+ $emonth = $dateparts[$m];
+ $eyear = $dateparts[$y];
+
+ $start_date =
date($this->bocommon->dateformat,mktime(2,0,0,$smonth,$sday,$syear));
+ $end_date =
date($this->bocommon->dateformat,mktime(2,0,0,$emonth,$eday,$eyear));
+
+ if (!$workorder_id)
+ {
+ $filtermethod .= " $where overftid
>'$start_date' and overftid < '$end_date'";
+ }
+
+ }
+ else
+ {
+ $table ='t_ecobilag';
+ }
+
+
if($query)
{
***************
*** 96,100 ****
! $sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop FROM t_ecobilag $filtermethod $querymethod
group by bilagsnr";
//echo $sql;
--- 161,165 ----
! $sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop FROM $table $filtermethod $querymethod
group by bilagsnr";
//echo $sql;
***************
*** 128,132 ****
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
. "
forfallsdato,periode,artid,kidnr,kreditnota "
! . " from t_ecobilag $this->join
phpgw_addressbook ON phpgw_addressbook.id = t_ecobilag.spvend_code WHERE
bilagsnr = '$voucher_id' "
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
--- 193,197 ----
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
. "
forfallsdato,periode,artid,kidnr,kreditnota "
! . " from $table $this->join
phpgw_addressbook ON phpgw_addressbook.id = $table.spvend_code WHERE bilagsnr =
'$voucher_id' "
. " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
. "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
***************
*** 140,143 ****
--- 205,248 ----
$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('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'))));
+ $invoice[$i]['jan_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_jan_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ }
+ else
+ {
+ $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'))));
+ $invoice[$i]['super_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_super_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ }
+ else
+ {
+ $invoice[$i]['super_date']
='';
+ }
+
+ 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
+ {
+ $invoice[$i]['budget_date']
='';
+ }
+
+ 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
+ {
+ $invoice[$i]['transfer_date']
='';
+ }
+
$invoice[$i]['counter']
= $i;
$invoice[$i]['current_user']
= strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
***************
*** 155,163 ****
$invoice[$i]['budget_responsible']
= $this->db->f('budsjettansvarligid');
$invoice[$i]['transfer_id']
= $this->db->f('utbetalingid');
! $invoice[$i]['jan_date']
= $this->db->f('oppsynsigndato');
! $invoice[$i]['super_date']
= $this->db->f('saksigndato');
! $invoice[$i]['budget_date']
= $this->db->f('budsjettsigndato');
! $invoice[$i]['transfer_date']
= $this->db->f('utbetalingsigndato');
! $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');
--- 260,264 ----
$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');
***************
*** 210,213 ****
--- 311,324 ----
$order =
(isset($data['order'])?$data['order']:'');
$voucher_id =
(isset($data['voucher_id'])?$data['voucher_id']:0);
+ $paid = (isset($data['paid'])?$data['paid']:'');
+ }
+
+ if ($paid)
+ {
+ $table = 't_ecobilagoverf';
+ }
+ else
+ {
+ $table ='t_ecobilag';
}
***************
*** 227,231 ****
}
! $sql = "SELECT
t_ecobilag.*,fm_wo_wrkorders.status,fm_wo_wrkorders.charge_tenant FROM
t_ecobilag $this->join fm_wo_wrkorders on fm_wo_wrkorders.id =
t_ecobilag.pmwrkord_code $filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
--- 338,342 ----
}
! $sql = "SELECT
$table.*,fm_wo_wrkorders.status,fm_wo_wrkorders.charge_tenant FROM $table
$this->join fm_wo_wrkorders on fm_wo_wrkorders.id = $table.pmwrkord_code
$filtermethod ";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 267,271 ****
--- 378,499 ----
+ function read_consume($data)
+ {
+ if(is_array($data))
+ {
+ if ($data['start'])
+ {
+ $start=$data['start'];
+ }
+ else
+ {
+ $start=0;
+ }
+ $filter =
(isset($data['filter'])?$data['filter']:'none');
+ $query =
(isset($data['query'])?$data['query']:'');
+ $sort =
(isset($data['sort'])?$data['sort']:'DESC');
+ $order =
(isset($data['order'])?$data['order']:'');
+ $cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
+ $start_date =
(isset($data['start_date'])?$data['start_date']:'');
+ $end_date =
(isset($data['end_date'])?$data['end_date']:'');
+ $vendor_id =
(isset($data['vendor_id'])?$data['vendor_id']:'');
+ $property_id =
(isset($data['property_id'])?$data['property_id']:'');
+ $district_id =
(isset($data['district_id'])?$data['district_id']:'');
+ $workorder_id =
(isset($data['workorder_id'])?$data['workorder_id']:0);
+ $b_account_class =
(isset($data['b_account_class'])?$data['b_account_class']:'');
+ }
+ //_debug_array($data);
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $dateformat = str_replace(".","",$dateformat);
+ $dateformat = str_replace("-","",$dateformat);
+ $dateformat = str_replace("/","",$dateformat);
+ $y=strpos($dateformat,'y');
+ $d=strpos($dateformat,'d');
+ $m=strpos($dateformat,'m');
+ $dateparts = explode('/', $start_date);
+ $sday = $dateparts[$d];
+ $smonth = $dateparts[$m];
+ $syear = $dateparts[$y];
+
+ $dateparts = explode('/', $end_date);
+ $eday = $dateparts[$d];
+ $emonth = $dateparts[$m];
+ $eyear = $dateparts[$y];
+
+ $start_date =
date($this->bocommon->dateformat,mktime(2,0,0,$smonth,$sday,$syear));
+ $end_date =
date($this->bocommon->dateformat,mktime(2,0,0,$emonth,$eday,$eyear));
+
+
+ $where = 'WHERE';
+
+ if($b_account_class)
+ {
+ $filtermethod= " $where
left(spbudact_code,2)='$b_account_class'";
+ $where= 'AND';
+ }
+ else
+ {
+ $select_account_class=',left(spbudact_code,2)
as b_account_class';
+ $group_account_class=', spbudact_code';
+ }
+
+ if ($vendor_id)
+ {
+ $filtermethod .= " $where (spvend_code =
$vendor_id)";
+ $where= 'AND';
+ }
+
+ if($property_id)
+ {
+ $filtermethod .=" $where (dima like
'%$property_id%')";
+ $where= 'AND';
+ }
+
+
+ if ($district_id)
+ {
+ $filtermethod.= " $where omraade_id=
$district_id ";
+ $where= 'AND';
+ }
+
+ if ($workorder_id)
+ {
+ $filtermethod.= " $where pmwrkord_code =
$workorder_id";
+ $where= 'AND';
+ }
+
+
+ if ($cat_id>0)
+ {
+ $filtermethod .= " $where typeid = $cat_id";
+ $where= 'AND';
+ }
+
+ $filtermethod .= " $where (utbetalingsigndato
>'$start_date') AND (utbetalingsigndato < '$end_date')";
+
+ $sql = "SELECT omraade_id,periode,sum(godkjentbelop) as
consume $select_account_class "
+ . " FROM t_ecobilagoverf $this->join
boei_objekt ON left(t_ecobilagoverf.dima,4) = boei_objekt.objekt_id $this->join
"
+ . " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id "
+ . " $filtermethod group by omraade_id,periode
$group_account_class";
+ //echo $sql;
+
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->total_records = $this->db->num_rows();
+ $this->db->query($sql .
$ordermethod,$start,__LINE__,__FILE__);
+
+ $i = 0;
+
+ while ($this->db->next_record())
+ {
+ $consume[$i]['consume']
= $this->db->f('consume');
+ $consume[$i]['period']
= $this->db->f('periode');
+ $consume[$i]['district_id']
= $this->db->f('omraade_id');
+ $consume[$i]['account_class']
= $this->db->f($select_account_class);
+ $i++;
+ }
+ return $consume;
+ }
function update_invoice_sub($values)
***************
*** 275,279 ****
$GLOBALS['phpgw']->db->transaction_begin();
-
while($entry=each($values['counter']))
{
--- 503,506 ----
***************
*** 376,382 ****
}
! function read_remark($id='')
{
! $this->db->query(" SELECT merknad from t_ecobilag
where id= '$id'");
$this->db->next_record();
--- 603,618 ----
}
! function read_remark($id='',$paid='')
{
! if ($paid)
! {
! $table = 't_ecobilagoverf';
! }
! else
! {
! $table ='t_ecobilag';
! }
!
! $this->db->query(" SELECT merknad from $table where
id= '$id'");
$this->db->next_record();
***************
*** 590,593 ****
--- 826,844 ----
return $employees;
}
+
+ function select_account_class()
+ {
+ $sql = "SELECT distinct left(id,2) as id from
fm_wo_accounts ";
+ $this->db->query($sql,__LINE__,__FILE__);
+
+ while ($this->db->next_record())
+ {
+ $class[] = Array(
+ 'id' => $this->db->f('id')
+ );
+ }
+ return $class;
+ }
+
}
?>
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.solookup.inc.php 2 Jan 2003 22:03:57 -0000 1.3
--- class.solookup.inc.php 20 Jan 2003 10:35:28 -0000 1.4
***************
*** 97,101 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND id LIKE '%$query%' or
org_name LIKE '%$query%'";
}
--- 97,101 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND (id LIKE '%$query%' or
org_name LIKE '%$query%')";
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiinvoice.inc.php 15 Jan 2003 20:55:46 -0000 1.7
--- class.uiinvoice.inc.php 20 Jan 2003 10:35:28 -0000 1.8
***************
*** 25,28 ****
--- 25,29 ----
'edit_period' => True,
'list_sub' => True,
+ 'consume' => True,
'remark' => True
);
***************
*** 76,80 ****
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
! $sub = get_var('sub',array('POST','GET'));
$links = $this->bocommon->menu($sub);
--- 77,89 ----
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
! $sub =
get_var('sub',array('POST','GET'));
! $paid =
get_var('paid',array('POST','GET'));
! $start_date =
get_var('start_date',array('POST','GET'));
! $end_date =
get_var('end_date',array('POST','GET'));
! $submit_search =
get_var('submit_search',array('POST','GET'));
! $vendor_id =
get_var('abid',array('POST','GET'));
! $workorder_id =
get_var('workorder_id',array('POST','GET'));
! $property_id =
get_var('property_id',array('POST','GET'));
!
$links = $this->bocommon->menu($sub);
***************
*** 89,94 ****
//_debug_array($values);
! $content = $this->bo->read_invoice();
$i=0;
--- 98,109 ----
//_debug_array($values);
+ if(!$submit_search && $paid)
+ {
+ $start_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $end_date = $start_date;
+ }
!
! $content =
$this->bo->read_invoice($paid,$start_date,$end_date,$vendor_id,$property_id,$workorder_id);
$i=0;
***************
*** 120,123 ****
--- 135,139 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'user_lid'
=> $this->user_lid)
)),
***************
*** 131,134 ****
--- 147,151 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'user_lid'
=> $this->user_lid)
)),
***************
*** 144,147 ****
--- 161,165 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'user_lid'
=> $this->user_lid)
)),
***************
*** 174,224 ****
'query' => $this->query,
'start' => $this->start,
'filter' => $this->filter
);
! $data = array
! (
! 'message'
=> $receipt['message'],
! 'error'
=> $receipt['error'],
! 'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
! 'check_source'
=> './'.$this->currentapp.'/inc/check.js',
! 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'lang_save'
=> lang('save'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index'),
! 'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Save the voucher'),
! 'lang_select_all'
=> lang('Select All'),
! 'links'
=> $links,
! 'allow_all_rows'
=> false,
! 'start_record'
=> $this->start,
! 'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
! 'num_records'
=> count($content),
! 'all_records'
=> $this->bo->total_records,
! 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
! 'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif',
! 'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list voucher'),
! 'lang_no_cat'
=> lang('no category'),
! 'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
! 'select_name'
=> 'cat_id',
! 'cat_list'
=> $this->bo->select_category('filter',$this->cat_id),
! 'user_list'
=> $this->bo->get_invoice_user_list('filter',$this->user_lid),
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'lang_no_user'
=> lang('All users'),
! 'lang_user_statustext' =>
lang('Select the user the selection belongs to. To do not use a user select NO
USER'),
! 'select_user_name'
=> 'user_lid',
! 'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
! 'lang_searchbutton_statustext' => lang('Submit
the search string'),
! 'query'
=> $this->query,
! 'lang_submit'
=> lang('submit'),
! 'table_header_list_voucher' =>
$table_header,
! 'values_list_voucher' =>
$content,
! 'table_done'
=> $table_done
! );
//_debug_array($data);
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_voucher' => $data));
$this->save_sessiondata();
}
--- 192,288 ----
'query' => $this->query,
'start' => $this->start,
+ 'paid' => $paid,
'filter' => $this->filter
);
! $data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
! $data['links']
= $links;
! $data['allow_all_rows']
= false;
! $data['start_record']
= $this->start;
! $data['record_limit']
= $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
! $data['num_records']
= count($content);
! $data['all_records']
= $this->bo->total_records;
! $data['link_url']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
! $data['img_path']
= $GLOBALS['phpgw']->common->get_image_path('phpgwapi');
! $data['appname']
= lang($this->currentapp);
! $data['function_msg']
= lang('list voucher');
! $data['lang_no_cat']
= lang('no category');
! $data['lang_cat_statustext'] =
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY');
! $data['select_name']
= 'cat_id';
! $data['select_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
! $data['lang_no_user']
= lang('All users');
! $data['lang_user_statustext'] =
lang('Select the user the selection belongs to. To do not use a user select NO
USER');
! $data['select_user_name']
= 'user_lid';
! $data['lang_searchfield_statustext'] = lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again');
! $data['lang_searchbutton_statustext'] = lang('Submit
the search string');
! $data['lang_submit']
= lang('submit');
! $data['query']
= $this->query;
! $data['form_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
//_debug_array($data);
! if ($paid)
! {
!
! $data['user_list']
= $this->bo->get_invoice_user_list('select',$this->user_lid);
! $data['cat_list']
= $this->bo->select_category('select',$this->cat_id);
! $data['start_date'] = $start_date;
! $data['end_date'] = $end_date;
! $data['vendor_id'] = $vendor_id;
!
! $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! $sep = '/';
! $dlarr[strpos($dateformat,'y')]
= 'yyyy';
! $dlarr[strpos($dateformat,'m')]
= 'MM';
! $dlarr[strpos($dateformat,'d')]
= 'DD';
! ksort($dlarr);
! $data['dateformat']
= (implode($sep,$dlarr));
!
! $data['link_calendar_start_date']
=
'setDateField(document.form.start_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')';
! $data['link_calendar_end_date']
=
'setDateField(document.form.end_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')';
!
! $data['calendar_gif']
= './'.$this->currentapp.'/templates/default/images/calendar.gif';
! $data['calendar_source']
= './'.$this->currentapp.'/inc/calendar.js';
! $data['lang_popup_calendar']
= lang('Popup Calendar');
! $data['lang_workorder']
= lang('Workorder ID');
! $data['lang_workorder_statustext']
= lang('enter the Workorder ID to search by workorder - at any date');
! $data['workorder_id']
= $workorder_id;
!
! $data['addressbook_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook');
! $data['lang_select_vendor_statustext'] =
lang('Select the vendor by klicking this link');
! $data['lang_vendor']
= lang('Vendor');
! $data['property_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.property');
! $data['lang_select_property_statustext']=
lang('Select the property by klicking this link');
! $data['lang_property_statustext']
= lang('Search by property');
!
! $data['lang_property']
= lang('property');
! $data['property_id']
= $property_id;
! $data['lang_search']
= lang('Search');
! $data['lang_search_statustext']
= lang('Search for paid invoices');
!
! $data['table_header_list_voucher_paid'] =
$table_header;
! $data['values_list_voucher_paid']
= $content;
!
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_voucher_paid' =>
$data));
! }
! else
! {
!
! $data['user_list']
= $this->bo->get_invoice_user_list('filter',$this->user_lid);
! $data['cat_list']
= $this->bo->select_category('filter',$this->cat_id);
! $data['table_done']
= $table_done;
! $data['img_check']
=
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.gif';
! $data['check_source']
= './'.$this->currentapp.'/inc/check.js';
! $data['lang_save']
= lang('save');
! $data['done_action']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index');
! $data['lang_done_statustext']
= lang('Back to the list');
! $data['lang_save_statustext']
= lang('Save the voucher');
! $data['lang_select_all']
= lang('Select All');
! $data['message']
= $receipt['message'];
! $data['error']
= $receipt['error'];
! $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();
}
***************
*** 232,235 ****
--- 296,300 ----
$sub = get_var('sub',array('POST','GET'));
+ $paid = get_var('paid',array('POST','GET'));
$links = $this->bocommon->menu($sub);
***************
*** 251,255 ****
if ($voucher_id)
{
! $content =
$this->bo->read_invoice_sub($voucher_id);
}
--- 316,320 ----
if ($voucher_id)
{
! $content =
$this->bo->read_invoice_sub($voucher_id,$paid);
}
***************
*** 259,262 ****
--- 324,328 ----
while(each($content))
{
+ $content[$i]['paid']
= $paid;
$content[$i]['lang_tax_code_statustext'] = lang('select the appropiate
tax code');
$content[$i]['tax_code_list']
= $this->bo->tax_code_list($content[$i]['tax_code']);
***************
*** 280,287 ****
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
'voucher_id'
=> $voucher_id)
)),
'lang_workorder' =>
lang('Workorder'),
! 'sort_budget_account'
=> $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
--- 346,354 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'voucher_id'
=> $voucher_id)
)),
'lang_workorder' =>
lang('Workorder'),
! 'sort_budget_account' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
***************
*** 291,299 ****
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
'voucher_id'
=> $voucher_id)
)),
! 'lang_budget_account' =>
lang('Budget account'),
! 'sort_sum' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
--- 358,367 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'voucher_id'
=> $voucher_id)
)),
! 'lang_budget_account' => lang('Budget
account'),
! 'sort_sum'
=> $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
***************
*** 303,306 ****
--- 371,375 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'voucher_id'
=> $voucher_id)
)),
***************
*** 311,315 ****
'lang_charge_tenant' => lang('Charge
tenant'),
'lang_invoice_id' =>
lang('Invoice Id'),
! 'sort_dima' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
--- 380,384 ----
'lang_charge_tenant' => lang('Charge
tenant'),
'lang_invoice_id' =>
lang('Invoice Id'),
! 'sort_dima'
=> $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
***************
*** 319,322 ****
--- 388,392 ----
'cat_id'
=>$this->cat_id,
'sub'
=>$this->sub,
+
'paid'
=> $paid,
'voucher_id'
=> $voucher_id)
)),
***************
*** 326,334 ****
'lang_tax_code' =>
lang('Tax code'),
'lang_remark' =>
lang('Remark'),
-
-
-
-
-
);
--- 396,399 ----
***************
*** 349,355 ****
--- 414,430 ----
'query' => $this->query,
'start' => $this->start,
+ 'paid' => $paid,
'voucher_id' => $voucher_id
);
+ if ($paid)
+ {
+ $function_msg = lang('list paid invoice');
+
+ }
+ else
+ {
+ $function_msg = lang('list invoice');
+ }
$data = array
(
***************
*** 371,378 ****
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list invoice'),
'lang_submit'
=> lang('submit'),
'table_header_list_invoice_sub' =>
$table_header,
'values_list_invoice_sub'
=> $content,
'table_done'
=> $table_done
);
--- 446,454 ----
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> $function_msg,
'lang_submit'
=> lang('submit'),
'table_header_list_invoice_sub' =>
$table_header,
'values_list_invoice_sub'
=> $content,
+ 'paid'
=> $paid,
'table_done'
=> $table_done
);
***************
*** 432,439 ****
$id = get_var('id',array('POST','GET'));
$data = array
(
! 'remark' => $this->bo->read_remark($id)
);
--- 508,516 ----
$id = get_var('id',array('POST','GET'));
+ $paid = get_var('paid',array('POST','GET'));
$data = array
(
! 'remark' => $this->bo->read_remark($id,$paid)
);
***************
*** 442,445 ****
--- 519,677 ----
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('remark' => $data));
}
+
+ function consume()
+ {
+
+
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
+
'nextmatchs',
+
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
+
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
+
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
+
+ $sub =
get_var('sub',array('POST','GET'));
+ $start_date =
get_var('start_date',array('POST','GET'));
+ $end_date =
get_var('end_date',array('POST','GET'));
+ $submit_search =
get_var('submit_search',array('POST','GET'));
+ $vendor_id =
get_var('abid',array('POST','GET'));
+ $vendor_name =
get_var('vendor_name',array('POST','GET'));
+
+ $workorder_id =
get_var('workorder_id',array('POST','GET'));
+ $property_id =
get_var('property_id',array('POST','GET'));
+ $district_id =
get_var('district_id',array('POST','GET'));
+ $b_account_class =
get_var('b_account_class',array('POST','GET'));
+
+
+ $links = $this->bocommon->menu($sub);
+
+
+ //_debug_array($values);
+ if(!$submit_search)
+ {
+ $start_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $end_date = $start_date;
+ }
+ else
+ {
+ $content =
$this->bo->read_consume($start_date,$end_date,$vendor_id,$property_id,$workorder_id,$b_account_class,$district_id);
+ }
+
+ if(is_array($content))
+ {
+ $i=0;
+ while(each($content))
+ {
+ $sum=$sum+$content[$i]['consume'];
+ $i++;
+ }
+ }
+
+
+ $table_header[] = array
+ (
+ 'lang_district' =>
lang('District'),
+ 'lang_period' =>
lang('Period'),
+ 'lang_budget_account' => lang('Budget
account'),
+ 'lang_consume' =>
lang('Consume'),
+ );
+
+ $table_done[] = array
+ (
+ 'lang_done' =>
lang('Done'),
+ 'lang_done_statustext' => lang('Close this
window')
+ );
+
+ $link_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uiinvoice.consume',
+ 'order' => $this->order,
+ 'sort' => $this->sort,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' => $district_id,
+ 'sub' => $this->sub,
+ 'query' => $this->query,
+ 'start' => $this->start,
+ 'filter' => $this->filter
+ );
+
+ $data['lang_sum']
= lang('Sum');
+ $data['sum']
= $sum;
+ $data['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
+ $data['links']
= $links;
+ $data['allow_all_rows']
= false;
+ $data['start_record']
= $this->start;
+ $data['record_limit']
= $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+ $data['num_records']
= count($content);
+ $data['all_records']
= $this->bo->total_records;
+ $data['link_url']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
+ $data['img_path']
= $GLOBALS['phpgw']->common->get_image_path('phpgwapi');
+ $data['appname']
= lang($this->currentapp);
+ $data['function_msg']
= lang('list voucher');
+ $data['lang_no_cat']
= lang('no category');
+ $data['lang_cat_statustext'] =
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY');
+ $data['select_name']
= 'cat_id';
+ $data['select_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
+ $data['lang_no_district']
= lang('No district');
+ $data['lang_district_statustext'] =
lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT');
+ $data['select_district_name'] =
'district_id';
+ $data['lang_searchfield_statustext'] = lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again');
+ $data['lang_searchbutton_statustext'] = lang('Submit
the search string');
+ $data['lang_submit']
= lang('submit');
+ $data['query']
= $this->query;
+ $data['form_action']
= $GLOBALS['phpgw']->link('/index.php',$link_data);
+
+
+ $data['district_list']
= $this->bocommon->select_district_list('select',$district_id);
+ $data['cat_list']
= $this->bo->select_category('select',$this->cat_id);
+ $data['start_date']
= $start_date;
+ $data['end_date']
= $end_date;
+ $data['vendor_id']
= $vendor_id;
+ $data['vendor_name']
= $vendor_name;
+
+ $data['account_class_list']
= $this->bo->select_account_class($b_account_class);
+ $data['lang_no_account_class_'] =
lang('No account');
+ $data['lang_account_class_statustext'] = lang('Select
the account class the selection belongs to. To do not use a district select NO
ACCOUNT');
+ $data['select_account_class_name'] =
'b_account_class';
+
+
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] =
'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+ $data['dateformat']
= (implode($sep,$dlarr));
+
+ $data['link_calendar_start_date'] =
'setDateField(document.form.start_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')';
+ $data['link_calendar_end_date'] =
'setDateField(document.form.end_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')';
+
+ $data['calendar_gif']
= './'.$this->currentapp.'/templates/default/images/calendar.gif';
+ $data['calendar_source']
= './'.$this->currentapp.'/inc/calendar.js';
+ $data['lang_popup_calendar'] =
lang('Popup Calendar');
+ $data['lang_workorder']
= lang('Workorder ID');
+ $data['lang_workorder_statustext'] =
lang('enter the Workorder ID to search by workorder - at any date');
+ $data['workorder_id']
= $workorder_id;
+
+ $data['addressbook_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook');
+ $data['lang_select_vendor_statustext'] = lang('Select
the vendor by klicking this link');
+ $data['lang_vendor']
= lang('Vendor');
+ $data['property_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.property');
+ $data['lang_select_property_statustext']= lang('Select
the property by klicking this link');
+ $data['lang_property_statustext'] =
lang('Search by property');
+
+ $data['lang_property']
= lang('property');
+ $data['property_id']
= $property_id;
+ $data['lang_search']
= lang('Search');
+ $data['lang_search_statustext'] =
lang('Search for paid invoices');
+
+ $data['table_header_consume'] =
$table_header;
+ $data['values_consume']
= $content;
+
+ //_debug_array($data);
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('consume' => $data));
+
+ $this->save_sessiondata();
+ }
+
}
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uiXport.inc.php 15 Jan 2003 20:55:46 -0000 1.14
--- class.uiXport.inc.php 20 Jan 2003 10:35:28 -0000 1.15
***************
*** 276,280 ****
'lang_import_statustext' =>
lang('Klick this button to start the import'),
- 'addressbook_link'
=> $GLOBALS['phpgw']->link('/property/addressbook.php','query='),
'lang_invoice_date'
=> lang('invoice date'),
'lang_payment_date'
=> lang('Payment date'),
--- 276,279 ----
***************
*** 298,301 ****
--- 297,301 ----
'lang_abid_statustext' =>
lang('Select the vendor by klicking the button'),
'lang_vendor_name_statustext' => lang('Select
the vendor by klicking the button'),
+ 'lang_select_vendor_statustext' => lang('Select
the vendor by klicking this button'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.3,1.4 class.boinvoice.inc.php,1.7,1.8 class.soinvoice.inc.php,1.7,1.8 class.solookup.inc.php,1.3,1.4 class.uiinvoice.inc.php,1.7,1.8 class.uiXport.inc.php,1.14,1.15,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default cat_select.xsl,1.1,1.2 invoice.xsl,1.11,1.12 lookup.xsl,1.3,1.4select_district.xsl,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.22,1.23
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default cat_select.xsl,1.1,1.2 invoice.xsl,1.11,1.12 lookup.xsl,1.3,1.4select_district.xsl,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.22,1.23
- Index(es):