[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.7,1.8 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.7,1.8 class.soproperty.inc.php,1.9,1.10 class.uiwo_hour.inc.php,1.7,1.8 |
|
Date: |
Wed, 02 Apr 2003 14:25:04 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21979/inc
Modified Files:
class.boworkorder.inc.php class.soproperty.inc.php
class.uiwo_hour.inc.php
Log Message:
no message
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.boworkorder.inc.php 18 Mar 2003 10:51:28 -0000 1.7
--- class.boworkorder.inc.php 2 Apr 2003 19:25:01 -0000 1.8
***************
*** 281,286 ****
$workorder['start_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
$workorder['end_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
! $vendor
=
$this->contacts->read_single_entry($workorder['vendor_id'],array('org_name'=>'org_name'));
$workorder['vendor_name'] =
$vendor[0]['org_name'];
$workorder['b_account_name'] =
$this->so->get_b_account_name($workorder['b_account_id']);
--- 281,287 ----
$workorder['start_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
$workorder['end_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
! $vendor
=
$this->contacts->read_single_entry($workorder['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
$workorder['vendor_name'] =
$vendor[0]['org_name'];
+ $workorder['vendor_email'] =
$vendor[0]['email'];
$workorder['b_account_name'] =
$this->so->get_b_account_name($workorder['b_account_id']);
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.soproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.9
--- class.soproperty.inc.php 2 Apr 2003 19:25:01 -0000 1.10
***************
*** 31,34 ****
--- 31,44 ----
}
+
+
+
+ function get_district($property_id)
+ {
+ $this->db->query("select district_id from
fm_part_of_town $this->join fm_property as o on b.bydel_id=o.bydel_id where
o.property_id ='$property'");
+ $this->db->next_record();
+ $omraade_id = $this->db->f('omraade_id');
+ }
+
function read_category_name($cat_id)
{
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiwo_hour.inc.php 2 Apr 2003 11:13:46 -0000 1.7
--- class.uiwo_hour.inc.php 2 Apr 2003 19:25:01 -0000 1.8
***************
*** 185,188 ****
--- 185,190 ----
'lang_vendor_name'
=> lang('Vendor'),
'vendor_name'
=> $workorder['vendor_name'],
+ 'vendor_email'
=> $workorder['vendor_email'],
+ 'descr'
=> $workorder['descr'],
'lang_workorder_id'
=> lang('Workorder ID'),
***************
*** 354,359 ****
$show_cost = get_var('show_cost',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
! $links = $this->bocommon->menu();
!
$common_data =
$this->common_data($workorder_id);
--- 356,360 ----
$show_cost = get_var('show_cost',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
! $workorder =
$this->boworkorder->read_single($workorder_id);
$common_data =
$this->common_data($workorder_id);
***************
*** 361,369 ****
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
! //_debug_array($project);
!
! $content =
$this->view_hour_data($values_hour,$show_cost);
!
$table_header[] = array
--- 362,375 ----
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
! _debug_array($project);
+ if(!$show_cost)
+ {
+ for ($i=0;$i<count($values_hour);$i++)
+ {
+ unset($values_hour[$i]['cost']);
+ unset($values_hour[$i]['billperae']);
+ }
+ }
$table_header[] = array
***************
*** 393,417 ****
);
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&delete=true&workorder_id='
. $workorder_id),
'function'
=> 'view',
'links'
=> $links,
'num_records'
=> count($hours_list),
'total_hours_records' =>
$common_data['total_hours_records'],
- 'lang_total_records' =>
lang('Total records'),
-
'appname'
=> lang($this->currentapp),
'function_msg'
=> lang('Send order'),
- 'total_hours_records' =>
$common_data['total_hours_records'],
- 'lang_total_records' =>
lang('Total records'),
'table_header_view_order' =>
$table_header,
! 'values_view_order'
=> $content,
! 'workorder_data'
=> $common_data['workorder_data'],
'table_send'
=> $table_send,
! 'table_done'
=> $table_done,
! 'table_sum'
=> $common_data['table_sum']
);
--- 399,501 ----
);
+ $dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+ $date
= $GLOBALS['phpgw']->common->show_date(time(),$dateformat);
+
+
$tenant_data=$this->socommon->read_single_tenant($project['tenant_id']);
+ $tenant_name= $tenant_data['last_name'] . ', ' .
$tenant_data['first_name'];
+
$data = array
(
! 'error'
=> $receipt['error'],
! 'message'
=> $receipt['message'],
!
! 'lang_date'
=> lang('Date'),
! 'date'
=> $date,
!
! 'lang_start_date'
=> lang('Start date'),
! 'start_date'
=> $workorder['start_date'],
!
! 'lang_end_date'
=> lang('End date'),
! 'end_date'
=> $workorder['end_date'],
!
! 'lang_from'
=> lang('From'),
! 'from_name'
=> $GLOBALS['phpgw_info']['user']['fullname'],
! 'from_phone'
=>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['cellphone'],
!
! 'lang_to'
=> lang('To'),
! 'to_name'
=> $workorder['vendor_name'],
! 'to_email'
=> $workorder['vendor_email'],
!
! 'lang_property'
=> lang('property'),
! 'property'
=> $project['property_id'],
!
! 'lang_building'
=> lang('building'),
! 'building'
=> $project['building_id'],
!
! 'lang_floor'
=> lang('Floor'),
! 'floor'
=> $project['floor'],
!
! 'lang_address'
=> lang('Address'),
! 'address'
=> $project['street_name'] . ' ' . $project['street_number'],
!
! 'lang_tenant'
=> lang('Tenant'),
! 'tenant_name'
=> $tenant_name,
!
! 'lang_title'
=> lang('Title'),
! 'title'
=> $workorder['title'],
!
!
! 'lang_descr'
=> lang('Description'),
! 'descr'
=> $workorder['descr'],
!
! 'lang_sum_calculation' =>
lang('Sum of calculation'),
! 'sum_calculation'
=> $common_data['table_sum']['value_total_sum'],
!
! 'lang_mail'
=> lang('E-Mail'),
!
! 'lang_workorder_id'
=> lang('Workorder ID'),
! 'workorder_id'
=> $workorder_id,
!
! // 'lang_vendor'
=> lang('vendor'),
!
! 'lang_branch'
=> lang('branch'),
! 'branch_list'
=> $this->boproject->select_branch_p_list($project['project_id']),
! 'other_branch'
=> $project['other_branch'],
!
! 'key_responsible_list' =>
$this->bo->select_branch_list($project['key_responsible']),
! 'lang_key_responsible' =>
lang('key responsible'),
!
! 'key_fetch_list'
=> $this->bo->select_key_location_list($workorder['key_fetch']),
! 'lang_key_fetch_location' =>
lang('Where to pick up the key'),
!
! 'key_deliver_list'
=> $this->bo->select_key_location_list($workorder['key_deliver']),
! 'lang_key_deliver_location' =>
lang('Where to deliver the key'),
!
! 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
!
! 'lang_budget_account' =>
lang('Budget account'),
! 'lang_district'
=> lang('District'),
!
! 'lang_contact_phone' =>
lang('Contact Phone'),
! 'contact_phone'
=> $project['contact_phone'],
!
! 'lang_cost_tax'
=> lang('Cost (incl tax):'),
! 'lang_materials'
=> lang('Materials:__________'),
! 'lang_work'
=> lang('work:____________'),
! 'coordinator_email'
=> $GLOBALS['phpgw_info']['user']['preferences']['email']['address'],
! 'coordinator_phone'
=> $GLOBALS['phpgw_info']['user']['preferences']['property']['cellphone'],
!
!
!
'function'
=> 'view',
'links'
=> $links,
'num_records'
=> count($hours_list),
'total_hours_records' =>
$common_data['total_hours_records'],
'appname'
=> lang($this->currentapp),
'function_msg'
=> lang('Send order'),
'table_header_view_order' =>
$table_header,
! 'values_view_order'
=> $values_hour,
'table_send'
=> $table_send,
! 'table_done'
=> $table_done
);
***************
*** 422,473 ****
}
- function view_hour_data($values_hour,$show_cost)
- {
-
- $grouping_descr_old = '';
- while (is_array($values_hour) && list(,$hour) =
each($values_hour))
- {
- $descr= $hour['hours_descr'];
-
- if($hour['remark'])
- {
- $descr .= "\n" . $hour['remark'];
- }
-
- if(!$show_cost)
- {
- unset($hour['billperae']);
- unset($hour['cost']);
- }
-
- if($hour['grouping_descr']!=$grouping_descr_old)
- {
- $content[] = array
- (
- lang('post')
=> $hour['grouping_descr'],
- lang('code')
=> '',
- lang('descr')
=> '',
- lang('unit')
=> '',
- lang('quantity')
=> '',
- lang('bill per unit')
=> '',
- lang('cost')
=> ''
- );
- }
-
- $grouping_descr_old =
$hour['grouping_descr'];
-
- $content[] = array
- (
- lang('post')
=> $hour['post'],
- lang('code')
=> $hour['code'],
- lang('descr')
=> $descr,
- lang('unit')
=> $hour['unit'],
- lang('quantity')
=> $hour['quantity'],
- lang('bill per unit') =>
$hour['billperae'],
- lang('cost')
=> $hour['cost']
- );
- }
- return $content;
- }
function tender()
--- 506,509 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.7,1.8 class.soproperty.inc.php,1.9,1.10 class.uiwo_hour.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: preferences preferences.php,1.28,1.29
- Next by Date:
[Phpgroupware-cvs] CVS: property/help/EN overview.php,NONE,1.1 project.php,NONE,1.1 property.php,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: preferences preferences.php,1.28,1.29
- Next by thread:
[Phpgroupware-cvs] CVS: property/help/EN overview.php,NONE,1.1 project.php,NONE,1.1 property.php,NONE,1.1
- Index(es):