[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.46,1.47 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.46,1.47 class.sobuilding.inc.php,1.11,1.12 class.sodocument.inc.php,1.5,1.6 class.sodrawing.inc.php,1.6,1.7 class.soproject.inc.php,1.11,1.12 class.sorequest.inc.php,1.6,1.7 class.soworkorder.inc.php,1.14,1.15 class.uibuilding.inc.php,1.19,1.20 class.uiinvoice.inc.php,1.23,1.24 class.uilookup.inc.php,1.17,1.18 class.uimeter.inc.php,1.8,1.9 class.uipricebook.inc.php,1.14,1.15 class.uiXport.inc.php,1.26,1.27 |
|
Date: |
Wed, 21 May 2003 16:09:53 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv27275/inc
Modified Files:
class.bocommon.inc.php class.sobuilding.inc.php
class.sodocument.inc.php class.sodrawing.inc.php
class.soproject.inc.php class.sorequest.inc.php
class.soworkorder.inc.php class.uibuilding.inc.php
class.uiinvoice.inc.php class.uilookup.inc.php
class.uimeter.inc.php class.uipricebook.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.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** class.bocommon.inc.php 20 May 2003 18:42:58 -0000 1.46
--- class.bocommon.inc.php 21 May 2003 20:09:51 -0000 1.47
***************
*** 476,479 ****
--- 476,484 ----
for ($i=0;$i<count($values_attribute);$i++)
{
+ if($values_attribute[$i]['datatype']=='N' &&
$values_attribute[$i]['value'])
+ {
+ $values_attribute[$i]['value'] =
str_replace(",",".",$values_attribute[$i]['value']);
+ }
+
if($values_attribute[$i]['datatype']=='D' &&
$values_attribute[$i]['value'])
{
Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.sobuilding.inc.php 21 May 2003 12:46:39 -0000 1.11
--- class.sobuilding.inc.php 21 May 2003 20:09:51 -0000 1.12
***************
*** 98,101 ****
--- 98,102 ----
$building[] = array
(
+ 'location_code' =>
$this->db->f('location_code'),
'property_id' =>
$this->db->f('property_id'),
'building_id' =>
$this->db->f('building_id'),
Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sodocument.inc.php 15 May 2003 09:08:02 -0000 1.5
--- class.sodocument.inc.php 21 May 2003 20:09:51 -0000 1.6
***************
*** 285,293 ****
$document['vendor_id'] =
$this->db->f('vendor_id');
$document['floor_id'] =
$this->db->f('floor_id');
- $document['charge_tenant'] =
$this->db->f('charge_tenant');
$document['descr']
= $this->db->f('descr');
$document['status']
= $this->db->f('status');
- $document['actual_cost']
= $this->db->f('actual_cost');
- $document['tenant_id'] =
$this->db->f('tenant_id');
$document['owner']
= $this->db->f('owner');
$document['coordinator']
= $this->db->f('coordinator');
--- 285,290 ----
Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sodrawing.inc.php 15 May 2003 09:08:02 -0000 1.6
--- class.sodrawing.inc.php 21 May 2003 20:09:51 -0000 1.7
***************
*** 196,200 ****
$drawing['descr']
= $this->db->f('descr');
$drawing['status']
= $this->db->f('status');
- $drawing['actual_cost'] =
$this->db->f('actual_cost');
$drawing['tenant_id'] =
$this->db->f('tenant_id');
$drawing['owner']
= $this->db->f('owner');
--- 196,199 ----
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soproject.inc.php 15 May 2003 09:08:02 -0000 1.11
--- class.soproject.inc.php 21 May 2003 20:09:51 -0000 1.12
***************
*** 213,217 ****
$project['status']
= $this->db->f('status');
$project['budget']
= (int)$this->db->f('budget');
- $project['actual_cost'] =
$this->db->f('actual_cost');
$project['tenant_id'] =
$this->db->f('tenant_id');
$project['owner']
= $this->db->f('owner');
--- 213,216 ----
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sorequest.inc.php 15 May 2003 09:08:02 -0000 1.6
--- class.sorequest.inc.php 21 May 2003 20:09:51 -0000 1.7
***************
*** 277,281 ****
$request['status']
= $this->db->f('status');
$request['budget']
= (int)$this->db->f('budget');
- $request['actual_cost']
= $this->db->f('actual_cost');
$request['tenant_id']
= $this->db->f('tenant_id');
$request['owner']
= $this->db->f('owner');
--- 277,280 ----
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.soworkorder.inc.php 15 May 2003 09:08:02 -0000 1.14
--- class.soworkorder.inc.php 21 May 2003 20:09:51 -0000 1.15
***************
*** 224,228 ****
$workorder['addition_percentage'] =
(int)$this->db->f('addition');
$workorder['addition_rs']
= (int)$this->db->f('rig_addition');
! $workorder['actual_cost'] =
$this->db->f('actual_cost');
$workorder['owner']
= $this->db->f('owner');
$workorder['vendor_id'] =
$this->db->f('vendor_id');
--- 224,229 ----
$workorder['addition_percentage'] =
(int)$this->db->f('addition');
$workorder['addition_rs']
= (int)$this->db->f('rig_addition');
! $workorder['act_mtrl_cost']
= $this->db->f('act_mtrl_cost');
! $workorder['act_vendor_cost'] =
$this->db->f('act_vendor_cost');
$workorder['owner']
= $this->db->f('owner');
$workorder['vendor_id'] =
$this->db->f('vendor_id');
Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uibuilding.inc.php 21 May 2003 12:46:39 -0000 1.19
--- class.uibuilding.inc.php 21 May 2003 20:09:51 -0000 1.20
***************
*** 90,96 ****
'date'
=> $building['date'],
'property_name'
=> $building['property_name'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.view&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&property_id='
. $building['property_id'].'&building_id=' . $building['building_id']),
'lang_view_statustext' =>
lang('view the building'),
'lang_edit_statustext' =>
lang('edit the building'),
--- 90,96 ----
'date'
=> $building['date'],
'property_name'
=> $building['property_name'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.view&location_code='
. $building['location_code']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&location_code='
. $building['location_code']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.delete&location_code='
. $building['location_code']),
'lang_view_statustext' =>
lang('view the building'),
'lang_edit_statustext' =>
lang('edit the building'),
***************
*** 187,192 ****
function edit()
{
! $property_id =
get_var('property_id',array('GET'));
! $building_id =
get_var('building_id',array('POST','GET'));
$values =
get_var('values',array('POST','GET'));
--- 187,195 ----
function edit()
{
! $location_code =
get_var('location_code',array('GET'));
! $location = split('-',$location_code);
! $property_id = $location[0];
! $building_id = $location[1];
!
$values =
get_var('values',array('POST','GET'));
***************
*** 282,287 ****
(
'menuaction' =>
$this->currentapp.'.uibuilding.edit',
! 'property_id' => $property_id,
! 'building_id' => $building_id
);
--- 285,289 ----
(
'menuaction' =>
$this->currentapp.'.uibuilding.edit',
! 'location_code' => $values['location_code']
);
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uiinvoice.inc.php 21 May 2003 12:46:40 -0000 1.23
--- class.uiinvoice.inc.php 21 May 2003 20:09:51 -0000 1.24
***************
*** 88,92 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 88,91 ----
***************
*** 504,510 ****
function edit_period()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly'));
$voucher_id =
get_var('voucher_id',array('POST','GET'));
--- 503,509 ----
function edit_period()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
+ $GLOBALS['phpgw_info']['flags']['headonly']=true;
$voucher_id =
get_var('voucher_id',array('POST','GET'));
***************
*** 539,542 ****
--- 538,542 ----
//_debug_array($data);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_period' => $data));
}
***************
*** 544,549 ****
function remark()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
!
'headonly'));
$id = get_var('id',array('POST','GET'));
--- 544,549 ----
function remark()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
! $GLOBALS['phpgw_info']['flags']['headonly']=true;
$id = get_var('id',array('POST','GET'));
***************
*** 557,560 ****
--- 557,564 ----
//_debug_array($data);
+ $appname
= lang('invoice');
+ $function_msg =
lang('remark');
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('remark' => $data));
}
***************
*** 565,569 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 569,572 ----
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.uilookup.inc.php 28 Apr 2003 10:26:44 -0000 1.17
--- class.uilookup.inc.php 21 May 2003 20:09:51 -0000 1.18
***************
*** 76,83 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
- $sub = get_var('sub',array('POST','GET'));
$second_display =
get_var('second_display',array('POST','GET'));
--- 76,81 ----
***************
*** 188,196 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
- $sub = get_var('sub',array('POST','GET'));
-
$b_account_list = $this->bo->read_b_account();
--- 186,191 ----
***************
*** 286,290 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 281,284 ----
***************
*** 381,385 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 375,378 ----
***************
*** 475,482 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
- $sub = get_var('sub',array('POST','GET'));
$list = get_var('list',array('POST','GET'));
--- 468,473 ----
***************
*** 649,656 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
- $sub = get_var('sub',array('POST','GET'));
$equipment_list = $this->bo->read_equipment();
--- 640,645 ----
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uimeter.inc.php 21 May 2003 12:46:40 -0000 1.8
--- class.uimeter.inc.php 21 May 2003 20:09:51 -0000 1.9
***************
*** 70,74 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 70,73 ----
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uipricebook.inc.php 21 May 2003 12:46:40 -0000 1.14
--- class.uipricebook.inc.php 21 May 2003 20:09:51 -0000 1.15
***************
*** 80,84 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 80,83 ----
***************
*** 250,254 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 249,252 ----
***************
*** 490,494 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 488,491 ----
***************
*** 700,704 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 697,700 ----
***************
*** 823,827 ****
'menu',
'nextmatchs',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 819,822 ----
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uiXport.inc.php 21 May 2003 12:46:40 -0000 1.26
--- class.uiXport.inc.php 21 May 2003 20:09:51 -0000 1.27
***************
*** 491,495 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 491,494 ----
***************
*** 506,511 ****
{
! $receipt['error'][] = array('msg'=>
lang('No conversion type could be located.'));
! $receipt['error'][] = array('msg'=>
lang('Please choose a conversion type from the list'));
}
elseif($values['conv_type'] &&
!$values['file']):
--- 505,510 ----
{
! $receipt['error'][] = array('msg'=>
lang('No conversion type could be located.') . ' - ' . lang('Please choose a
conversion type from the list'));
! // $receipt['error'][] = array('msg'=>
lang('Please choose a conversion type from the list'));
}
elseif($values['conv_type'] &&
!$values['file']):
***************
*** 526,530 ****
$date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
!
$link_data = array
--- 525,529 ----
$date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
! //_debug_array($receipt);
$link_data = array
***************
*** 572,576 ****
{
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice','menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
'search_field'));
--- 571,574 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.46,1.47 class.sobuilding.inc.php,1.11,1.12 class.sodocument.inc.php,1.5,1.6 class.sodrawing.inc.php,1.6,1.7 class.soproject.inc.php,1.11,1.12 class.sorequest.inc.php,1.6,1.7 class.soworkorder.inc.php,1.14,1.15 class.uibuilding.inc.php,1.19,1.20 class.uiinvoice.inc.php,1.23,1.24 class.uilookup.inc.php,1.17,1.18 class.uimeter.inc.php,1.8,1.9 class.uipricebook.inc.php,1.14,1.15 class.uiXport.inc.php,1.26,1.27,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property index.php,1.10,1.11
- Next by Date:
[Phpgroupware-cvs] CVS: property/setup phpgw_no.lang,1.4,1.5 tables_current.inc.php,1.78,1.79
- Previous by thread:
[Phpgroupware-cvs] CVS: property index.php,1.10,1.11
- Next by thread:
[Phpgroupware-cvs] CVS: property/setup phpgw_no.lang,1.4,1.5 tables_current.inc.php,1.78,1.79
- Index(es):