[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.6,1.7 list_vendors
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property invoice_detail.php,1.6,1.7 list_vendors_activities.php,1.4,1.5 add_invoice.php,1.3,1.4 list_power_meter.php,1.3,1.4 add_power_meter.php,1.2,1.3 |
|
Date: |
Wed, 16 Oct 2002 11:27:36 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv9129
Modified Files:
invoice_detail.php list_vendors_activities.php add_invoice.php
list_power_meter.php add_power_meter.php
Log Message:
no message
Index: invoice_detail.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_detail.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** invoice_detail.php 2 Oct 2002 17:00:00 -0000 1.6
--- invoice_detail.php 16 Oct 2002 15:27:09 -0000 1.7
***************
*** 200,204 ****
else
{
! $ordermethod = " order by bilagsnr asc";
}
--- 200,204 ----
else
{
! $ordermethod = " order by t_ecobilag.id asc";
}
Index: list_vendors_activities.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_vendors_activities.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** list_vendors_activities.php 7 Oct 2002 15:49:09 -0000 1.4
--- list_vendors_activities.php 16 Oct 2002 15:27:09 -0000 1.5
***************
*** 304,307 ****
--- 304,308 ----
$this_index =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('this_index'));
+
$unit =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('unit'));
$old_m_cost =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('m_cost'));
***************
*** 324,327 ****
--- 325,334 ----
$t->set_var('prizing',$GLOBALS['phpgw']->link('/property/activity_vendor_prizing.php','id='
. $activity_id . '&vendor_id=' . $vendor_id
."&order=$order&query=$query&start=$start&filter=$filter"));
}
+
+ $old_total_cost=str_replace('.',',',$old_total_cost);
+ $this_index=str_replace('.',',',$this_index);
+ $old_m_cost=str_replace('.',',',$old_m_cost);
+ $old_w_cost=str_replace('.',',',$old_w_cost);
+
$t->set_var(array('select' => $select,
'descr' => $descr,
Index: add_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_invoice.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** add_invoice.php 24 Sep 2002 15:44:47 -0000 1.3
--- add_invoice.php 16 Oct 2002 15:27:09 -0000 1.4
***************
*** 213,299 ****
! //---------------- end budgetting accounts
!
! $GLOBALS['phpgw']->db->query("SELECT * FROM t_ecoart order by id asc ");
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $art_list .= '<option value="' . $GLOBALS['phpgw']->db->f('id')
. '"';
!
if($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))==$art)
! $art_list .= ' selected';
! $art_list .= '>'
! .
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))
! . ' - ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('navn'))
! . '] ' . '</option>';
!
! }
$t->set_var('art_list',$art_list);
$t->set_var('lang_art',lang('Type invoice'));
! $GLOBALS['phpgw']->db->query("SELECT * FROM t_ecobilagtype order by id
asc ");
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
!
if($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))==$type)
! $type_list .= ' selected';
! $type_list .= '>'
! .
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))
! . ' - ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('navn'))
! . '] ' . '</option>';
!
! }
!
$t->set_var('type_list',$type_list);
$t->set_var('lang_type',lang('Type invoice II'));
! $GLOBALS['phpgw']->db->query("SELECT * FROM t_ecodimb order by id asc
");
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $dimb_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
!
if($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))==$dim_b)
! $dimb_list .= ' selected';
! $dimb_list .= '>'
! .
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))
! . ' - ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('navn'))
! . '] ' . '</option>';
!
! }
!
$t->set_var('dimb_list',$dimb_list);
$t->set_var('lang_dimb',lang('Dim B'));
! $GLOBALS['phpgw']->db->query("SELECT * FROM t_ecodimd order by id asc
");
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $dimd_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
!
if($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))==$dim_d)
! $dimd_list .= ' selected';
! $dimd_list .= '>'
! .
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))
! . ' - ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('navn'))
! . '] ' . '</option>';
!
! }
!
$t->set_var('dimd_list',$dimd_list);
$t->set_var('lang_dimd',lang('Dim D'));
! $GLOBALS['phpgw']->db->query("SELECT * FROM t_ecomva order by id asc ");
! while ($GLOBALS['phpgw']->db->next_record())
! {
! $tax_code_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
!
if($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))==$tax_code)
! $tax_code_list .= ' selected';
! $tax_code_list .= '>'
! .
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'))
! . ' - ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('navn'))
! . '] ' . '</option>';
!
! }
!
$t->set_var('tax_code_list',$tax_code_list);
--- 213,239 ----
! $this->invoice = CreateObject('property.invoice');
+ $art_list=$this->invoice->get_list_ecoart($art);
$t->set_var('art_list',$art_list);
$t->set_var('lang_art',lang('Type invoice'));
! $type_list=$this->invoice->get_type_list($type);
$t->set_var('type_list',$type_list);
$t->set_var('lang_type',lang('Type invoice II'));
! $dimb_list= $this->invoice->select_dimb_list($dim_b);
$t->set_var('dimb_list',$dimb_list);
$t->set_var('lang_dimb',lang('Dim B'));
! $dimd_list= $this->invoice->select_dimd_list($dim_d);
$t->set_var('dimd_list',$dimd_list);
$t->set_var('lang_dimd',lang('Dim D'));
! $tax_code_list = $this->invoice->select_tax_code_list($tax_code);
$t->set_var('tax_code_list',$tax_code_list);
***************
*** 407,411 ****
// $employees = $GLOBALS['phpgw']->accounts->get_list('accounts', $start,
$sort, $order, $query);
! $employees=get_list_role('janitor',$join);
while (list($null,$account) = each($employees))
{
--- 347,351 ----
// $employees = $GLOBALS['phpgw']->accounts->get_list('accounts', $start,
$sort, $order, $query);
! $employees=$this->invoice->get_list_role('janitor',$join);
while (list($null,$account) = each($employees))
{
***************
*** 419,423 ****
$t->set_var('janitor_list',$janitor_list);
! $employees=get_list_role('supervisor',$join);
while (list($null,$account) = each($employees))
{
--- 359,363 ----
$t->set_var('janitor_list',$janitor_list);
! $employees=$this->invoice->get_list_role('supervisor',$join);
while (list($null,$account) = each($employees))
{
***************
*** 431,435 ****
$t->set_var('supervisor_list',$supervisor_list);
! $employees=get_list_role('budget_responsible',$join);
while (list($null,$account) = each($employees))
{
--- 371,375 ----
$t->set_var('supervisor_list',$supervisor_list);
! $employees=$this->invoice->get_list_role('budget_responsible',$join);
while (list($null,$account) = each($employees))
{
Index: list_power_meter.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_power_meter.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_power_meter.php 4 Sep 2002 17:56:09 -0000 1.3
--- list_power_meter.php 16 Oct 2002 15:27:09 -0000 1.4
***************
*** 57,61 ****
else
{
! $ordermethod = " order by span_pmlocread.splocation_code asc";
}
--- 57,61 ----
else
{
! $ordermethod = " order by fm_bms.location_code asc";
}
***************
*** 103,109 ****
$db2 = $GLOBALS['phpgw']->db;
! $sql = " SELECT span_pmlocread.bms_sys_adr_code,
span_pmlocread.splocation_code, span_spbldinf.address_1
,span_pmlocread.date_created, point_name "
! . " FROM span_pmlocread $join span_spbldinf ON
span_pmlocread.splocation_code = span_spbldinf.splocation_code "
! . " $join span_bms_system_adr ON
span_pmlocread.bms_sys_adr_code = span_bms_system_adr.bms_sys_adr_code
$querymethod";
--- 103,109 ----
$db2 = $GLOBALS['phpgw']->db;
! $sql = " SELECT fm_bms.id,
fm_bms.objekt_id,fm_bms.bygg_id,fm_bms.seksjons_id,fm_bms.location_code,
boei_seksjon.beskrivelse ,fm_bms.date_created, fm_bms.point_name "
! . " FROM fm_bms $join boei_seksjon ON fm_bms.objekt_id =
boei_seksjon.objekt_id and "
! . " fm_bms.bygg_id = boei_seksjon.bygg_id and
fm_bms.seksjons_id = boei_seksjon.seksjons_id $querymethod";
***************
*** 155,163 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_installation_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'span_pmlocread.bms_sys_adr_code',$order,'/property/list_power_meter.php',lang('Installation
ID')));
$t->set_var('sort_power_meter_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'point_name',$order,'/property/list_power_meter.php',lang('Power_meter
ID')));
!
$t->set_var('sort_address',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'address_1',$order,'/property/list_power_meter.php',lang('Address')));
!
$t->set_var('sort_property',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'span_pmlocread.splocation_code',$order,'/property/list_power_meter.php',lang('Property')));
!
$t->set_var('sort_date_created',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'span_pmlocread.date_created',$order,'/property/list_power_meter.php',lang('Date
registered')));
$t->set_var('lang_building',lang('Building'));
$t->set_var('lang_entrance',lang('Entrance'));
--- 155,163 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_installation_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_bms.id',$order,'/property/list_power_meter.php',lang('Installation
ID')));
$t->set_var('sort_power_meter_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'point_name',$order,'/property/list_power_meter.php',lang('Power_meter
ID')));
!
$t->set_var('sort_address',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'beskrivelse',$order,'/property/list_power_meter.php',lang('Address')));
!
$t->set_var('sort_property',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_bms.location_code',$order,'/property/list_power_meter.php',lang('Property')));
!
$t->set_var('sort_date_created',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_bms.date_created',$order,'/property/list_power_meter.php',lang('Date
registered')));
$t->set_var('lang_building',lang('Building'));
$t->set_var('lang_entrance',lang('Entrance'));
***************
*** 173,177 ****
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $installation_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('bms_sys_adr_code'));
if (! $installation_id) $installation_id = ' ';
--- 173,177 ----
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $installation_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'));
if (! $installation_id) $installation_id = ' ';
***************
*** 179,196 ****
if (! $power_meter_id) $power_meter_id = ' ';
! $location_code =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('splocation_code'));
! if (! $descr) $descr = ' ';
!
! $address_1 =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('address_1'));
! if (! $type_descr) $type_descr = ' ';
!
! $objekt_id = substr($location_code, 0, 4);
if (! $objekt_id) $objekt_id = ' ';
!
! $bygg_id = substr($location_code, 9, 2);
if (! $bygg_id) $bygg_id = ' ';
!
! $seksjon_id = substr($location_code, 11, 2);
if (! $seksjon_id) $seksjon_id = ' ';
$date_created =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('date_created'));
--- 179,192 ----
if (! $power_meter_id) $power_meter_id = ' ';
! $objekt_id = $GLOBALS['phpgw']->db->f('objekt_id');
if (! $objekt_id) $objekt_id = ' ';
! $bygg_id = $GLOBALS['phpgw']->db->f('bygg_id');
if (! $bygg_id) $bygg_id = ' ';
! $seksjon_id = $GLOBALS['phpgw']->db->f('seksjons_id');
if (! $seksjon_id) $seksjon_id = ' ';
+
+ $address_1 =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('beskrivelse'));
+ if (! $type_descr) $type_descr = ' ';
+
$date_created =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('date_created'));
Index: add_power_meter.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_power_meter.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** add_power_meter.php 29 Aug 2002 20:28:05 -0000 1.2
--- add_power_meter.php 16 Oct 2002 15:27:09 -0000 1.3
***************
*** 24,28 ****
$num = addslashes($num);
! $splocation_code= $objekt_id. "-"
.$objekt_id.$bygg_id.$seksjons_id;
$errorcount = 0;
--- 24,28 ----
$num = addslashes($num);
! $location_code= $objekt_id. "-"
.$objekt_id.$bygg_id.$seksjons_id;
$errorcount = 0;
***************
*** 32,36 ****
}
! $GLOBALS['phpgw']->db->query("select count(*) from
span_bms_system_adr where bms_sys_adr_code='$num'");
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
--- 32,36 ----
}
! $GLOBALS['phpgw']->db->query("select count(*) from fm_bms where
id='$num'");
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
***************
*** 42,45 ****
--- 42,47 ----
{
+ $user_lid
=strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
+
/* echo 'num: '.$num .'<BR>';
echo 'power_meter_id: '.$power_meter_id .'<BR>';
***************
*** 48,56 ****
*/
! $GLOBALS['phpgw']->db->query("insert into
span_bms_system_adr (bms_sys_adr_code,bms_sys_id,bms_sys_key,point_name,type) "
! . "values
('$num','EL_ANLEGG','1','$power_meter_id','R')");
!
! $GLOBALS['phpgw']->db->query("insert into
span_pmlocread
(bms_sys_adr_code,bms_sys_id,splocation_code,pmread_code,bms_sys_key,
reading_type, action_type, action_occurrence,date_created) "
! . "values
('$num','EL_ANLEGG','$splocation_code','EL_ANLEG','1','R','N','R','" . date("M
d Y") ."')");
}
--- 50,55 ----
*/
! $GLOBALS['phpgw']->db->query("insert into fm_bms
(id,point_name,type,location_code,date_created,objekt_id,bygg_id,seksjons_id,user_created)
"
! . "values
('$num','$power_meter_id','EL_ANLEGG','$location_code','" . date("M d Y")
."','$objekt_id','$bygg_id','$seksjons_id','$user_lid')");
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property invoice_detail.php,1.6,1.7 list_vendors_activities.php,1.4,1.5 add_invoice.php,1.3,1.4 list_power_meter.php,1.3,1.4 add_power_meter.php,1.2,1.3,
Sigurd Nes <address@hidden> <=