[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property list_workorder.php,1.6,1.7 list_invoice
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property list_workorder.php,1.6,1.7 list_invoice.php,1.5,1.6 list_property_value.php,1.3,1.4 property_value_history.php,1.2,1.3 |
|
Date: |
Fri, 20 Sep 2002 13:05:38 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv25623
Modified Files:
list_workorder.php list_invoice.php list_property_value.php
property_value_history.php
Log Message:
no message
Index: list_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_workorder.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** list_workorder.php 18 Sep 2002 19:54:15 -0000 1.6
--- list_workorder.php 20 Sep 2002 17:05:36 -0000 1.7
***************
*** 75,79 ****
$status='active';
}
! $pro =
$fm_wrkorder->read_wrkorders($start,True,$query_location,$filter,$sort,$order,$status,$cat_id,$coordinator_id,$query_vendor,$query_location,$project_id);
//---------------------- nextmatch variable template-declarations
---------------------------
--- 75,79 ----
$status='active';
}
! $pro =
$fm_wrkorder->read_wrkorders($start,True,$query_location,$filter,$sort,$order,$status,$cat_id,$coordinator_id,$query_vendor,$query_location,$project_id,$location_code);
//---------------------- nextmatch variable template-declarations
---------------------------
***************
*** 98,102 ****
$t->set_var('sort_vendor',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'vendor',$order,'/property/list_workorder.php',lang('vendor')));
$t->set_var('sort_property',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/list_workorder.php',lang('property')));
-
$t->set_var('sort_apartment',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'leie_id',$order,'/property/list_workorder.php',lang('apartment')));
$t->set_var('sort_status',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'status',$order,'/property/list_workorder.php',lang('Status')));
$t->set_var('sort_title',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'title',$order,'/property/list_workorder.php',lang('Title')));
--- 98,101 ----
***************
*** 106,110 ****
--- 105,114 ----
$t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_view',lang('View'));
+ $t->set_var('lang_building',lang('Building'));
+ $t->set_var('lang_entrance',lang('Entrance'));
$t->set_var('lang_search',lang('Search'));
+ $t->set_var('lang_apartment',lang('apartment'));
+ $t->set_var('lang_location_search_help',lang('Click to search this
location'));
+ $t->set_var('lang_location_search',lang('Search'));
// -------------- end header declaration -----------------
***************
*** 118,127 ****
if (! $title) $title = ' ';
! $objekt_id =
$GLOBALS['phpgw']->strip_html($pro[$i]['objekt_id']);
if (! $objekt_id) $objekt_id = ' ';
! $leie_id = $GLOBALS['phpgw']->strip_html($pro[$i]['leie_id']);
! if (! $leie_id) $leie_id = ' ';
$number = $GLOBALS['phpgw']->strip_html($pro[$i]['number']);
--- 122,160 ----
if (! $title) $title = ' ';
! $location_code = $pro[$i]['location_code'];
! if (! $location_code) $location_code = ' ';
!
! $property_id = $pro[$i]['objekt_id'];
if (! $objekt_id) $objekt_id = ' ';
+ $building_id = $pro[$i]['bygg_id'];
+ if (! $building_id)
+ {
+ $building_id = ' ';
+ }
+ else
+ {
+ $location_code_building=$property_id.'-'.$building_id;
+ }
! $entrance_id = $pro[$i]['seksjons_id'];
! if (! $entrance_id)
! {
! $entrance_id = ' ';
! }
! else
! {
!
$location_code_entrance=$location_code_building.'-'.$entrance_id;
! }
!
! $apartment_id = $pro[$i]['leie_id'];
! if (! $apartment_id)
! {
! $apartment_id = ' ';
! }
! else
! {
!
$location_code_apartment=$location_code_entrance.'-'.$apartment_id;
! }
$number = $GLOBALS['phpgw']->strip_html($pro[$i]['number']);
***************
*** 156,161 ****
'status' => $status,
'title' => $title,
! 'objekt_id' => $objekt_id,
! 'leie_id' => $leie_id,
'end_date' => $end_dateout,
'coordinator' =>
$coordinatorout));
--- 189,196 ----
'status' => $status,
'title' => $title,
! 'property_id' => $property_id,
! 'building_id' => $building_id,
! 'entrance_id' => $entrance_id,
! 'apartment_id' =>
$apartment_id,
'end_date' => $end_dateout,
'coordinator' =>
$coordinatorout));
***************
*** 166,169 ****
--- 201,212 ----
. '&start=' . $start . '&filter=' . $filter . '&cat_id=' . $cat_id));
+
$t->set_var('location_search_property',$GLOBALS['phpgw']->link('/property/list_workorder.php','location_code='
. $property_id . '&sort=' . $sort . '&order=' . $order
+
. '&coordinator_id=all' . '&start=' . $start . '&filter=' . $filter));
+
$t->set_var('location_search_building',$GLOBALS['phpgw']->link('/property/list_workorder.php','location_code='
. $location_code_building . '&sort=' . $sort . '&order=' . $order
+
. '&coordinator_id=all' . '&start=' . $start . '&filter=' . $filter));
+
$t->set_var('location_search_entrance',$GLOBALS['phpgw']->link('/property/list_workorder.php','location_code='
. $location_code_entrance . '&sort=' . $sort . '&order=' . $order
+
. '&coordinator_id=all' . '&start=' . $start . '&filter=' . $filter));
+
$t->set_var('location_search_apartment',$GLOBALS['phpgw']->link('/property/list_workorder.php','location_code='
. $location_code_apartment . '&sort=' . $sort . '&order=' . $order
+
. '&coordinator_id=all' . '&start=' . $start . '&filter=' . $filter));
if
($fm_wrkorder->check_perms($grants[$pro[$i]['coordinator']],PHPGW_ACL_EDIT) ||
$pro[$i]['coordinator'] == $GLOBALS['phpgw_info']['user']['account_id'])
Index: list_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_invoice.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** list_invoice.php 3 Sep 2002 22:15:38 -0000 1.5
--- list_invoice.php 20 Sep 2002 17:05:36 -0000 1.6
***************
*** 356,360 ****
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin where account_id
= $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
--- 356,360 ----
}
! $GLOBALS['phpgw']->db->query(" SELECT * from fm_admin where
sub_module='invoice' and account_id= $user_id");
$GLOBALS['phpgw']->db->next_record();
$is_janitor = $GLOBALS['phpgw']->db->f('janitor');
***************
*** 362,365 ****
--- 362,367 ----
$is_budget_responsible = $GLOBALS['phpgw']->db->f('budget_responsible');
$is_transfer = $GLOBALS['phpgw']->db->f('transfer');
+
+ // echo 'is_transfer: '.$is_transfer .'<BR>';
$db2 = $GLOBALS['phpgw']->db;
Index: list_property_value.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_property_value.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_property_value.php 19 Sep 2002 18:42:37 -0000 1.3
--- list_property_value.php 20 Sep 2002 17:05:36 -0000 1.4
***************
*** 75,79 ****
if ($value_h[$n])
{
!
$new_value=$value_h[$n]-($initial_value_h[$n]*$new_index);
// echo 'new_value: '.$new_value .'<BR>';
--- 75,88 ----
if ($value_h[$n])
{
!
! if ((abs($value_h[$n])-
abs(($initial_value_h[$n]*$new_index)))<0)
! {
! $new_value=0;
!
$new_index=$value_h[$n]/$initial_value_h[$n];
! }
! else
! {
!
$new_value=$value_h[$n]-($initial_value_h[$n]*$new_index);
! }
// echo 'new_value: '.$new_value .'<BR>';
Index: property_value_history.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/property_value_history.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** property_value_history.php 16 Sep 2002 16:05:44 -0000 1.2
--- property_value_history.php 20 Sep 2002 17:05:36 -0000 1.3
***************
*** 87,92 ****
if (!$new_value)
{
- $new_value=$old_value-($initial_value_h*$new_index);
}
--- 87,100 ----
if (!$new_value)
{
+ if ((abs($old_value)-
abs(($initial_value_h*$new_index)))<0)
+ {
+ $new_value=0;
+ $new_index=$old_value/$initial_value_h;
+ }
+ else
+ {
+
$new_value=$old_value-($initial_value_h*$new_index);
+ }
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property list_workorder.php,1.6,1.7 list_invoice.php,1.5,1.6 list_property_value.php,1.3,1.4 property_value_history.php,1.2,1.3,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.11,1.12 class.fm_wrkorder.inc.php,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.xmltool.inc.php,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.11,1.12 class.fm_wrkorder.inc.php,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.xmltool.inc.php,1.1,1.2
- Index(es):