[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bowo_hour.inc.php,1.4,1.5 cla
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bowo_hour.inc.php,1.4,1.5 class.sowo_hour.inc.php,1.4,1.5 class.soworkorder.inc.php,1.11,1.12 class.uiwo_hour.inc.php,1.4,1.5 class.uiworkorder.inc.php,1.9,1.10 class.uiXport.inc.php,1.15,1.16 |
|
Date: |
Mon, 31 Mar 2003 16:14:16 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26104/inc
Modified Files:
class.bowo_hour.inc.php class.sowo_hour.inc.php
class.soworkorder.inc.php class.uiwo_hour.inc.php
class.uiworkorder.inc.php class.uiXport.inc.php
Log Message:
no message
Index: class.bowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bowo_hour.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bowo_hour.inc.php 29 Mar 2003 18:03:03 -0000 1.4
--- class.bowo_hour.inc.php 31 Mar 2003 21:14:14 -0000 1.5
***************
*** 396,402 ****
}
! function delete($hour_id)
{
! return $this->so->delete($hour_id);
}
}
--- 396,402 ----
}
! function delete($hour_id,$workorder_id)
{
! return $this->so->delete($hour_id,$workorder_id);
}
}
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sowo_hour.inc.php 29 Mar 2003 18:03:03 -0000 1.4
--- class.sowo_hour.inc.php 31 Mar 2003 21:14:14 -0000 1.5
***************
*** 249,253 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND (descr LIKE '%$query%' or
remark LIKE '%$query%' or ns3420_id LIKE '%$query%')";
}
--- 249,253 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND (hours_descr LIKE
'%$query%' or fm_wo_template_hours.remark LIKE '%$query%' or ns3420_id LIKE
'%$query%')";
}
***************
*** 561,621 ****
chapter_id ='" . $hour['chapter_id'] . "'
WHERE id= '$workorder_id'",__LINE__,__FILE__);
!
!
! $this->db->query("SELECT grouping_id, record FROM
fm_wo_hours where id ='" .$hour['hour_id'] . "'",__LINE__,__FILE__);
! $this->db->next_record();
! $old_grouping_id = $this->db->f('grouping_id');
! // $old_record =
$this->db->f('record');
!
! if ( $old_grouping_id == $hour['grouping_id'])
! {
! // $hour['record'] = $old_record;
! }
! else
{
! $this->db->query("SELECT grouping_descr ,
max(record) as record FROM fm_wo_hours where grouping_id='"
.$hour['grouping_id'] . "' and workorder_id= '$workorder_id' GROUP by
grouping_descr",__LINE__,__FILE__);
$this->db->next_record();
! if($this->db->f('grouping_descr'))
{
! $hour['grouping_descr'] =
$this->db->f('grouping_descr');
! // $hour['record'] =
$this->db->f('record')+1;
}
else
{
- $hour['grouping_id']='';
- $hour['grouping_descr']='';
- // $hour['record'] ='';
- }
-
- /* if($old_record>1)
- {
- $this->db->query("UPDATE fm_wo_hours set
- record = record - 1 where
grouping_id='" .$hour['grouping_id'] . "' and workorder_id= '$workorder_id' and
record > $old_record ",__LINE__,__FILE__);
}
!
! */
}
!
! if($hour['new_grouping'])
{
! $this->db->query("SELECT grouping_id FROM
fm_wo_hours where grouping_descr ='" .$hour['new_grouping'] . "' and
workorder_id= '$workorder_id'",__LINE__,__FILE__);
$this->db->next_record();
! if ( $this->db->f('grouping_id'))
{
! $hour['grouping_id'] =
$this->db->f('grouping_id');
}
else
{
! $this->db->query("SELECT
max(grouping_id) as grouping_id FROM fm_wo_hours where workorder_id=
'$workorder_id'",__LINE__,__FILE__);
$this->db->next_record();
! $hour['grouping_id'] =
$this->db->f('grouping_id')+1;
! // $hour['record'] = 1;
! }
! $hour['grouping_descr'] = $hour['new_grouping'];
! }
$this->db->query("UPDATE fm_wo_hours set
--- 561,626 ----
chapter_id ='" . $hour['chapter_id'] . "'
WHERE id= '$workorder_id'",__LINE__,__FILE__);
! if($hour['new_grouping'])
{
! $this->db->query("SELECT grouping_id FROM
fm_wo_hours where grouping_descr ='" .$hour['new_grouping'] . "' and
workorder_id= '$workorder_id'",__LINE__,__FILE__);
$this->db->next_record();
! if ( $this->db->f('grouping_id'))
{
! $hour['grouping_id'] =
$this->db->f('grouping_id');
}
else
{
+ $this->db->query("UPDATE fm_wo_hours
set grouping_id = NULL WHERE id ='" .$hour['hour_id'] . "'",__LINE__,__FILE__);
+ $this->db->query("SELECT
count(grouping_id) as num_grouping FROM fm_wo_hours where workorder_id=
'$workorder_id' and grouping_id >0 ",__LINE__,__FILE__);
+ $this->db->next_record();
+ if ($this->db->f('num_grouping')==1)
+ {
+ $hour['grouping_id']=1;
+ }
+ else
+ {
+ $this->db->query("SELECT
max(grouping_id) as grouping_id FROM fm_wo_hours where workorder_id=
'$workorder_id'",__LINE__,__FILE__);
+ $this->db->next_record();
+ $hour['grouping_id'] =
$this->db->f('grouping_id')+1;
+ }
}
! $hour['grouping_descr'] = $hour['new_grouping'];
}
! else
{
! $this->db->query("SELECT
grouping_id,grouping_descr FROM fm_wo_hours where id ='" .$hour['hour_id'] .
"'",__LINE__,__FILE__);
$this->db->next_record();
! $old_grouping_id =
$this->db->f('grouping_id');
!
! if ( $old_grouping_id == $hour['grouping_id'])
{
!
! $hour['grouping_descr'] =
$this->db->f('grouping_descr');
}
else
{
! $this->db->query("SELECT grouping_descr
, max(record) as record FROM fm_wo_hours where grouping_id='"
.$hour['grouping_id'] . "' and workorder_id= '$workorder_id' GROUP by
grouping_descr",__LINE__,__FILE__);
$this->db->next_record();
! if($this->db->f('grouping_descr'))
! {
! $hour['grouping_descr'] =
$this->db->f('grouping_descr');
! }
! else
! {
! $hour['grouping_id']='';
! $hour['grouping_descr']='';
! }
! /* if($old_record>1)
! {
! $this->db->query("UPDATE
fm_wo_hours set
! record = record - 1
where grouping_id='" .$hour['grouping_id'] . "' and workorder_id=
'$workorder_id' and record > $old_record ",__LINE__,__FILE__);
+ }
+ */
+ }
+ }
$this->db->query("UPDATE fm_wo_hours set
***************
*** 641,647 ****
}
! function delete($hour_id )
{
$this->db->query("DELETE FROM fm_wo_hours WHERE id='" .
$hour_id . "'",__LINE__,__FILE__);
$receipt['message'][] = array('msg'=>lang('hour %1 has
been deleted',$hour_id));
--- 646,660 ----
}
! function delete($hour_id,$workorder_id )
{
+ $this->db->query("SELECT record FROM fm_wo_hours where
id ='$hour_id'",__LINE__,__FILE__);
+ $this->db->next_record();
+ $old_record = $this->db->f('record');
+
$this->db->query("DELETE FROM fm_wo_hours WHERE id='" .
$hour_id . "'",__LINE__,__FILE__);
+ if($old_record)
+ {
+ $this->db->query("UPDATE fm_wo_hours set record
= record - 1 where workorder_id= '$workorder_id' and record > $old_record
",__LINE__,__FILE__);
+ }
$receipt['message'][] = array('msg'=>lang('hour %1 has
been deleted',$hour_id));
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.soworkorder.inc.php 24 Mar 2003 17:37:24 -0000 1.11
--- class.soworkorder.inc.php 31 Mar 2003 21:14:14 -0000 1.12
***************
*** 210,214 ****
function read_single($workorder_id)
{
! $sql = "SELECT * from fm_wo_wrkorders where
id='$workorder_id'";
$this->db->query($sql,__LINE__,__FILE__);
--- 210,215 ----
function read_single($workorder_id)
{
! $sql = "SELECT fm_wo_wrkorders.*, fm_wo_chapter.descr
as chapter from fm_wo_wrkorders $this->join fm_wo_chapter on "
! . " fm_wo_wrkorders.chapter_id =
fm_wo_chapter.id where fm_wo_wrkorders.id='$workorder_id'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 239,242 ****
--- 240,244 ----
$workorder['cat_id'] =
$this->db->f('category');
$workorder['chapter_id'] =
$this->db->f('chapter_id');
+ $workorder['chapter'] =
$this->db->f('chapter');
}
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiwo_hour.inc.php 29 Mar 2003 18:03:03 -0000 1.4
--- class.uiwo_hour.inc.php 31 Mar 2003 21:14:14 -0000 1.5
***************
*** 23,27 ****
(
'index' => True,
! 'pdf' => True,
'template' => True,
'list_template' => True,
--- 23,27 ----
(
'index' => True,
! 'tender' => True,
'template' => True,
'list_template' => True,
***************
*** 45,48 ****
--- 45,49 ----
$this->bo =
CreateObject($this->currentapp.'.bowo_hour',True);
$this->boworkorder =
CreateObject($this->currentapp.'.boworkorder',True);
+ $this->boproject =
CreateObject($this->currentapp.'.boproject',True);
$this->bopricebook =
CreateObject($this->currentapp.'.bopricebook',True);
***************
*** 88,95 ****
--- 89,110 ----
//_debug_array($workorder);
+ $grouping_descr_old='';
+
while (is_array($hour_list) && list(,$hour) =
each($hour_list))
{
$sum_hour = $sum_hour + $hour['cost'];
+ if($hour['grouping_descr']!=$grouping_descr_old)
+ {
+ $new_grouping = true;
+ }
+ else
+ {
+ $new_grouping = false;
+ }
+
+ $grouping_descr_old =
$hour['grouping_descr'];
+
+
if($hour['activity_num'])
{
***************
*** 109,113 ****
'hours_descr'
=> $hour['hours_descr'],
'activity_descr'
=> $hour['activity_descr'],
! 'quantity'
=> $hour['quantity'],
'grouping_id'
=> $hour['grouping_id'],
'grouping_descr'
=> $hour['grouping_descr'],
--- 124,128 ----
'hours_descr'
=> $hour['hours_descr'],
'activity_descr'
=> $hour['activity_descr'],
! 'new_grouping'
=> $new_grouping,
'grouping_id'
=> $hour['grouping_id'],
'grouping_descr'
=> $hour['grouping_descr'],
***************
*** 120,133 ****
'unit'
=> $hour['unit'],
'billperae'
=> $hour['billperae'],
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
- 'lang_view_statustext' =>
lang('view this hour'),
'lang_edit_statustext' =>
lang('edit/customise this hour'),
'lang_delete_statustext' =>
lang('delete this hour'),
- 'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete')
);
}
//_debug_array($content);
--- 135,147 ----
'unit'
=> $hour['unit'],
'billperae'
=> $hour['billperae'],
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
'lang_edit_statustext' =>
lang('edit/customise this hour'),
'lang_delete_statustext' =>
lang('delete this hour'),
'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete')
);
}
+
+
//_debug_array($content);
***************
*** 181,189 ****
$common_data = array(
! 'content' => $content,
! 'table_header' => $table_header,
! 'table_sum' => $table_sum,
! 'workorder' => $workorder,
! 'workorder_data' => $workorder_data,
);
--- 195,204 ----
$common_data = array(
! 'content' =>
$content,
! 'total_hours_records' => count($content),
! 'table_header' =>
$table_header,
! 'table_sum' => $table_sum,
! 'workorder' => $workorder,
! 'workorder_data' =>
$workorder_data,
);
***************
*** 237,240 ****
--- 252,257 ----
'lang_descr_statustext' => lang('Enter
a short description of this template'),
+ 'total_hours_records' =>
$common_data['total_hours_records'],
+ 'lang_total_records' =>
lang('Total records'),
'table_header_hour'
=> $common_data['table_header'],
'values_hour'
=> $common_data['content'],
***************
*** 246,249 ****
--- 263,369 ----
+
+ function tender()
+ {
+ define('PHPGW_FOOTER_RAN',True);
+
+ $workorder_id =
get_var('workorder_id',array('POST','GET'));
+ $show_cost = get_var('show_cost',array('POST','GET'));
+
+
+ $common_data =
$this->common_data($workorder_id);
+ $values_hour = $common_data['content'];
+ $project =
$this->boproject->read_single($common_data['workorder']['project_id']);
+ //_debug_array($project);
+
+ $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']
+ );
+ }
+
+ // don't want any warnings turning up in the pdf code
if the server is set to 'anal' mode.
+ //error_reporting(7);
+ error_reporting(E_ALL);
+ set_time_limit(1800);
+ $this->pdf -> ezSetMargins(50,70,50,50);
+ $this->pdf->selectFont(PHPGW_APP_INC .
'/pdf/fonts/Helvetica.afm');
+
+ // put a line top and bottom on all the pages
+ $all = $this->pdf->openObject();
+ $this->pdf->saveState();
+ $this->pdf->setStrokeColor(0,0,0,1);
+ $this->pdf->line(20,40,578,40);
+ $this->pdf->line(20,822,578,822);
+ $this->pdf->addText(50,823,6,lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] );
+ $this->pdf->addText(50,34,6,'BBB');
+ $this->pdf->restoreState();
+ $this->pdf->closeObject();
+ // note that object can be told to appear on just odd
or even pages by changing 'all' to 'odd'
+ // or 'even'.
+ $this->pdf->addObject($all,'all');
+
+ $this->pdf->ezSetDy(-100);
+
+
+
$this->pdf->ezStartPageNumbers(500,28,10,'right','{PAGENUM} ' . lang('of') . '
{TOTALPAGENUM}',1);
+
+ $this->pdf->ezText($project['name'],20);
+ $this->pdf->ezText($project['descr'],14);
+ $this->pdf->ezSetDy(-50);
+ $this->pdf->ezText(lang('Order') . ': ' . $workorder_id
. ' ' .$common_data['workorder']['title'],14);
+ $this->pdf->ezText(lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] ,14);
+ $this->pdf->ezNewPage();
+ $this->pdf->ezTable($content,'',$project['name'],
+
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize'
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
+ ,'cols'=>array(
+ lang('bill per
unit')=>array('justification'=>'right','width'=>50)
+
,lang('quantity')=>array('justification'=>'right','width'=>50)
+
,lang('unit')=>array('width'=>40)
+
,lang('descr')=>array('width'=>120))
+ ));
+
+ $this->pdf->ezStream();
+
+ }
+
function index()
{
***************
*** 261,265 ****
if($delete && $hour_id)
{
! $receipt = $this->bo->delete($hour_id);
}
--- 381,385 ----
if($delete && $hour_id)
{
! $receipt =
$this->bo->delete($hour_id,$workorder_id);
}
***************
*** 282,286 ****
'lang_save_template'
=> lang('Save as template'),
'lang_save_template_statustext' =>
lang('Save this workorder as a template for later use'),
! 'save_template_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&from=index&workorder_id='
. $workorder_id)
);
--- 402,418 ----
'lang_save_template'
=> lang('Save as template'),
'lang_save_template_statustext' =>
lang('Save this workorder as a template for later use'),
! 'save_template_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&from=index&workorder_id='
. $workorder_id),
!
! 'lang_print_view'
=> lang('Print view'),
! 'lang_print_view_statustext' =>
lang('View the complete workorder'),
! 'print_view_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&from=index&workorder_id='
. $workorder_id),
!
! 'lang_view_tender'
=> lang('View tender'),
! 'lang_view_tender_statustext' =>
lang('View the complete workorder as a tender for bidding'),
! 'view_tender_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.tender&from=index&workorder_id='
. $workorder_id),
!
! 'lang_show_cost'
=> lang('Show calculated cost'),
! 'lang_show_cost_statustext'
=> lang('Show calculated cost on the printview'),
!
);
***************
*** 293,298 ****
--- 425,435 ----
'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('list hours'),
+ 'total_hours_records' =>
$common_data['total_hours_records'],
+ 'lang_total_records' =>
lang('Total records'),
'table_header_hour'
=> $common_data['table_header'],
'values_hour'
=> $common_data['content'],
***************
*** 325,329 ****
if($delete && $hour_id)
{
! $receipt = $this->bo->delete($hour_id);
}
--- 462,466 ----
if($delete && $hour_id)
{
! $receipt =
$this->bo->delete($hour_id,$workorder_id);
}
***************
*** 421,425 ****
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->bopricebook->allrows,
'query'
=>$this->query
);
--- 558,571 ----
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->allrows,
! 'query'
=>$this->query
! );
!
! $link_data_nextmatch = array
! (
! 'menuaction' =>
$this->currentapp.'.uiwo_hour.prizebook',
! 'sort'
=>$this->sort,
! 'order'
=>$this->order,
! 'workorder_id' =>$workorder_id,
'query'
=>$this->query
);
***************
*** 431,435 ****
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->bopricebook->allrows,
'delete' =>true,
'query'
=>$this->query
--- 577,581 ----
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->allrows,
'delete' =>true,
'query'
=>$this->query
***************
*** 437,441 ****
! if(!$this->bopricebook->allrows)
{
$record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 583,587 ----
! if(!$this->allrows)
{
$record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
***************
*** 458,462 ****
'function'
=> 'prizebook',
'links'
=> $links,
! 'allrows'
=> $this->bopricebook->allrows,
'allow_allrows'
=> true,
'start_record'
=> $this->start,
--- 604,608 ----
'function'
=> 'prizebook',
'links'
=> $links,
! 'allrows'
=> $this->allrows,
'allow_allrows'
=> true,
'start_record'
=> $this->start,
***************
*** 464,468 ****
'num_records'
=> count($pricebook_list),
'all_records'
=> $this->bopricebook->total_records,
! 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
--- 610,614 ----
'num_records'
=> count($pricebook_list),
'all_records'
=> $this->bopricebook->total_records,
! 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
***************
*** 477,480 ****
--- 623,628 ----
'table_header_prizebook' =>
$table_header_prizebook,
'values_prizebook'
=> $content_prizebook,
+ 'total_hours_records' =>
$common_data['total_hours_records'],
+ 'lang_total_records' =>
lang('Total records'),
'table_header_hour'
=> $common_data['table_header'],
'values_hour'
=> $common_data['content'],
***************
*** 507,511 ****
if($delete && $hour_id)
{
! $receipt = $this->bo->delete($hour_id);
}
--- 655,659 ----
if($delete && $hour_id)
{
! $receipt =
$this->bo->delete($hour_id,$workorder_id);
}
***************
*** 525,531 ****
--- 673,692 ----
$i=0;
+ $grouping_descr_old='';
+
while (is_array($template_list) && list(,$template) =
each($template_list))
{
+
if($template['grouping_descr']!=$grouping_descr_old)
+ {
+ $new_grouping = true;
+ }
+ else
+ {
+ $new_grouping = false;
+ }
+
+ $grouping_descr_old =
$template['grouping_descr'];
+
if($template['activity_num'])
{
***************
*** 544,547 ****
--- 705,709 ----
'grouping_descr' =>
$template['grouping_descr'],
'building_part' =>
$template['building_part'],
+ 'new_grouping' =>
$new_grouping,
'code'
=> $code,
'activity_id' =>
$template['activity_id'],
***************
*** 611,615 ****
'workorder_id' =>$workorder_id,
'template_id' =>$template_id,
! 'allrows'
=>$this->bo->allrows,
'query'
=>$this->query
);
--- 773,787 ----
'workorder_id' =>$workorder_id,
'template_id' =>$template_id,
! 'allrows'
=>$this->allrows,
! 'query'
=>$this->query
! );
!
! $link_data_nextmatch = array
! (
! 'menuaction' =>
$this->currentapp.'.uiwo_hour.template',
! 'sort'
=>$this->sort,
! 'order'
=>$this->order,
! 'workorder_id' =>$workorder_id,
! 'template_id' =>$template_id,
'query'
=>$this->query
);
***************
*** 621,625 ****
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->bo->allrows,
'delete' =>true,
'query'
=>$this->query
--- 793,797 ----
'order'
=>$this->order,
'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->allrows,
'delete' =>true,
'query'
=>$this->query
***************
*** 627,631 ****
! if(!$this->bo->allrows)
{
$record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
--- 799,803 ----
! if(!$this->allrows)
{
$record_limit =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
***************
*** 643,646 ****
--- 815,819 ----
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
+ 'template_id'
=> $template_id,
'error'
=> $receipt['error'],
'message'
=> $receipt['message'],
***************
*** 652,656 ****
'function'
=> 'template',
'links'
=> $links,
! 'allrows'
=> $this->bo->allrows,
'allow_allrows'
=> true,
'start_record'
=> $this->start,
--- 825,829 ----
'function'
=> 'template',
'links'
=> $links,
! 'allrows'
=> $this->allrows,
'allow_allrows'
=> true,
'start_record'
=> $this->start,
***************
*** 658,662 ****
'num_records'
=> count($template_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
--- 831,835 ----
'num_records'
=> count($template_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
***************
*** 671,674 ****
--- 844,849 ----
'table_header_template_hour' =>
$table_header_template_hour,
'values_template_hour'
=> $content_template_hour,
+ 'total_hours_records' =>
$common_data['total_hours_records'],
+ 'lang_total_records' =>
lang('Total records'),
'table_header_hour'
=> $common_data['table_header'],
'values_hour'
=> $common_data['content'],
***************
*** 677,680 ****
--- 852,856 ----
);
+ //_debug_array($data);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('template' => $data));
$this->save_sessiondata();
***************
*** 683,690 ****
function list_template()
{
-
- //echo 'allrows: ' . $this->allrows;
- //echo 'chapter_id: ' . $this->chapter_id;
-
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
'menu',
--- 859,862 ----
***************
*** 693,712 ****
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
- $delete = get_var('delete',array('POST','GET'));
- $hour_id = get_var('hour_id',array('POST','GET'));
-
$workorder_id =
get_var('workorder_id',array('POST','GET'));
- $values = get_var('values',array('POST'));
- //_debug_array($values);
-
- if($delete && $hour_id)
- {
- $receipt = $this->bo->delete($hour_id);
- }
-
- if($values['add'])
- {
-
$receipt=$this->bo->add_hour($values,$workorder_id);
- }
$links = $this->bocommon->menu();
--- 865,869 ----
***************
*** 714,722 ****
$common_data=$this->common_data($workorder_id);
- $workorder = $common_data['workorder'];
-
$template_list = $this->bo->read_template();
- //_debug_array($template_list);
while (is_array($template_list) && list(,$template) =
each($template_list))
{
--- 871,876 ----
***************
*** 775,786 ****
);
-
- $table_done[] = array
- (
- 'lang_done' =>
lang('Done'),
- 'lang_done_statustext' => lang('Back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
- );
-
$link_data = array
(
--- 929,932 ----
***************
*** 788,809 ****
'sort'
=>$this->sort,
'order'
=>$this->order,
! 'chapter_id'
=>$this->chapter_id,
! 'workorder_id' =>$workorder_id,
! 'allrows'
=>$this->allrows,
! 'query'
=>$this->query
! );
!
! $link_data_delete = array
! (
! 'menuaction' =>
$this->currentapp.'.uiwo_hour.list_template',
! 'sort'
=>$this->sort,
! 'order'
=>$this->order,
'workorder_id' =>$workorder_id,
- 'allrows'
=>$this->allrows,
- 'delete' =>true,
'query'
=>$this->query
);
-
if(!$this->allrows)
{
--- 934,942 ----
'sort'
=>$this->sort,
'order'
=>$this->order,
! 'chapter_id'
=>$this->chapter_id,
'workorder_id' =>$workorder_id,
'query'
=>$this->query
);
if(!$this->allrows)
{
***************
*** 815,823 ****
}
$data = array
(
- 'error'
=> $receipt['error'],
- 'message'
=> $receipt['message'],
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
--- 948,961 ----
}
+ $table_done[] = array
+ (
+ 'lang_done' =>
lang('Done'),
+ 'lang_done_statustext' => lang('Back to list'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ );
+
$data = array
(
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
***************
*** 851,858 ****
'table_header_template' =>
$table_header_template,
'values_template'
=> $content_template,
- 'table_header_hour'
=> $common_data['table_header'],
- 'values_hour'
=> $common_data['content'],
- 'table_sum'
=> $common_data['table_sum'],
'table_done'
=> $table_done
);
//_debug_array($data);
--- 989,994 ----
'table_header_template' =>
$table_header_template,
'values_template'
=> $content_template,
'table_done'
=> $table_done
+
);
//_debug_array($data);
***************
*** 865,868 ****
--- 1001,1005 ----
{
$from =
get_var('from',array('POST','GET'));
+ $template_id =
get_var('template_id',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
$activity_id =
get_var('activity_id',array('POST','GET'));
***************
*** 919,922 ****
--- 1056,1060 ----
'activity_id' => $activity_id,
'workorder_id' => $workorder_id,
+ 'template_id' => $template_id,
'hour_id' => $hour_id,
'from' => $from
***************
*** 928,932 ****
'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.'
. $from . '&workorder_id=' . $workorder_id),
'lang_workorder'
=> lang('Workorder'),
'value_workorder_id' =>
$workorder['workorder_id'],
--- 1066,1070 ----
'function_msg'
=> $function_msg,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.'
. $from . '&workorder_id=' . $workorder_id . '&template_id=' . $template_id),
'lang_workorder'
=> lang('Workorder'),
'value_workorder_id' =>
$workorder['workorder_id'],
***************
*** 1026,1062 ****
}
- function add()
- {
-
- $link_data = array
- (
- 'menuaction' =>
$this->currentapp.'.uiwo_hour.index'
- );
-
- $GLOBALS['phpgw']->xslttpl->add_file(array('workorder',
-
'menu',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
-
- $data = array
- (
- 'appname' =>
lang('Workorder'),
- 'function_msg' => lang('Add
workorder'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
- 'search_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true'),
-
- 'lang_done_statustext' =>
lang('Back to the workorder list'),
- 'lang_add_statustext' =>
lang('Adds a new project - then a new workorder'),
- 'lang_search_statustext' =>
lang('Adds a new workorder to an existing project'),
-
- 'lang_done' =>
lang('Done'),
- 'lang_add' =>
lang('Add'),
- 'lang_search' =>
lang('Search')
- );
-
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('add'
=> $data));
- }
-
function delete()
{
--- 1164,1167 ----
***************
*** 1093,1270 ****
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
}
-
- function view()
- {
- $id = get_var('id',array('POST','GET'));
-
-
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
-
- $this->config->read_repository();
-
- $values = $this->bo->read_single($id);
- $project =
$this->boproject->read_single($values['project_id']);
-
- //_debug_array($values);
- $record_history = $this->bo->read_record_history($id);
-
- $table_header_history[] = array
- (
- 'lang_date' => lang('Date'),
- 'lang_user' => lang('User'),
- 'lang_action' => lang('Action'),
- 'lang_new_value' => lang('New value')
- );
-
- $table_header_workorder_budget[] = array
- (
- 'lang_workorder_id' => lang('Workorder'),
- 'lang_sum' => lang('Sum')
- );
-
- $function_msg = lang('View Workorder');
-
- if ($values['cat_id'])
- {
- $this->cat_id = $values['cat_id'];
- }
-
-
-
$location_data=$this->bocommon->initiate_ui_location(array(
- 'location_type' => 'view',
- 'equipment' => true,
- 'tenant' => true,
- 'address' => true,
- 'equipment_id' =>
$project['equipment_id'],
- 'property_id' =>
$project['property_id'],
- 'property_name' =>
$project['property_name'],
- 'building_id' =>
$project['building_id'],
- 'entrance_id' =>
$project['entrance_id'],
- 'floor' =>
$project['floor'],
- 'street_name' =>
$project['street_name'],
- 'street_number' =>
$project['street_number'],
- 'tenant_id' =>
$project['tenant_id'],
- 'tenant_name' =>
$project['tenant_name'],
- 'tenant_phone' =>
$project['tenant_phone'],
- 'apartment_id' =>
$project['apartment_id']));
-
- $data = array
- (
- 'project_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view'),
- 'table_header_workorder_budget' =>
$table_header_workorder_budget,
- 'lang_no_workorders' =>
lang('No workorder bugdet'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view'),
- 'record_history'
=> $record_history,
- 'table_header_history' =>
$table_header_history,
- 'lang_history'
=> lang('History'),
- 'lang_no_history'
=> lang('No history'),
-
- 'lang_vendor'
=> lang('Vendor'),
- 'value_vendor_id'
=> $values['vendor_id'],
- 'value_vendor_name'
=> $values['vendor_name'],
-
- 'lang_b_account'
=> lang('Budget account'),
- 'value_b_account_id' =>
$values['b_account_id'],
- 'value_b_account_name' =>
$values['b_account_name'],
-
-
- 'lang_start_date'
=> lang('Project start date'),
- 'value_start_date'
=> $values['start_date'],
-
- 'lang_end_date'
=> lang('Project end date'),
- 'value_end_date'
=> $values['end_date'],
-
- 'lang_charge_tenant' =>
lang('Charge tenant'),
- 'charge_tenant'
=> $values['charge_tenant'],
-
- 'lang_power_meter'
=> lang('Power meter'),
- 'value_power_meter'
=> $project['power_meter'],
-
- 'lang_addition_rs'
=> lang('Rig adition'),
- 'lang_addition_rs_statustext' => lang('Enter
any round sum addition per order'),
- 'value_addition_rs'
=> $values['addition_rs'],
-
- 'lang_addition_percentage'
=> lang('Percentage adition'),
- 'lang_addition_percentage_statustext' =>
lang('Enter any persentage addition per unit'),
- 'value_addition_percentage'
=> $values['addition_percentage'],
-
- 'lang_budget'
=> lang('Budget'),
- 'value_budget'
=> $values['budget'],
-
- 'location_data'
=> $location_data,
- 'location_type'
=> 'view',
- 'appname'
=> lang('Workorder'),
- 'function_msg'
=> $function_msg,
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index'),
- 'lang_year'
=> lang('Year'),
- 'lang_category'
=> lang('category'),
- 'lang_save'
=> lang('save'),
- 'lang_done'
=> lang('done'),
- 'lang_name'
=> lang('Name'),
-
- 'lang_title'
=> lang('Title'),
- 'value_title'
=> $values['title'],
-
- 'lang_project_id'
=> lang('Project ID'),
- 'value_project_id'
=> $values['project_id'],
- 'value_name'
=> $values['name'],
-
- 'lang_other_branch'
=> lang('Other branch'),
- 'value_other_branch'
=> $project['other_branch'],
-
- 'lang_descr'
=> lang('Description'),
- 'value_descr'
=> $values['descr'],
- 'lang_done_statustext' =>
lang('Back to the list'),
- 'cat_list'
=>
$this->bo->select_category_workorder_list('select',$project['cat_id']),
-
- 'lang_workorder_id'
=> lang('Workorder ID'),
-
- 'lang_coordinator'
=> lang('Coordinator'),
- 'lang_sum'
=> lang('Sum'),
- 'user_list'
=> $this->bocommon->get_user_list('select',$project['coordinator']),
-
- 'status_list'
=> $this->bo->select_status_list('select',$values['status']),
- 'lang_no_status'
=> lang('Select status'),
- 'lang_status'
=> lang('Status'),
-
- 'branch_list'
=> $this->bo->select_branch_p_list($values['project_id']),
- 'lang_branch'
=> lang('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($values['key_fetch']),
- 'lang_key_fetch'
=> lang('key fetch location'),
-
- 'key_deliver_list'
=> $this->bo->select_key_location_list($values['key_deliver']),
- 'lang_key_deliver'
=> lang('key deliver location'),
-
- 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&id='
. $id),
- 'lang_edit_statustext' =>
lang('Edit this entry workorder'),
- 'lang_edit'
=> lang('Edit'),
- 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
- );
- //_debug_array($this->bo->select_key_location_list($values['key_fetch']));
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
- }
-
- function pdf()
- {
- define('PHPGW_FOOTER_RAN',True);
-
- $data[0]=array('sigurd','nes','38');
- $cols=array('fornavn','etternavn','alder');
-
- //_debug_array($data);
- // don't want any warnings turning up in the pdf code
if the server is set to 'anal' mode.
- //error_reporting(7);
- error_reporting(E_ALL);
- set_time_limit(1800);
- $this->pdf->selectFont(PHPGW_APP_INC .
'/pdf/fonts/Helvetica.afm');
- $this->pdf->ezText('Hello World!',50);
- $this->pdf->ezNewPage();
- $this->pdf->ezTable($data,$cols,'tittel');
- $this->pdf->ezStream();
- }
-
}
--- 1198,1201 ----
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiworkorder.inc.php 21 Mar 2003 22:35:48 -0000 1.9
--- class.uiworkorder.inc.php 31 Mar 2003 21:14:14 -0000 1.10
***************
*** 103,112 ****
--- 103,115 ----
'status'
=> $workorder['status'],
'owner'
=> $workorder['owner'],
+ 'link_calculate'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder['workorder_id']),
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder['workorder_id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder['workorder_id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $workorder['workorder_id']),
+ 'lang_calculate_statustext' =>
lang('calculate this workorder'),
'lang_view_statustext' =>
lang('view the workorder'),
'lang_edit_statustext' =>
lang('edit the workorder'),
'lang_delete_statustext' =>
lang('delete this workorder'),
+ 'text_calculate'
=> lang('calculate'),
'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
***************
*** 175,178 ****
--- 178,182 ----
'lang_user' => lang('User'),
'lang_status' => lang('Status'),
+ 'lang_calculate' => lang('Calculate'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uiXport.inc.php 20 Jan 2003 10:35:28 -0000 1.15
--- class.uiXport.inc.php 31 Mar 2003 21:14:14 -0000 1.16
***************
*** 39,42 ****
--- 39,43 ----
$this->filter = $this->bo->filter;
$this->cat_id = $this->bo->cat_id;
+
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
}
***************
*** 49,53 ****
$invoice_num =
get_var('invoice_num',array('POST','GET'));
$kid_nr =
get_var('kid_nr',array('POST','GET'));
! $abid =
get_var('abid',array('POST','GET'));
$vendor_name =
get_var('vendor_name',array('POST','GET'));
$janitor =
get_var('janitor',array('POST','GET'));
--- 50,54 ----
$invoice_num =
get_var('invoice_num',array('POST','GET'));
$kid_nr =
get_var('kid_nr',array('POST','GET'));
! $vendor_id =
get_var('vendor_id',array('POST','GET'));
$vendor_name =
get_var('vendor_name',array('POST','GET'));
$janitor =
get_var('janitor',array('POST','GET'));
***************
*** 70,74 ****
global $tsvfile;
- $sub = get_var('sub',array('POST','GET'));
$links = $this->bocommon->menu($sub);
--- 71,74 ----
***************
*** 106,110 ****
$error[$errorcount++] =
array('msg'=>lang('Please - select type invoice!'));
}
! if (!$abid)
{
$error[$errorcount++] =
array('msg'=>lang('Please - select Vendor!'));
--- 106,110 ----
$error[$errorcount++] =
array('msg'=>lang('Please - select type invoice!'));
}
! if (!$vendor_id)
{
$error[$errorcount++] =
array('msg'=>lang('Please - select Vendor!'));
***************
*** 121,127 ****
}
! if (!$this->invoice->check_vendor($abid))
{
! $error[$errorcount++] =
array('msg'=>lang('That Vendor ID is not valid !'). ' : ' . $abid);
}
--- 121,127 ----
}
! if (!$this->invoice->check_vendor($vendor_id))
{
! $error[$errorcount++] =
array('msg'=>lang('That Vendor ID is not valid !'). ' : ' . $vendor_id);
}
***************
*** 193,197 ****
'invoice_num'
=> $invoice_num,
'kid_nr'
=> $kid_nr,
! 'abid'
=> $abid,
'vendor_name'
=> $vendor_name,
'janitor'
=> $janitor,
--- 193,197 ----
'invoice_num'
=> $invoice_num,
'kid_nr'
=> $kid_nr,
! 'vendor_id'
=> $vendor_id,
'vendor_name'
=> $vendor_name,
'janitor'
=> $janitor,
***************
*** 295,299 ****
'lang_payment_date_statustext' => lang('Enter
the payment date or the payment delay'),
'lang_file_statustext' =>
lang('Select the file to import from'),
! 'lang_abid_statustext' =>
lang('Select the vendor by klicking the button'),
'lang_vendor_name_statustext' => lang('Select
the vendor by klicking the button'),
'lang_select_vendor_statustext' => lang('Select
the vendor by klicking this button'),
--- 295,299 ----
'lang_payment_date_statustext' => lang('Enter
the payment date or the payment delay'),
'lang_file_statustext' =>
lang('Select the file to import from'),
! 'lang_vendor_statustext'
=> lang('Select the vendor by klicking the button'),
'lang_vendor_name_statustext' => lang('Select
the vendor by klicking the button'),
'lang_select_vendor_statustext' => lang('Select
the vendor by klicking this button'),
***************
*** 303,307 ****
'value_payment_date' =>
$payment_date,
'value_belop'
=> $belop,
! 'value_abid'
=> $abid,
'value_vendor_name'
=> $vendor_name,
'value_kid_nr'
=> $kid_nr,
--- 303,307 ----
'value_payment_date' =>
$payment_date,
'value_belop'
=> $belop,
! 'value_vendor_id'
=> $vendor_id,
'value_vendor_name'
=> $vendor_name,
'value_kid_nr'
=> $kid_nr,
***************
*** 452,456 ****
'budsjettansvarligid' =>
$table[1]['budsjettansvarligid'],
'lang_sum'
=> lang('Sum'),
! 'sum'
=> $sum,
'table_header_debug' =>
$table_header,
'table_key'
=> $table_key,
--- 452,456 ----
'budsjettansvarligid' =>
$table[1]['budsjettansvarligid'],
'lang_sum'
=> lang('Sum'),
! 'sum'
=> number_format($sum, 2, ',', ' '),
'table_header_debug' =>
$table_header,
'table_key'
=> $table_key,
***************
*** 479,483 ****
//_debug_array($values);
- $sub = get_var('sub',array('POST','GET'));
$links = $this->bocommon->menu($sub);
--- 479,482 ----
***************
*** 489,497 ****
$receipt['error'][0]['msg']= lang('No
conversion type could be located.');
$receipt['error'][1]['msg']=
lang('Please choose a conversion type from the list');
- echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export')
. '">' . lang('OK') . '</a>';
}
elseif($values['conv_type'] &&
!$values['file']):
{
$message =
$this->bo->export($values['conv_type'],$values['download']);
}
endif;
--- 488,502 ----
$receipt['error'][0]['msg']= lang('No
conversion type could be located.');
$receipt['error'][1]['msg']=
lang('Please choose a conversion type from the list');
}
elseif($values['conv_type'] &&
!$values['file']):
{
$message =
$this->bo->export($values['conv_type'],$values['download']);
+ if(!$values['download'])
+ {
+ define('PHPGW_FOOTER_RAN',True);
+ echo '<pre>' .
$message[0]['msg'] . '</pre>';
+ echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
+
+ }
}
endif;
***************
*** 526,529 ****
--- 531,535 ----
'lang_export_to_file' =>
lang('Export to file'),
'value_debug'
=> $values['debug'],
+ 'lang_debug_statustext' =>
lang('Uncheck to debug the result'),
'lang_submit'
=> lang('Submit'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bowo_hour.inc.php,1.4,1.5 class.sowo_hour.inc.php,1.4,1.5 class.soworkorder.inc.php,1.11,1.12 class.uiwo_hour.inc.php,1.4,1.5 class.uiworkorder.inc.php,1.9,1.10 class.uiXport.inc.php,1.15,1.16,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default chapter_filter.xsl,NONE,1.1 invoice.xsl,1.18,1.19 menu.xsl,1.4,1.5 nextmatchs.xsl,1.3,1.4 wo_hour.xsl,1.3,1.4 workorder.xsl,1.7,1.8
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.7,1.8 Import_fra_Kemner,1.8,1.9 Import_fra_Service,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default chapter_filter.xsl,NONE,1.1 invoice.xsl,1.18,1.19 menu.xsl,1.4,1.5 nextmatchs.xsl,1.3,1.4 wo_hour.xsl,1.3,1.4 workorder.xsl,1.7,1.8
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc/import Import_fra_BKK,1.7,1.8 Import_fra_Kemner,1.8,1.9 Import_fra_Service,1.9,1.10
- Index(es):