[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.82, 1.83 class
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.82, 1.83 class.uidocument.inc.php, 1.17, 1.18 class.sodocument.inc.php, 1.13, 1.14 class.uilocation.inc.php, 1.30, 1.31 class.uiinvoice.inc.php, 1.37, 1.38 class.uiworkorder.inc.php, 1.43, 1.44 class.uiproject.inc.php, 1.49, 1.50 hook_settings.inc.php, 1.13, 1.14 class.uiXport.inc.php, 1.32, 1.33 class.bodocument.inc.php, 1.9, 1.10 |
|
Date: |
Fri, 03 Oct 2003 16:01:29 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv18462/inc
Modified Files:
class.bocommon.inc.php class.uidocument.inc.php
class.sodocument.inc.php class.uilocation.inc.php
class.uiinvoice.inc.php class.uiworkorder.inc.php
class.uiproject.inc.php hook_settings.inc.php
class.uiXport.inc.php class.bodocument.inc.php
Log Message:
no message
Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.sodocument.inc.php 1 Oct 2003 19:26:45 -0000 1.13
--- class.sodocument.inc.php 3 Oct 2003 16:01:26 -0000 1.14
***************
*** 383,386 ****
--- 383,387 ----
$document['descr'],
$document['location_code'],
+ $document['equipment_id'],
$address,
$document['branch_id'],
***************
*** 391,402 ****
$this->db->query("INSERT INTO fm_document
(document_name,link,title,access,category,entry_date,document_date,version,coordinator,status,"
! .
"descr,location_code,address,branch_id,vendor_id,user_id $cols) "
. "VALUES ($values $vals )",__LINE__,__FILE__);
$receipt['document_id'] =
$this->db->get_last_insert_id('fm_document','id');
! //
$this->historylog->add('SO',$receipt['document_id'],$document['status']);
! //
$this->historylog->add('TO',$receipt['document_id'],$document['cat_id']);
! //
$this->historylog->add('CO',$receipt['document_id'],$document['coordinator']);
$receipt['message'][] = array('msg'=>lang('document %1
has been saved',"'".$document['document_name']."'"));
--- 392,411 ----
$this->db->query("INSERT INTO fm_document
(document_name,link,title,access,category,entry_date,document_date,version,coordinator,status,"
! .
"descr,location_code,equipment_id,address,branch_id,vendor_id,user_id $cols) "
. "VALUES ($values $vals )",__LINE__,__FILE__);
$receipt['document_id'] =
$this->db->get_last_insert_id('fm_document','id');
!
$this->historylog->add('SO',$receipt['document_id'],$document['status']);
!
$this->historylog->add('TO',$receipt['document_id'],$document['cat_id']);
!
$this->historylog->add('CO',$receipt['document_id'],$document['coordinator']);
! if($document['document_name'])
! {
!
$this->historylog->add('FO',$receipt['document_id'],$document['coodocument_name']);
! }
! if($document['link'])
! {
!
$this->historylog->add('LO',$receipt['document_id'],$document['link']);
! }
$receipt['message'][] = array('msg'=>lang('document %1
has been saved',"'".$document['document_name']."'"));
***************
*** 433,448 ****
}
!
! /* $this->db->query("SELECT status,category,coordinator
FROM fm_document where id='" .$document['document_id']."'",__LINE__,__FILE__);
$this->db->next_record();
$old_status = $this->db->f('status');
! $old_categroy = $this->db->f('category');
$old_coordinator = $this->db->f('coordinator');
if ($old_status != $document['status'])
{
$this->historylog->add('S',$document['document_id'],$document['status']);
}
! if ($old_categroy != $document['cat_id'])
{
$this->historylog->add('T',$document['document_id'],$document['cat_id']);
--- 442,461 ----
}
! $this->db->query("SELECT
status,category,coordinator,document_name,equipment_id,loc1,link FROM
fm_document where id='" .$document['document_id']."'",__LINE__,__FILE__);
$this->db->next_record();
$old_status = $this->db->f('status');
! $old_category = $this->db->f('category');
$old_coordinator = $this->db->f('coordinator');
+ $old_document_name = $this->db->f('document_name');
+ $old_equipment_id = $this->db->f('equipment_id');
+ $old_loc1 = $this->db->f('loc1');
+ $old_link = $this->db->f('link');
+
if ($old_status != $document['status'])
{
$this->historylog->add('S',$document['document_id'],$document['status']);
}
! if ($old_category != $document['cat_id'])
{
$this->historylog->add('T',$document['document_id'],$document['cat_id']);
***************
*** 452,456 ****
$this->historylog->add('C',$document['document_id'],$document['coordinator']);
}
! */
if($document['document_name_orig'] &&
!$document['document_name'] )
{
--- 465,469 ----
$this->historylog->add('C',$document['document_id'],$document['coordinator']);
}
!
if($document['document_name_orig'] &&
!$document['document_name'] )
{
***************
*** 458,468 ****
}
! if($document['street_number'])
{
! $address= $document['street_name'] . ' ' .
$document['street_number'];
}
! else
{
! $address= $document['street_name'];
}
--- 471,506 ----
}
! if($old_link !=$document['link'] )
{
!
$this->historylog->add('L',$document['document_id'],$document['link']);
! $alter_link=True;
}
!
! if ($old_document_name && ($old_document_name !=
$document['document_name']))
{
! if($document['link'] && !$alter_link)
! {
!
$this->historylog->add('L',$document['document_id'],$document['link']);
! }
! else
! {
!
$this->historylog->add('F',$document['document_id'],$document['document_name']);
! }
!
! if(!$old_equipment_id)
! {
! $file = $this->fakebase. SEP .
'document' . SEP . $old_loc1 . SEP . $old_document_name;
! }
! else
! {
! $file = $this->fakebase. SEP .
'document' . SEP . $old_loc1 . SEP . $equipment_id . SEP . $old_document_name;
! }
!
! $receipt= $this->delete_file($file);
! }
!
! if($document['link'])
! {
! unset($document['document_name']);
}
***************
*** 470,475 ****
$document['name'] =
$this->db->db_addslashes($document['name']);
$document['title'] =
$this->db->db_addslashes($document['title']);
- //_debug_array($document);
-
$value_set=array(
--- 508,511 ----
***************
*** 485,488 ****
--- 521,525 ----
'version' =>$document['version'],
'location_code' =>$document['location_code'],
+ 'equipment_id' =>$document['equipment_id'],
'vendor_id'
=>$document['vendor_id'],
'address' =>$address
***************
*** 494,525 ****
$receipt['document_id'] = $document['document_id'];
! $receipt['message'][] = array('msg'=>lang('document %1
has been edited',"'".$document['document_name']."'"));
return $receipt;
}
! function delete($document_id )
{
- $this->db->query("SELECT
document_name,location_code,equipment_id FROM fm_document where
id='$document_id'",__LINE__,__FILE__);
- $this->db->next_record();
- $document_name = $this->db->f('document_name');
- $location_code = $this->db->f('location_code');
- $equipment_id = $this->db->f('equipment_id');
-
- $location = split("-", $location_code);
- $loc1 = $location[0];
-
-
- if(!$equipment_id)
- {
- $file = $this->fakebase. SEP . 'document' . SEP
. $loc1 . SEP . $document_name;
- }
- else
- {
- $file = $this->fakebase. SEP . 'document' . SEP
. $loc1 . SEP . $equipment_id . SEP . $document_name;
- }
-
-
- //echo $file;
if($this->vfs->file_exists(array(
'string' => $file,
--- 531,541 ----
$receipt['document_id'] = $document['document_id'];
! $receipt['message'][] = array('msg'=>lang('document %1
has been edited',"'".$document['title']."'"));
return $receipt;
}
! function delete_file($file)
{
if($this->vfs->file_exists(array(
'string' => $file,
***************
*** 544,547 ****
--- 560,592 ----
$this->vfs->override_acl = 0;
}
+
+ }
+
+ function delete($document_id )
+ {
+ $this->db->query("SELECT
document_name,location_code,equipment_id FROM fm_document where
id='$document_id'",__LINE__,__FILE__);
+ $this->db->next_record();
+ $document_name = $this->db->f('document_name');
+ $location_code = $this->db->f('location_code');
+ $equipment_id = $this->db->f('equipment_id');
+
+ $location = split("-", $location_code);
+ $loc1 = $location[0];
+
+
+ if($document_name)
+ {
+ if(!$equipment_id)
+ {
+ $file = $this->fakebase. SEP .
'document' . SEP . $loc1 . SEP . $document_name;
+ }
+ else
+ {
+ $file = $this->fakebase. SEP .
'document' . SEP . $loc1 . SEP . $equipment_id . SEP . $document_name;
+ }
+
+ $receipt= $this->delete_file($file);
+ }
+
$this->db->query("DELETE FROM fm_document WHERE
id='$document_id'",__LINE__,__FILE__);
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** class.uilocation.inc.php 29 Sep 2003 17:53:51 -0000 1.30
--- class.uilocation.inc.php 3 Oct 2003 16:01:26 -0000 1.31
***************
*** 454,459 ****
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp,'');
- // _debug_array($insert_record);
-
if($_POST['save'])
{
--- 454,457 ----
***************
*** 469,474 ****
}
- // _debug_array($values);
-
$type_id =
get_var('type_id',array('GET'));
--- 467,470 ----
***************
*** 544,548 ****
}
- //_debug_array($values);
if ($values['cat_id'] > 0)
{
--- 540,543 ----
***************
*** 576,580 ****
));
- //_debug_array($location_data);
$location_types = $this->bo->location_types;
$config = $this->bo->config;
--- 571,574 ----
***************
*** 591,595 ****
$function_msg .= ' '
.$location_types[($type_id-1)]['name'];
- // _debug_array($config);
$custom_fields =
$this->soadmin_location->read_attrib(array(type_id=>$type_id));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
--- 585,588 ----
***************
*** 726,730 ****
}
! $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
--- 719,726 ----
}
! if($receipt)
! {
! $msgbox_data =
$this->bocommon->msgbox_data($receipt);
! }
$data = array
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** class.uiproject.inc.php 26 Sep 2003 18:04:34 -0000 1.49
--- class.uiproject.inc.php 3 Oct 2003 16:01:26 -0000 1.50
***************
*** 491,494 ****
--- 491,496 ----
if ($values['save'])
{
+ $save=true;
+
if(!$values['location'])
{
***************
*** 581,585 ****
$receipt['message'][]=array('msg'=>lang('%1 is
notified',$values['mail_address']));
}
-
}
--- 583,586 ----
***************
*** 597,600 ****
--- 598,608 ----
{
$values = $this->bo->read_single($id);
+
+ if(!$values['workorder_budget'] && $save)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $id);
+
+ }
+
if
(!$this->bocommon->check_perms($values['grants'],PHPGW_ACL_EDIT))
{
***************
*** 709,713 ****
}
! $msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
--- 717,724 ----
}
! if($receipt)
! {
! $msgbox_data =
$this->bocommon->msgbox_data($receipt);
! }
$data = array
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** hook_settings.inc.php 19 Sep 2003 17:50:46 -0000 1.13
--- hook_settings.inc.php 3 Oct 2003 16:01:26 -0000 1.14
***************
*** 67,71 ****
'project' => lang('Project'),
'tts' => lang('Ticket'),
! 'invoice' => lang('Invoice')
);
create_select_box('Default start
page','default_start_page',$default_start_page,'Select your start-submodule');
--- 67,73 ----
'project' => lang('Project'),
'tts' => lang('Ticket'),
! 'invoice' => lang('Invoice'),
! 'document'=> lang(Document),
! 'report'=> lang(Report)
);
create_select_box('Default start
page','default_start_page',$default_start_page,'Select your start-submodule');
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** class.bocommon.inc.php 1 Oct 2003 19:26:45 -0000 1.82
--- class.bocommon.inc.php 3 Oct 2003 16:01:26 -0000 1.83
***************
*** 739,743 ****
$menu['module'][$i]['statustext'] =
lang('Pricebook');
$i++;
! $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index');
$menu['module'][$i]['name']
= lang('Documentation');
$menu['module'][$i]['statustext'] =
lang('Documentation');
--- 739,743 ----
$menu['module'][$i]['statustext'] =
lang('Pricebook');
$i++;
! $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
$menu['module'][$i]['name']
= lang('Documentation');
$menu['module'][$i]['statustext'] =
lang('Documentation');
***************
*** 748,752 ****
$i=0;
! if ($sub == equipment)
{
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
--- 748,752 ----
$i=0;
! if ($sub == 'equipment')
{
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
***************
*** 767,771 ****
}
! if ($sub == location)
{
$location =
$this->soadmin_location->select_location_type();
--- 767,771 ----
}
! if ($sub == 'location')
{
$location =
$this->soadmin_location->select_location_type();
***************
*** 796,800 ****
}
! if ($sub == invoice)
{
$i++;
--- 796,800 ----
}
! if ($sub == 'invoice')
{
$i++;
***************
*** 835,839 ****
}
! if ($sub == pricebook &&
$this->acl2->check('.pricebook',16))
{
$i++;
--- 835,839 ----
}
! if ($sub == 'pricebook' &&
$this->acl2->check('.pricebook',16))
{
$i++;
***************
*** 851,855 ****
}
! if ($sub == project)
{
$i++;
--- 851,855 ----
}
! if ($sub == 'project')
{
$i++;
***************
*** 881,884 ****
--- 881,896 ----
$menu['sub_menu'][$i]['name']
= lang('Config');
$menu['sub_menu'][$i]['statustext']
= lang('Location Config');
+ }
+
+ if ($sub == 'document')
+ {
+ $i++;
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
+ $menu['sub_menu'][$i]['name']
= lang('location');
+ $menu['sub_menu'][$i]['statustext']
= lang('Documentation for locations');
+ $i++;
+ $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=equipment');
+ $menu['sub_menu'][$i]['name']
= lang('Equipment');
+ $menu['sub_menu'][$i]['statustext']
= lang('Documentation for equipment');
}
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.uidocument.inc.php 1 Oct 2003 19:26:45 -0000 1.17
--- class.uidocument.inc.php 3 Oct 2003 16:01:26 -0000 1.18
***************
*** 59,63 ****
$this->equipment_type =
$this->bo->equipment_type;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'documentation');
}
--- 59,63 ----
$this->equipment_type =
$this->bo->equipment_type;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'document');
}
***************
*** 85,89 ****
}
-
$GLOBALS['phpgw']->xslttpl->add_file(array('document','values','table_header',
'menu',
--- 85,88 ----
***************
*** 265,272 ****
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'type'
=> $this->cat_id,
- 'lang_no_cat'
=> lang('no category'),
- 'lang_cat_statustext' =>
lang('Select the category the document belongs to. To do not use a category
select NO CATEGORY'),
- 'select_name'
=> 'cat_id',
- 'cat_list'
=> $this->bo->select_category_list_location('filter',$this->cat_id),
'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
'lang_no_district'
=> lang('no district'),
--- 264,267 ----
***************
*** 301,305 ****
$function_msg = lang('list document');
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
--- 296,300 ----
$function_msg = lang('list document');
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg . ' - ' .
lang($this->cat_id);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
$this->save_sessiondata();
***************
*** 588,591 ****
--- 583,587 ----
$values =
get_var('values',array('POST'));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
+ //_debug_array($insert_record);
if(!$from)
***************
*** 632,636 ****
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
!
$values['document_name']=$_FILES['document_file']['name'];
if((!$values['document_name'] &&
!$values['document_name_orig']) && !$values['link'])
--- 628,635 ----
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
! if(!$values['link'])
! {
!
$values['document_name']=$_FILES['document_file']['name'];
! }
if((!$values['document_name'] &&
!$values['document_name_orig']) && !$values['link'])
***************
*** 654,658 ****
}
- //_debug_array($values);
if(!$values['extra']['equipment_id'])
{
--- 653,656 ----
***************
*** 679,684 ****
if(!$receipt['error'])
{
- //echo $_FILES['document_file']['tmp_name'] .'<br>';
- //echo $to_file .'<br>';
if($values['document_name'] &&
!$values['link'])
{
--- 677,680 ----
***************
*** 714,718 ****
{
$values = $this->bo->read_single($document_id);
! // $record_history =
$this->bo->read_record_history($document_id);
$function_msg = lang('Edit document');
}
--- 710,714 ----
{
$values = $this->bo->read_single($document_id);
! $record_history =
$this->bo->read_record_history($document_id);
$function_msg = lang('Edit document');
}
***************
*** 734,738 ****
$this->cat_id = $values['cat_id'];
}
!
$location_data=$this->bolocation->initiate_ui_location(array(
--- 730,741 ----
$this->cat_id = $values['cat_id'];
}
! if ($values['location_code'])
! {
! $location_code = $values['location_code'];
! }
! if ($values['equipment_id'])
! {
! $equipment_id = $values['equipment_id'];
! }
$location_data=$this->bolocation->initiate_ui_location(array(
***************
*** 798,802 ****
'lang_save_statustext' =>
lang('Save the document'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $values['location_code'] . '&equipment_id=' .
$values['equipment_id'] . '&preserve=1'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
--- 801,805 ----
'lang_save_statustext' =>
lang('Save the document'),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $location_code . '&equipment_id=' . $equipment_id
. '&preserve=1'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
***************
*** 951,955 ****
$values = $this->bo->read_single($document_id);
$function_msg = lang('view document');
! // $record_history =
$this->bo->read_record_history($document_id);
$table_header_history[] = array
--- 954,958 ----
$values = $this->bo->read_single($document_id);
$function_msg = lang('view document');
! $record_history =
$this->bo->read_record_history($document_id);
$table_header_history[] = array
***************
*** 1075,1079 ****
'lang_branch_statustext' =>
lang('Select the branch for this document'),
! 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document_id),
'lang_edit_statustext'
=> lang('Edit this entry'),
'lang_edit'
=> lang('Edit')
--- 1078,1082 ----
'lang_branch_statustext' =>
lang('Select the branch for this document'),
! 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document_id . '&from=' . $from),
'lang_edit_statustext'
=> lang('Edit this entry'),
'lang_edit'
=> lang('Edit')
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** class.uiworkorder.inc.php 26 Sep 2003 18:04:34 -0000 1.43
--- class.uiworkorder.inc.php 3 Oct 2003 16:01:26 -0000 1.44
***************
*** 530,533 ****
--- 530,541 ----
$values['title']=$project['name'];
}
+ if( $project['descr'] && !$values['descr'])
+ {
+ $values['descr']=$project['descr'];
+ }
+ if( $project['status'] && !$values['status'])
+ {
+ $values['status']=$project['status'];
+ }
}
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** class.uiinvoice.inc.php 26 Sep 2003 18:04:34 -0000 1.37
--- class.uiinvoice.inc.php 3 Oct 2003 16:01:26 -0000 1.38
***************
*** 608,612 ****
$submit_search =
get_var('submit_search',array('POST','GET'));
$vendor_id =
get_var('vendor_id',array('POST','GET'));
- $vendor_name =
get_var('vendor_name',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
--- 608,611 ----
***************
*** 615,618 ****
--- 614,623 ----
$b_account_class =
get_var('b_account_class',array('POST','GET'));
+ if($vendor_id)
+ {
+ $contacts =
CreateObject('phpgwapi.contacts');
+ $vendor =
$contacts->read_single_entry((int)$vendor_id,array('org_name'=>'org_name'));
+ $vendor_name = $vendor[0]['org_name'];
+ }
$links = $this->bocommon->menu($sub);
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** class.uiXport.inc.php 6 Aug 2003 21:47:51 -0000 1.32
--- class.uiXport.inc.php 3 Oct 2003 16:01:26 -0000 1.33
***************
*** 66,72 ****
$supervisor =
get_var('supervisor',array('POST','GET'));
$budget_responsible =
get_var('budget_responsible',array('POST','GET'));
! $invoice_date =
get_var('invoice_date',array('POST','GET'));
$num_days =
get_var('num_days',array('POST','GET'));
! $payment_date =
get_var('payment_date',array('POST','GET'));
$cancel =
get_var('cancel',array('POST','GET'));
$convert =
get_var('convert',array('POST','GET'));
--- 66,72 ----
$supervisor =
get_var('supervisor',array('POST','GET'));
$budget_responsible =
get_var('budget_responsible',array('POST','GET'));
! $invoice_date =
urldecode(get_var('invoice_date',array('POST','GET')));
$num_days =
get_var('num_days',array('POST','GET'));
! $payment_date =
urldecode(get_var('payment_date',array('POST','GET')));
$cancel =
get_var('cancel',array('POST','GET'));
$convert =
get_var('convert',array('POST','GET'));
***************
*** 131,160 ****
}
! if (checkdate($smonth,$sday,$syear))
! {
! $sdate =
mktime(2,0,0,$smonth,$sday,$syear);
! $fakturadato=
date($this->bocommon->dateformat,$sdate);
! }
! else
! {
! if ($smonth && $sday && $syear)
! {
! $receipt['error'][] =
array('msg'=>lang('You have entered an invalid start date !') . ' : ' . $smonth
.'-'. $sday. '-' . $syear);
! }
! }
!
! if (checkdate($emonth,$eday,$eyear))
! {
! $edate =
mktime(2,0,0,$emonth,$eday,$eyear);
! }
! else
! {
! if ($emonth && $eday && $eyear)
! {
! $receipt['error'][] =
array('msg'=>lang('You have entered an invalid end date !') . ' : ' . $emonth
.'-'. $eday. '-' . $eyear);
! }
! }
!
! if (!$edate && !$num_days)
{
$receipt['error'][] =
array('msg'=>lang('Please - select either payment date or number of days from
invoice date !'));
--- 131,135 ----
}
! if (!$payment_date && !$num_days)
{
$receipt['error'][] =
array('msg'=>lang('Please - select either payment date or number of days from
invoice date !'));
***************
*** 165,170 ****
$receipt['error'][] =
array('msg'=>lang('The file is empty or removed!'));
}
!
! if (!$receipt['error'])
{
--- 140,144 ----
$receipt['error'][] =
array('msg'=>lang('The file is empty or removed!'));
}
! if (!is_array($receipt['error']))
{
***************
*** 218,223 ****
'payment_date'
=> $payment_date
);
-
- //_debug_array($invoice_common);
$buffer =
$this->bo->import($invoice_common,$download);
--- 192,195 ----
Index: class.bodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodocument.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** class.bodocument.inc.php 30 Jun 2003 10:49:14 -0000 1.9
--- class.bodocument.inc.php 3 Oct 2003 16:01:26 -0000 1.10
***************
*** 231,279 ****
- function select_category_list_location($format='',$selected='')
- {
- switch($format)
- {
- case 'select':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select'));
- break;
- case 'filter':
-
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter'));
- break;
- }
-
- $categories[0]['id']='location' ;
- $categories[0]['name']=lang('location') ;
- $categories[1]['id']='equipment' ;
- $categories[1]['name']=lang('equipment') ;
-
- while (is_array($categories) && list(,$category) =
each($categories))
- {
- $sel_category = '';
- if ($category['id']==$selected)
- {
- $sel_category = 'selected';
- }
-
- $category_list[] = array
- (
- 'cat_id' => $category['id'],
- 'name' => $category['name'],
- 'selected' => $sel_category
- );
- }
-
- for ($i=0;$i<count($category_list);$i++)
- {
- if ($category_list[$i]['selected'] !=
'selected')
- {
- unset($category_list[$i]['selected']);
- }
- }
-
- return $category_list;
- }
-
-
function read()
{
--- 231,234 ----
***************
*** 382,385 ****
--- 337,344 ----
case 'SO': $type = lang('Initial
Status'); break;
case 'S': $type = lang('Status
changed'); break;
+ case 'FO': $type = lang('Initial
File'); break;
+ case 'F': $type = lang('File changed');
break;
+ case 'LO': $type = lang('Initial
Link'); break;
+ case 'L': $type = lang('Link changed');
break;
default: break;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php, 1.82, 1.83 class.uidocument.inc.php, 1.17, 1.18 class.sodocument.inc.php, 1.13, 1.14 class.uilocation.inc.php, 1.30, 1.31 class.uiinvoice.inc.php, 1.37, 1.38 class.uiworkorder.inc.php, 1.43, 1.44 class.uiproject.inc.php, 1.49, 1.50 hook_settings.inc.php, 1.13, 1.14 class.uiXport.inc.php, 1.32, 1.33 class.bodocument.inc.php, 1.9, 1.10,
Sigurd Nes <address@hidden> <=