[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.6.2.6 class.uiwork
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.menu.inc.php, 1.6.2.6 class.uiworkorder.inc.php, 1.3.2.6 class.uiproject.inc.php, 1.9.2.7 class.uiwo_hour.inc.php, 1.4.2.5 class.soproject.inc.php, 1.7.2.5 |
|
Date: |
Thu, 24 Feb 2005 13:35:09 -0000 |
Update of property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.menu.inc.php lines: +9 -8
class.uiworkorder.inc.php lines: +32 -1
class.uiproject.inc.php lines: +28 -5
class.uiwo_hour.inc.php lines: +14 -3
class.soproject.inc.php lines: +5 -3
Log Message:
no message
====================================================
Index: property/inc/class.menu.inc.php
diff -u property/inc/class.menu.inc.php:1.6.2.5
property/inc/class.menu.inc.php:1.6.2.6
--- property/inc/class.menu.inc.php:1.6.2.5 Thu Nov 25 09:22:50 2004
+++ property/inc/class.menu.inc.php Mon Jan 10 13:07:02 2005
@@ -226,6 +226,15 @@
$menu['sub_menu'][$i]['name']
= lang('b_account');
$menu['sub_menu'][$i]['statustext']
= lang('b_account');
+ $i++;
+ if($page=='vendor')
+ {
+
$menu['sub_menu'][$i]['this']=True;
+ }
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiactor.index&role=vendor');
+ $menu['sub_menu'][$i]['name']
= lang('Vendor');
+ $menu['sub_menu'][$i]['statustext']
= lang('Vendor');
+
if ($this->acl2->check('.invoice',16))
{
$i++;
@@ -252,14 +261,6 @@
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
$menu['sub_menu'][$i]['name']
= lang('Export invoice');
$menu['sub_menu'][$i]['statustext'] = lang('Export invoice');
- $i++;
- if($page=='vendor')
- {
-
$menu['sub_menu'][$i]['this']=True;
- }
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiactor.index&role=vendor');
- $menu['sub_menu'][$i]['name']
= lang('Vendor');
-
$menu['sub_menu'][$i]['statustext'] = lang('Vendor');
}
if ($this->acl2->check('.invoice',2))
{
====================================================
Index: property/inc/class.uiworkorder.inc.php
diff -u property/inc/class.uiworkorder.inc.php:1.3.2.5
property/inc/class.uiworkorder.inc.php:1.3.2.6
--- property/inc/class.uiworkorder.inc.php:1.3.2.5 Wed Dec 15 13:25:25 2004
+++ property/inc/class.uiworkorder.inc.php Mon Jan 10 13:07:02 2005
@@ -679,6 +679,19 @@
'lookup_type' => 'view'
));
+
+ if($project['contact_phone'])
+ {
+ for
($i=0;$i<count($location_data['location']);$i++)
+ {
+
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+ {
+
unset($location_data['location'][$i]['value']);
+ }
+ }
+ }
+
+
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
'vendor_id' =>
$values['vendor_id'],
'vendor_name' =>
$values['vendor_name']));
@@ -763,6 +776,9 @@
'lang_copy_workorder' =>
lang('Copy workorder ?'),
'lang_copy_workorder_statustext' =>
lang('Choose Copy Workorder to copy this workorder to a new workorder'),
+ 'lang_contact_phone' =>
lang('Contact phone'),
+ 'contact_phone'
=> $project['contact_phone'],
+
'lang_charge_tenant' =>
lang('Charge tenant'),
'lang_charge_tenant_statustext' => lang('Choose
charge tenant if the tenant i to pay for this project'),
'charge_tenant'
=> $values['charge_tenant'],
@@ -997,6 +1013,19 @@
'lookup_type' => 'view'
));
+
+ if($project['contact_phone'])
+ {
+ for
($i=0;$i<count($location_data['location']);$i++)
+ {
+
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+ {
+
unset($location_data['location'][$i]['value']);
+ }
+ }
+ }
+
+
$data = array
(
'project_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view'),
@@ -1097,7 +1126,9 @@
'total_hours_records' =>
$hour_data['total_hours_records'],
'table_header_hour'
=> $hour_data['table_header'],
'values_hour'
=> $hour_data['content'],
- 'table_sum'
=> $hour_data['table_sum']
+ 'table_sum'
=> $hour_data['table_sum'],
+ 'lang_contact_phone' =>
lang('Contact phone'),
+ 'contact_phone'
=> $project['contact_phone']
);
$appname
= lang('Workorder');
====================================================
Index: property/inc/class.uiproject.inc.php
diff -u property/inc/class.uiproject.inc.php:1.9.2.6
property/inc/class.uiproject.inc.php:1.9.2.7
--- property/inc/class.uiproject.inc.php:1.9.2.6 Wed Dec 15 13:25:25 2004
+++ property/inc/class.uiproject.inc.php Mon Jan 10 13:07:01 2005
@@ -849,6 +849,16 @@
'entity_data' => $values['p']
));
+ if($values['contact_phone'])
+ {
+ for
($i=0;$i<count($location_data['location']);$i++)
+ {
+
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+ {
+
$location_data['location'][$i]['value'] = $values['contact_phone'];
+ }
+ }
+ }
$link_data = array
(
@@ -1159,6 +1169,16 @@
'entity_data' => $values['p']
));
+ if($values['contact_phone'])
+ {
+ for
($i=0;$i<count($location_data['location']);$i++)
+ {
+
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+ {
+
unset($location_data['location'][$i]['value']);
+ }
+ }
+ }
if($values['reserve'])
{
@@ -1228,8 +1248,8 @@
'value_project_id'
=> $values['project_id'],
'value_name'
=> $values['name'],
- 'lang_other_branch'
=> lang('Other branch'),
- 'value_other_branch'
=> $values['other_branch'],
+ 'lang_other_branch'
=> lang('Other branch'),
+ 'value_other_branch' =>
$values['other_branch'],
'lang_descr'
=> lang('Description'),
'value_descr'
=> $values['descr'],
@@ -1256,8 +1276,8 @@
'branch_list'
=> $this->bo->select_branch_p_list($values['project_id']),
'lang_branch'
=> lang('branch'),
- 'key_responsible_list'
=> $this->bo->select_branch_list($values['key_responsible']),
- 'lang_key_responsible'
=> lang('key responsible'),
+ 'key_responsible_list' =>
$this->bo->select_branch_list($values['key_responsible']),
+ 'lang_key_responsible' =>
lang('key responsible'),
'key_fetch_list'
=> $this->bo->select_key_location_list($values['key_fetch']),
'lang_key_fetch'
=> lang('key fetch location'),
@@ -1268,7 +1288,10 @@
'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $id),
'lang_edit_statustext'
=> lang('Edit this entry project'),
'lang_edit'
=> lang('Edit'),
- 'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
+ 'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+
+ 'lang_contact_phone' =>
lang('Contact phone'),
+ 'contact_phone'
=> $values['contact_phone'],
);
$appname = lang('project');
====================================================
Index: property/inc/class.uiwo_hour.inc.php
diff -u property/inc/class.uiwo_hour.inc.php:1.4.2.4
property/inc/class.uiwo_hour.inc.php:1.4.2.5
--- property/inc/class.uiwo_hour.inc.php:1.4.2.4 Thu Nov 18 22:12:08 2004
+++ property/inc/class.uiwo_hour.inc.php Mon Jan 10 13:07:02 2005
@@ -376,7 +376,7 @@
'lang_billperae' => lang('Bill per
unit'),
'lang_quantity' => lang('Quantity'),
'lang_cost' => lang('cost'),
- 'lang_deviation ' => lang('deviation '),
+ 'lang_deviation ' => lang('deviation'),
'lang_result' => lang('result'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
@@ -638,6 +638,16 @@
'lookup_type' => 'view'
));
+ if($project['contact_phone'])
+ {
+ for
($i=0;$i<count($location_data['location']);$i++)
+ {
+
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+ {
+
unset($location_data['location'][$i]['value']);
+ }
+ }
+ }
if(!$show_cost)
{
@@ -709,7 +719,6 @@
'lang_title'
=> lang('Title'),
'title'
=> $workorder['title'],
-
'lang_descr'
=> lang('Description'),
'descr'
=> $workorder['descr'],
@@ -719,6 +728,8 @@
'lang_sum_calculation' =>
lang('Sum of calculation'),
'sum_calculation'
=> $common_data['table_sum'][0]['value_total_sum'],
+ 'lang_contact_phone' =>
lang('Contact phone'),
+ 'contact_phone'
=> $project['contact_phone'],
// 'lang_vendor'
=> lang('vendor'),
====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.7.2.4
property/inc/class.soproject.inc.php:1.7.2.5
--- property/inc/class.soproject.inc.php:1.7.2.4 Tue Dec 7 09:04:28 2004
+++ property/inc/class.soproject.inc.php Mon Jan 10 13:07:02 2005
@@ -344,6 +344,8 @@
$project['p_num']
= $this->db->f('p_num');
$project['p_entity_id'] =
$this->db->f('p_entity_id');
$project['p_cat_id'] =
$this->db->f('p_cat_id');
+ $project['contact_phone'] =
$this->db->f('contact_phone');
+
$project['power_meter'] =
$this->get_power_meter($this->db->f('location_code'));
}
@@ -509,7 +511,7 @@
.
"descr,budget,reserve,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,charge_tenant,user_id
$cols) "
. "VALUES ($values $vals )",__LINE__,__FILE__);
- if($project['extra']['contact_phone'])
+ if($project['extra']['contact_phone'] &&
$project['extra']['tenant_id'])
{
$this->db->query("update fm_tenant set
contact_phone='". $project['extra']['contact_phone']. "' where id='".
$project['extra']['tenant_id']. "'",__LINE__,__FILE__);
}
@@ -679,7 +681,7 @@
$this->db->query("UPDATE fm_project set $value_set
$vals WHERE id= '" . $project['project_id'] ."'",__LINE__,__FILE__);
- if($project['extra']['contact_phone'])
+ if($project['extra']['contact_phone'] &&
$project['extra']['tenant_id'])
{
$this->db->query("update fm_tenant set
contact_phone='". $project['extra']['contact_phone']. "' where id='".
$project['extra']['tenant_id']. "'",__LINE__,__FILE__);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.menu.inc.php, 1.6.2.6 class.uiworkorder.inc.php, 1.3.2.6 class.uiproject.inc.php, 1.9.2.7 class.uiwo_hour.inc.php, 1.4.2.5 class.soproject.inc.php, 1.7.2.5,
sigurdne <=