[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soadmin_entity.inc.php, 1.5, 1.6 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.soadmin_entity.inc.php, 1.5, 1.6 class.soentity.inc.php, 1.3, 1.4 class.uiadmin_entity.inc.php, 1.4, 1.5 class.boentity.inc.php, 1.1, 1.2 class.uientity.inc.php, 1.1, 1.2 class.sotts.inc.php, 1.29, 1.30 class.soreport.inc.php, 1.13, 1.14 class.soworkorder.inc.php, 1.30, 1.31 class.soproject.inc.php, 1.41, 1.42 class.soXport.inc.php, 1.36, 1.37 |
|
Date: |
Wed, 22 Oct 2003 17:01:13 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv5200/inc
Modified Files:
class.soadmin_entity.inc.php class.soentity.inc.php
class.uiadmin_entity.inc.php class.boentity.inc.php
class.uientity.inc.php class.sotts.inc.php
class.soreport.inc.php class.soworkorder.inc.php
class.soproject.inc.php class.soXport.inc.php
Log Message:
no message
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** class.soproject.inc.php 10 Oct 2003 21:57:14 -0000 1.41
--- class.soproject.inc.php 22 Oct 2003 17:01:10 -0000 1.42
***************
*** 244,249 ****
if($query)
{
! if($query=explode(".",$query))
{
$querymethod = " $where
(fm_project.loc1='" . $query[0] . "' AND fm_project.loc".$type_id."='" .
$query[1] . "')";
}
--- 244,250 ----
if($query)
{
! if(stristr($query, '.'))
{
+ $query=explode(".",$query);
$querymethod = " $where
(fm_project.loc1='" . $query[0] . "' AND fm_project.loc".$type_id."='" .
$query[1] . "')";
}
Index: class.soXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soXport.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** class.soXport.inc.php 21 Sep 2003 07:31:42 -0000 1.36
--- class.soXport.inc.php 22 Oct 2003 17:01:10 -0000 1.37
***************
*** 12,18 ****
$this->db =
$GLOBALS['phpgw']->db;
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
! $this->join =
$this->socommon->join;
$this->datetimeformat =
$this->bocommon->datetimeformat;
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
--- 12,17 ----
$this->db =
$GLOBALS['phpgw']->db;
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->join =
$this->bocommon->join;
$this->datetimeformat =
$this->bocommon->datetimeformat;
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
***************
*** 100,207 ****
foreach ($buffer as $fields)
{
! $num++;
!
! $pmwrkord_code=$fields['pmwrkord_code'];
! if ($pmwrkord_code)
! {
! $pmwrkord_code_value="'$pmwrkord_code'";
! }
! else
! {
! $pmwrkord_code_value="Null";
! }
! $bilagsnr=$fields['bilagsnr'];
! $splitt=$fields['splitt'];
! $kildeid=$fields['kildeid'];
! $kidnr=$fields['kidnr'];
! $typeid=$fields[typeid];
! $fakturadato=$fields['fakturadato'];
! $forfallsdato=$fields['forfallsdato'];
! $regtid=$fields['regtid'];
! $artid=$fields['artid'];
! $godkjentbelop=$fields['godkjentbelop'];
! $spvend_code=$fields['spvend_code'];
! $dimb=$fields['dimb'];
! if ($dimb)
! {
! $dimb_value="'$dimb'";
! }
! else
! {
! $dimb_value="Null";
! }
!
! $oppsynsmannid=$fields['oppsynsmannid'];
!
! if ($oppsynsmannid)
! {
! $oppsynsmannid_value="'$oppsynsmannid'";
! }
! else
! {
! $oppsynsmannid_value="Null";
! }
!
! $saksbehandlerid=$fields['saksbehandlerid'];
! if ($saksbehandlerid)
! {
!
$saksbehandlerid_value="'$saksbehandlerid'";
! }
! else
! {
! $saksbehandlerid_value="Null";
! }
!
!
$budsjettansvarligid=$fields['budsjettansvarligid'];
! $fakturanr=$fields['fakturanr'];
! $spbudact_code=$fields['spbudact_code'];
! if ($spbudact_code)
! {
! $spbudact_code_value="'$spbudact_code'";
! }
! else
! {
! $spbudact_code_value="Null";
! }
!
! $loc1=$fields['loc1'];
! $dima=$fields['dima'];
! if ($dima)
! {
! $dima_value="'$dima'";
! }
! else
{
! $dima_value="Null";
! }
! $dimd=$fields['dimd'];
! if ($dimd)
! {
! $dimd_value="'$dimd'";
! }
! else
! {
! $dimd_value="Null";
! }
! $mvakode=$fields['mvakode'];
! $belop=$fields['belop'];
! $periode=$fields['periode'];
! $merknad=$fields['merknad'];
! if(abs($belop)>0)
! {
!
$belop=$this->bocommon->moneyformat($belop);
!
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,forfallsdato,regtid,artid,godkjentbelop,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,fakturanr,spbudact_code,loc1,dima,dimd,mvakode,belop,periode,merknad,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato)"
! . " values
($pmwrkord_code_value,'$bilagsnr','$splitt','$kildeid','$kidnr','$typeid','$fakturadato','$forfallsdato','$regtid','$artid',$godkjentbelop,'$spvend_code',$dimb_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid','$fakturanr',$spbudact_code_value,'$loc1',$dima_value,$dimd_value,'$mvakode',$belop,'$periode','$merknad',NULL,NULL,NULL,NULL)";
}
-
- $this->db->query($sql,__LINE__,__FILE__);
}
! $this->db->query("update fm_idgenerator set value =
$bilagsnr where name = 'Bilagsnummer'");
$this->db->transaction_commit();
--- 99,149 ----
foreach ($buffer as $fields)
{
! if(abs($fields['belop'])>0)
{
! $values= array(
! $fields['pmwrkord_code'],
! $fields['bilagsnr'],
! $fields['splitt'],
! $fields['kildeid'],
! $fields['kidnr'],
! $fields['typeid'],
! $fields['fakturadato'],
! $fields['forfallsdato'],
! $fields['regtid'],
! $fields['artid'],
! $fields['spvend_code'],
! $fields['dimb'],
! $fields['oppsynsmannid'],
! $fields['saksbehandlerid'],
! $fields['budsjettansvarligid'],
! $fields['fakturanr'],
! $fields['spbudact_code'],
! $fields['loc1'],
! $fields['dima'],
! $fields['dimd'],
! $fields['mvakode'],
! $fields['periode'],
! $fields['merknad'],
! False,
! False,
! False,
! False
! );
! $values =
$this->bocommon->validate_db_insert($values);
! $sql= "INSERT INTO fm_ecobilag
(pmwrkord_code,bilagsnr,splitt,kildeid,kidnr,typeid,fakturadato,"
! . "
forfallsdato,regtid,artid,spvend_code,dimb,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
! . "
fakturanr,spbudact_code,loc1,dima,dimd,mvakode,periode,merknad,oppsynsigndato,saksigndato,"
! . "
budsjettsigndato,utbetalingsigndato,belop,godkjentbelop)"
! . " VALUES ($values," .
$this->bocommon->moneyformat($fields['belop']) . "," .
$this->bocommon->moneyformat($fields['godkjentbelop']) . ")";
!
$this->db->query($sql,__LINE__,__FILE__);
! $num++;
}
}
! $this->db->query("UPDATE fm_idgenerator set value =" .
$buffer[1]['bilagsnr'] . " WHERE name = 'Bilagsnummer'");
$this->db->transaction_commit();
***************
*** 210,324 ****
}
! function add_OverfBilag ($oRsOverfBilag)
{
! $id =
$oRsOverfBilag['id'];
! $bilagsnr =
$oRsOverfBilag['bilagsnr'];
! $kidnr =
$oRsOverfBilag['kidnr'];
! $typeid =
$oRsOverfBilag['typeid'];
! $kildeid =
$oRsOverfBilag['kildeid'];
! $pmwrkord_code =
$oRsOverfBilag['pmwrkord_code'];
! if ($pmwrkord_code)
! {
! $pmwrkord_code_value="'$pmwrkord_code'";
! }
! else
! {
! $pmwrkord_code_value="Null";
! }
!
! $belop =
$oRsOverfBilag['belop'];
! $fakturadato =
$oRsOverfBilag['fakturadato'];
! $periode =
$oRsOverfBilag['periode'];
! $forfallsdato =
$oRsOverfBilag['forfallsdato'];
! $fakturanr =
$oRsOverfBilag['fakturanr'];
! $spbudact_code =
$oRsOverfBilag['spbudact_code'];
! $regtid =
$oRsOverfBilag['regtid'];
! $artid =
$oRsOverfBilag['artid'];
! $godkjentbelop =
$oRsOverfBilag['godkjentbelop'];
! $spvend_code =
$oRsOverfBilag['spvend_code'];
! $dima =
$oRsOverfBilag['dima'];
! $loc1 =
$oRsOverfBilag['loc1'];
! $dimb =
$oRsOverfBilag['dimb'];
! if ($dimb)
! {
! $dimb_value="'$dimb'";
! }
! else
! {
! $dimb_value="Null";
! }
!
! $mvakode =
$oRsOverfBilag['mvakode'];
! $dimd =
$oRsOverfBilag['dimd'];
! if ($dimd)
! {
! $dimd_value="'$dimd'";
! }
! else
! {
! $dimd_value="Null";
! }
! $oppsynsmannid = $oRsOverfBilag['oppsynsmannid'];
!
! if ($oppsynsmannid)
! {
! $oppsynsmannid_value="'$oppsynsmannid'";
! }
! else
! {
! $oppsynsmannid_value="Null";
! }
!
!
! $saksbehandlerid =
$oRsOverfBilag['saksbehandlerid'];
!
! if ($saksbehandlerid)
! {
! $saksbehandlerid_value="'$saksbehandlerid'";
! }
! else
! {
! $saksbehandlerid_value="Null";
! }
!
! $budsjettansvarligid=
$oRsOverfBilag['budsjettansvarligid'];
!
! $oppsynsigndato =
$oRsOverfBilag['oppsynsigndato'];
! if ($oppsynsigndato)
! {
! $oppsynsigndato_value="'$oppsynsigndato'";
! }
! else
! {
! $oppsynsigndato_value="Null";
! }
!
! $saksigndato =
$oRsOverfBilag['saksigndato'];
! if ($saksigndato)
! {
! $saksigndato_value="'$saksigndato'";
! }
! else
! {
! $saksigndato_value="Null";
! }
!
!
! $budsjettsigndato =
$oRsOverfBilag['budsjettsigndato'];
! $merknad =
$oRsOverfBilag['merknad'];
! $splitt =
$oRsOverfBilag['splitt'];
! $utbetalingid =
$oRsOverfBilag['utbetalingid'];
! $utbetalingsigndato =
$oRsOverfBilag['utbetalingsigndato'];
! $filnavn =
$oRsOverfBilag['filnavn'];
! $ordrebelop =
$oRsOverfBilag['ordrebelop'];
! $overftid = date("Y-m-d
G:i:s");
! $belop=$this->bocommon->moneyformat($belop);
!
$godkjentbelop=$this->bocommon->moneyformat($godkjentbelop);
! $ordrebelop=$this->bocommon->moneyformat($ordrebelop);
- $sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,belop,fakturadato,periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,godkjentbelop,spvend_code,dima,loc1,dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,ordrebelop,overftid)"
- . "values
('$id','$bilagsnr','$kidnr','$typeid','$kildeid',$pmwrkord_code_value,$belop,'$fakturadato','$periode','$forfallsdato','$fakturanr','$spbudact_code','$regtid','$artid',$godkjentbelop,'$spvend_code','$dima','$loc1',$dimb_value,'$mvakode',$dimd_value,$oppsynsmannid_value,$saksbehandlerid_value,'$budsjettansvarligid',$oppsynsigndato_value,$saksigndato_value,'$budsjettsigndato','$merknad','$splitt','$utbetalingid','$utbetalingsigndato','$filnavn',$ordrebelop,'$overftid')
";
$this->db->query($sql,__LINE__,__FILE__);
//echo 'sql ' . $sql.'<br>';
--- 152,203 ----
}
! function add_OverfBilag ($data)
{
! $values= array(
! $data['id'],
! $data['bilagsnr'],
! $data['kidnr'],
! $data['typeid'],
! $data['kildeid'],
! $data['pmwrkord_code'],
! $data['fakturadato'],
! $data['periode'],
! $data['forfallsdato'],
! $data['fakturanr'],
! $data['spbudact_code'],
! $data['regtid'],
! $data['artid'],
! $data['spvend_code'],
! $data['dima'],
! $data['loc1'],
! $data['dimb'],
! $data['mvakode'],
! $data['dimd'],
! $data['oppsynsmannid'],
! $data['saksbehandlerid'],
! $data['budsjettansvarligid'],
! $data['oppsynsigndato'],
! $data['saksigndato'],
! $data['budsjettsigndato'],
! $data['merknad'],
! $data['splitt'],
! $data['utbetalingid'],
! $data['utbetalingsigndato'],
! $data['filnavn'],
! date("Y-m-d G:i:s")
! );
+ $values = $this->bocommon->validate_db_insert($values);
! $sql="INSERT INTO fm_ecobilagoverf
(id,bilagsnr,kidnr,typeid,kildeid,pmwrkord_code,fakturadato,"
! . "
periode,forfallsdato,fakturanr,spbudact_code,regtid,artid,spvend_code,dima,loc1,"
! . "
dimb,mvakode,dimd,oppsynsmannid,saksbehandlerid,budsjettansvarligid,oppsynsigndato,saksigndato,"
! . "
budsjettsigndato,merknad,splitt,utbetalingid,utbetalingsigndato,filnavn,overftid,"
! . " belop,godkjentbelop,ordrebelop)"
! . "values ($values, "
! . $this->bocommon->moneyformat($data['belop'])
. ","
! .
$this->bocommon->moneyformat($data['godkjentbelop']) . ","
! .
$this->bocommon->moneyformat($data['ordrebelop']) . ")";
$this->db->query($sql,__LINE__,__FILE__);
//echo 'sql ' . $sql.'<br>';
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.soentity.inc.php 19 Oct 2003 12:22:33 -0000 1.3
--- class.soentity.inc.php 22 Oct 2003 17:01:09 -0000 1.4
***************
*** 134,138 ****
{
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['entity_columns_'.$entity_id.'_'.$cat_id];
! if (isset($user_columns) AND
is_array($user_columns))
{
foreach($user_columns as $column_id)
--- 134,138 ----
{
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['entity_columns_'.$entity_id.'_'.$cat_id];
! if (isset($user_columns) AND
is_array($user_columns) AND $user_columns[0])
{
foreach($user_columns as $column_id)
***************
*** 310,317 ****
'attrib_id' =>
$this->db->f('id'),
'name' =>
$this->db->f('column_name'),
! 'descr' =>
$this->db->f('input_text'),
'datatype' =>
$this->db->f('datatype')
);
}
if($id)
--- 310,319 ----
'attrib_id' =>
$this->db->f('id'),
'name' =>
$this->db->f('column_name'),
! 'input_text' =>
$this->db->f('input_text'),
! 'statustext' =>
$this->db->f('statustext'),
'datatype' =>
$this->db->f('datatype')
);
}
+ //_debug_array($entity);
if($id)
***************
*** 332,335 ****
--- 334,338 ----
{
$entity['attributes'][$i]['value'] =
$this->db->f($entity['attributes'][$i]['name']);
+
$entity['attributes'][$i]['datatype_text'] =
$this->bocommon->translate_datatype($entity['attributes'][$i]['datatype']);
}
}
Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.uiadmin_entity.inc.php 19 Oct 2003 12:22:34 -0000 1.4
--- class.uiadmin_entity.inc.php 22 Oct 2003 17:01:09 -0000 1.5
***************
*** 436,439 ****
--- 436,440 ----
$id = get_var('id',array('POST','GET'));
$values =
get_var('values',array('POST'));
+ $config =
CreateObject('phpgwapi.config',$this->currentapp);
$GLOBALS['phpgw']->xslttpl->add_file(array('admin_entity'));
***************
*** 454,457 ****
--- 455,459 ----
if (!$receipt['error'])
{
+
$receipt =
$this->bo->save($values,$action);
if(!$id)
***************
*** 459,462 ****
--- 461,483 ----
$id=$receipt['id'];
}
+ $config->read_repository();
+
+
if(!is_array($config->config_data['location_form']))
+ {
+
$config->config_data['location_form'] = array();
+ }
+
+ if($values['location_form'])
+ {
+
+
$config->config_data['location_form']['entity_' . $id] = 'entity_' . $id;
+
+ }
+ else
+ {
+
unset($config->config_data['location_form']['entity_' . $id]);
+ }
+
+ $config->save_repository();
}
else
***************
*** 638,642 ****
if (!$receipt['error'])
{
-
$receipt =
$this->bo->save_category($values,$action);
if(!$id)
--- 659,662 ----
Index: class.boentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.boentity.inc.php 18 Oct 2003 22:15:51 -0000 1.1
--- class.boentity.inc.php 22 Oct 2003 17:01:09 -0000 1.2
***************
*** 275,279 ****
}
! function read()
{
$entity = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
--- 275,279 ----
}
! function read($data='')
{
$entity = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.soreport.inc.php 10 Oct 2003 21:57:14 -0000 1.13
--- class.soreport.inc.php 22 Oct 2003 17:01:09 -0000 1.14
***************
*** 211,216 ****
if($query)
{
! if($query=explode(".",$query))
{
$querymethod = " $where
(fm_report.loc1='" . $query[0] . "' AND fm_report.loc".$type_id."='" .
$query[1] . "')";
}
--- 211,217 ----
if($query)
{
! if(stristr($query, '.'))
{
+ $query=explode(".",$query);
$querymethod = " $where
(fm_report.loc1='" . $query[0] . "' AND fm_report.loc".$type_id."='" .
$query[1] . "')";
}
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** class.sotts.inc.php 15 Oct 2003 17:27:38 -0000 1.29
--- class.sotts.inc.php 22 Oct 2003 17:01:09 -0000 1.30
***************
*** 123,128 ****
if($query)
{
! if($query=explode(".",$query))
{
$querymethod = " $where
(fm_tts_tickets.loc1='" . $query[0] . "' AND fm_tts_tickets.loc4='" . $query[1]
. "')";
}
--- 123,129 ----
if($query)
{
! if(stristr($query, '.'))
{
+ $query=explode(".",$query);
$querymethod = " $where
(fm_tts_tickets.loc1='" . $query[0] . "' AND fm_tts_tickets.loc4='" . $query[1]
. "')";
}
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uientity.inc.php 18 Oct 2003 22:15:51 -0000 1.1
--- class.uientity.inc.php 22 Oct 2003 17:01:09 -0000 1.2
***************
*** 176,179 ****
--- 176,180 ----
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_columns' => lang('columns'),
+ 'lang_none' => lang('None'),
'lang_save' => lang('save'),
'select_name' => 'period'
***************
*** 278,282 ****
));
}
! if($uicols['name'][$i]=='entity_id')
{
$table_header[$i]['sort_link']
=true;
--- 279,283 ----
));
}
! if($uicols['name'][$i]=='num')
{
$table_header[$i]['sort_link']
=true;
***************
*** 284,288 ****
(
'sort' => $this->sort,
!
'var' => 'entity_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uientity.index',
--- 285,289 ----
(
'sort' => $this->sort,
!
'var' => 'id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uientity.index',
***************
*** 312,315 ****
--- 313,333 ----
));
}
+ if($uicols['name'][$i]=='status')
+ {
+ $table_header[$i]['sort_link']
=true;
+ $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
+
(
+
'sort' => $this->sort,
+
'var' => 'status',
+
'order' => $this->order,
+
'extra' => array('menuaction' =>
$this->currentapp.'.uientity.index',
+
'type_id'
=>$type_id,
+
'query'
=>$this->query,
+
'lookup'
=>$lookup,
+
'district_id' =>
$this->district_id,
+
'entity_id'
=>$this->entity_id,
+
'cat_id'
=>$this->cat_id)
+
));
+ }
}
}
***************
*** 562,572 ****
$lookup_type='form';
if ($id)
{
! $function_msg = lang('edit entity');
}
else
{
! $function_msg = lang('add entity');
}
--- 580,593 ----
$lookup_type='form';
+ $entity =
$this->boadmin_entity->read_single($this->entity_id,false);
+ $category =
$this->boadmin_entity->read_single_category($this->entity_id,$this->cat_id);
+
if ($id)
{
! $function_msg = lang('edit') . ' ' .
$category['name'];
}
else
{
! $function_msg = lang('add') . ' ' .
$category['name'];
}
***************
*** 586,593 ****
));
- $entity =
$this->boadmin_entity->read_single($this->entity_id,false);
- $category =
$this->boadmin_entity->read_single_category($this->entity_id,$this->cat_id);
-
-
if($category['lookup_vendor'])
{
--- 607,610 ----
***************
*** 673,688 ****
'attributes_header'
=> $attributes_header,
'attributes_values'
=> $attributes_values,
- 'generate_id'
=> $values['generate_id'],
- 'link_calendar_date' =>
'setDateField(document.form.date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
- 'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
- 'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
'dateformat'
=> $dateformat,
- 'lang_popup_calendar' =>
lang('Popup Calendar'),
- 'lang_date_statustext' =>
lang('insert the date for the acquisition'),
- 'lang_date'
=> lang('Acquisition date'),
- 'value_date'
=> $values['date'],
- 'lang_generate_id'
=> lang('Generate ID ?'),
- 'lang_generate_id_statustext' => lang('Choose
Generate ID to automaticly assign new ID based on type-prefix'),
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
--- 690,695 ----
***************
*** 690,727 ****
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id='. $this->cat_id),
- 'lang_year'
=> lang('Year'),
- 'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_id'
=> lang('ID'),
! 'value_id' =>
$values['id'],
! 'value_num' =>
$values['num'],
! 'lang_id_statustext' => lang('Enter ID'),
! 'lang_lifetime'
=> lang('Longevity'),
! 'lang_lifetime_statustext' =>
lang('Enter the expected longevity in years'),
! 'value_lifetime'
=> $values['lifetime'],
'error_flag'
=> $error_id,
- 'lang_descr_statustext' =>
lang('Enter a description of the entity'),
- 'lang_descr'
=> lang('Description'),
- 'value_descr'
=> $values['descr'],
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the entity'),
- 'lang_no_cat'
=> lang('no category'),
- 'lang_cat_statustext' =>
lang('Select the category the entity belongs to. To do not use a category
select NO CATEGORY'),
- 'select_name'
=> 'values[cat_id]',
- 'value_cat_id'
=> $values['cat_id'],
- // 'cat_list'
=> $this->bocommon->select_category_entity_list('select',$this->cat_id),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
'select_status_name' =>
'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
! 'lang_status_statustext' =>
lang('What is the current status of this entity ?'),
! 'lang_cost'
=> lang('Purchase cost'),
! 'value_cost'
=> $values['cost'],
! 'lang_cost_statustext' =>
lang('Enter the purchase cost'),
! 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
! $appname
= lang('entity');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
--- 697,716 ----
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id='. $this->cat_id),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_id'
=> lang('ID'),
! 'value_id'
=> $values['id'],
! 'value_num'
=> $values['num'],
'error_flag'
=> $error_id,
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the entity'),
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
'select_status_name' =>
'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
! 'lang_status_statustext' =>
lang('What is the current status of this entity ?')
);
! $appname = $entity['name'];
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
***************
*** 780,787 ****
$id = get_var('id',array('POST','GET'));
- $values = $this->bo->read_single($id);
$GLOBALS['phpgw']->xslttpl->add_file(array('entity'));
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
--- 769,789 ----
$id = get_var('id',array('POST','GET'));
$GLOBALS['phpgw']->xslttpl->add_file(array('entity'));
+
+ if ($id)
+ {
+ $values =
$this->bo->read_single(array('entity_id'=>$this->entity_id,'cat_id'=>$this->cat_id,'id'=>$id));
+ }
+
+ $lookup_type='view';
+
+ if ($values['cat_id'])
+ {
+ $this->cat_id = $values['cat_id'];
+ }
+
+
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
***************
*** 790,838 ****
// 'tenant' => True,
// 'entity' => True,
! 'lookup_type' => 'view'
));
! $attributes_values =
$this->bocommon->read_attibutes(array('form'=>false,'type'=>entity,'type_id'=>$values['cat_id'],'id'=>$id));
! $attributes_header[] = array(
'lang_name' => lang('Name'),
'lang_descr' => lang('Description'),
'lang_datatype' => lang('Datatype'),
'lang_value' => lang('Value')
! );
! $data = array
(
! 'lang_attributes' =>
lang('Attributes'),
! 'attributes_header' =>
$attributes_header,
! 'attributes_values' =>
$attributes_values,
! 'lang_date'
=> lang('Acquisition date'),
! 'value_date' =>
$values['date'],
! 'location_data' =>
$location_data,
! 'lang_year'
=> lang('Year'),
! 'lang_category' =>
lang('category'),
! 'lang_entity_id' =>
lang('entity ID'),
! 'value_entity_id' =>
$values['entity_id'],
! 'lang_lifetime' =>
lang('Longevity'),
! 'value_lifetime' =>
$values['lifetime'],
! 'lang_descr' =>
lang('Description'),
! 'value_descr' =>
$values['descr'],
! 'lang_status' =>
lang('Status'),
! 'value_status' =>
$values['status'],
! 'lang_cost'
=> lang('Purchase cost'),
! 'value_cost' =>
$values['cost'],
! 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index'),
! 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.edit&id='
. $id),
! 'lang_vendor' =>
lang('Vendor'),
! 'value_vendor_id' =>
$values['vendor_id'],
! 'value_vendor_name' =>
$values['vendor_name'],
! 'lang_done_statustext' => lang('Back
to the list'),
! 'lang_edit_statustext' => lang('Edit
this entry entity'),
! 'lang_done'
=> lang('done'),
! 'lang_edit'
=> lang('Edit')
);
! $appname
= lang('entity');
! $function_msg =
lang('view entity');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
--- 792,869 ----
// 'tenant' => True,
// 'entity' => True,
! 'lookup_type' => $lookup_type
));
! $entity =
$this->boadmin_entity->read_single($this->entity_id,false);
! $category =
$this->boadmin_entity->read_single_category($this->entity_id,$this->cat_id);
!
! $appname = $entity['name'];
! $function_msg = lang('view') . ' ' .
$category['name'];
!
! if($category['lookup_vendor'])
! {
!
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
! 'vendor_id' =>
$values['vendor_id'],
! 'vendor_name' =>
$values['vendor_name']));
! }
!
! $attributes_values=$values['attributes'];
!
! $attributes_header[] = array(
'lang_name' => lang('Name'),
'lang_descr' => lang('Description'),
'lang_datatype' => lang('Datatype'),
'lang_value' => lang('Value')
! );
!
! $link_data = array
(
! 'menuaction' =>
$this->currentapp.'.uientity.edit',
! 'id' => $id,
! 'entity_id' => $this->entity_id,
! 'cat_id' => $this->cat_id
);
! $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! $sep = '/';
! $dlarr[strpos($dateformat,'y')] = 'yyyy';
! $dlarr[strpos($dateformat,'m')] = 'MM';
! $dlarr[strpos($dateformat,'d')] = 'DD';
! ksort($dlarr);
!
! $dateformat= (implode($sep,$dlarr));
!
! $msgbox_data = $this->bocommon->msgbox_data($receipt);
!
! $data = array
! (
! 'lang_entity'
=> lang('entity'),
! 'entity_name'
=> $entity['name'],
! 'lang_category'
=> lang('category'),
! 'category_name'
=> $category['name'],
! 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'lang_dateformat'
=> lang(strtolower($dateformat)),
! 'lang_attributes'
=> lang('Attributes'),
! 'attributes_view'
=> $attributes_values,
! 'dateformat'
=> $dateformat,
!
! 'vendor_data'
=> $vendor_data,
! 'location_data'
=> $location_data,
! 'lookup_type'
=> $lookup_type,
! 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id='. $this->cat_id),
! 'lang_category'
=> lang('category'),
! 'lang_edit'
=> lang('Edit'),
! 'lang_done'
=> lang('done'),
! 'lang_id'
=> lang('ID'),
! 'value_id' =>
$values['id'],
! 'value_num' =>
$values['num'],
! 'error_flag'
=> $error_id,
! 'lang_done_statustext' =>
lang('Back to the list'),
! 'lang_save_statustext' =>
lang('Edit the entity'),
! 'status_list'
=> $this->bo->select_status_list('select',$values['status'])
! );
!
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.soadmin_entity.inc.php 19 Oct 2003 16:23:32 -0000 1.5
--- class.soadmin_entity.inc.php 22 Oct 2003 17:01:09 -0000 1.6
***************
*** 465,470 ****
'descr' => $entity['descr'],
'name' => $entity['name'],
! 'location_form' => $entity['location_form'],
! 'lookup_vendor' => $entity['lookup_vendor']
);
--- 465,469 ----
'descr' => $entity['descr'],
'name' => $entity['name'],
! 'location_form' => $entity['location_form']
);
***************
*** 556,560 ****
$this->oProc->DropColumn('fm_entity_' .$entity_id.'_'.
$cat_id,'', $ColumnName);
-
$sql = "SELECT attrib_sort FROM fm_entity_attribute
where entity_id=$entity_id AND cat_id=$cat_id AND id=$attrib_id";
$this->db->query($sql,__LINE__,__FILE__);
--- 555,558 ----
***************
*** 646,650 ****
'entity_form' =>
$this->db->f('entity_form'),
'column_name' =>
$this->db->f('column_name'),
! 'name' =>
$this->db->f('column_name'),
'size' =>
$this->db->f('size'),
'statustext' =>
$this->db->f('statustext'),
--- 644,648 ----
'entity_form' =>
$this->db->f('entity_form'),
'column_name' =>
$this->db->f('column_name'),
! 'name' =>
$this->db->f('input_text'),
'size' =>
$this->db->f('size'),
'statustext' =>
$this->db->f('statustext'),
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** class.soworkorder.inc.php 10 Oct 2003 21:57:14 -0000 1.30
--- class.soworkorder.inc.php 22 Oct 2003 17:01:10 -0000 1.31
***************
*** 292,297 ****
if($query)
{
! if($query=explode(".",$query))
{
$querymethod = " $where
(fm_project.loc1='" . $query[0] . "' AND fm_project.loc".$type_id."='" .
$query[1] . "')";
}
--- 292,298 ----
if($query)
{
! if(stristr($query, '.'))
{
+ $query=explode(".",$query);
$querymethod = " $where
(fm_project.loc1='" . $query[0] . "' AND fm_project.loc".$type_id."='" .
$query[1] . "')";
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soadmin_entity.inc.php, 1.5, 1.6 class.soentity.inc.php, 1.3, 1.4 class.uiadmin_entity.inc.php, 1.4, 1.5 class.boentity.inc.php, 1.1, 1.2 class.uientity.inc.php, 1.1, 1.2 class.sotts.inc.php, 1.29, 1.30 class.soreport.inc.php, 1.13, 1.14 class.soworkorder.inc.php, 1.30, 1.31 class.soproject.inc.php, 1.41, 1.42 class.soXport.inc.php, 1.36, 1.37,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.1, 1.2 columns.xsl, 1.1, 1.2
- Next by Date:
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.123.2.9.2.17, 1.123.2.9.2.18
- Previous by thread:
[Phpgroupware-cvs] property/templates/default entity.xsl, 1.1, 1.2 columns.xsl, 1.1, 1.2
- Next by thread:
[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php, 1.123.2.9.2.17, 1.123.2.9.2.18
- Index(es):